Rev 1095: Merge 0.4. in http://people.samba.org/bzr/jelmer/bzr-svn/cext
Jelmer Vernooij
jelmer at samba.org
Sun Jun 15 02:13:48 BST 2008
At http://people.samba.org/bzr/jelmer/bzr-svn/cext
------------------------------------------------------------
revno: 1095
revision-id: jelmer at samba.org-20080615011347-k1czevnk4ha5bvys
parent: jelmer at samba.org-20080615010825-rc9prnosyyoz83q2
parent: jelmer at samba.org-20080615010806-ez5xru2zepz7rtv9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Sun 2008-06-15 03:13:47 +0200
message:
Merge 0.4.
added:
core.py core.py-20080615010310-67lnibnp889hlarb-1
ra.py ra.py-20080615005305-t5221niknu8rm6bt-1
modified:
auth.py auth.py-20071209174622-w8d42k6nm5yhxvi8-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
remote.py format.py-20060406233823-b6fa009fe35dfde7
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 950.3.162
revision-id: jelmer at samba.org-20080615010806-ez5xru2zepz7rtv9
parent: jelmer at samba.org-20080615010127-lc6jgkyur0ya5vvu
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-06-15 03:08:06 +0200
message:
Provide equivalent of core module.
added:
core.py core.py-20080615010310-67lnibnp889hlarb-1
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
remote.py format.py-20060406233823-b6fa009fe35dfde7
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 950.3.161
revision-id: jelmer at samba.org-20080615010127-lc6jgkyur0ya5vvu
parent: jelmer at samba.org-20080610213941-0wcabgvqnvkayz5c
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-06-15 03:01:27 +0200
message:
Start working on compatibility with the c extensions.
added:
ra.py ra.py-20080615005305-t5221niknu8rm6bt-1
modified:
auth.py auth.py-20071209174622-w8d42k6nm5yhxvi8-1
=== modified file 'auth.py'
--- a/auth.py 2008-06-09 23:40:37 +0000
+++ b/auth.py 2008-06-15 01:13:47 +0000
@@ -17,16 +17,16 @@
from bzrlib.config import AuthenticationConfig
from bzrlib.ui import ui_factory
-from bzrlib.plugins.svn.ra import (get_username_prompt_provider,
- get_simple_prompt_provider,
- get_ssl_server_trust_prompt_provider,
- get_ssl_client_cert_pw_prompt_provider,
- get_simple_provider, get_username_provider,
- get_ssl_client_cert_file_provider,
- get_ssl_client_cert_pw_file_provider,
- get_ssl_server_trust_file_provider,
- Auth
- )
+from bzrlib.plugins.svn.ra import (get_username_prompt_provider,
+ get_simple_prompt_provider,
+ get_ssl_server_trust_prompt_provider,
+ get_ssl_client_cert_pw_prompt_provider)
+ get_simple_provider, get_username_provider,
+ get_ssl_client_cert_file_provider,
+ get_ssl_client_cert_pw_file_provider,
+ get_ssl_server_trust_file_provider,
+ Auth
+ )
from bzrlib.plugins.svn import ra
import urlparse
import urllib
=== modified file 'commit.py'
--- a/commit.py 2008-06-15 01:08:25 +0000
+++ b/commit.py 2008-06-15 01:13:47 +0000
@@ -27,7 +27,7 @@
from bzrlib.revision import NULL_REVISION
from bzrlib.trace import mutter, warning
-from bzrlib.plugins.svn import properties
+from bzrlib.plugins.svn import core, properties
from cStringIO import StringIO
=== added file 'core.py'
--- a/core.py 1970-01-01 00:00:00 +0000
+++ b/core.py 2008-06-15 01:08:06 +0000
@@ -0,0 +1,20 @@
+# Copyright (C) 2005-2007 Jelmer Vernooij <jelmer at samba.org>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+NODE_NONE = 0
+NODE_FILE = 1
+NODE_DIR = 2
+NODE_UNKNOWN = 3
=== modified file 'logwalker.py'
--- a/logwalker.py 2008-06-15 00:41:08 +0000
+++ b/logwalker.py 2008-06-15 01:13:47 +0000
@@ -24,9 +24,9 @@
from bzrlib.plugins.svn.transport import SvnRaTransport
from bzrlib.plugins.svn import core
+from bzrlib.plugins.svn import changes, core
from bzrlib.plugins.svn.cache import CacheTable
from bzrlib.plugins.svn.errors import ERR_FS_NO_SUCH_REVISION, ERR_FS_NOT_FOUND
-from bzrlib.plugins.svn import changes
from bzrlib.plugins.svn.ra import DIRENT_KIND
class lazy_dict(object):
=== added file 'ra.py'
--- a/ra.py 1970-01-01 00:00:00 +0000
+++ b/ra.py 2008-06-15 01:01:27 +0000
@@ -0,0 +1,21 @@
+# Copyright (C) 2005-2007 Jelmer Vernooij <jelmer at samba.org>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import svn.core
+
+get_username_prompt_provider = svn.core.svn_auth_get_username_prompt_provider
+get_simple_prompt_provider = svn.core.svn_auth_get_simple_prompt_provider
+get_ssl_client_cert_pw_prompt_provider = svn.core.svn_auth_get_ssl_client_cert_pw_prompt_provider
+get_ssl_server_trust_prompt_provider = svn.core.svn_auth_get_ssl_server_trust_prompt_provider
=== modified file 'remote.py'
--- a/remote.py 2008-06-04 18:56:53 +0000
+++ b/remote.py 2008-06-15 01:13:47 +0000
@@ -25,6 +25,7 @@
from core import SubversionException
import core
+from bzrlib.plugins.svn import core
from bzrlib.plugins.svn.errors import NoSvnRepositoryPresent
from bzrlib.plugins.svn.format import get_rich_root_format, SvnRemoteFormat
from bzrlib.plugins.svn.repository import SvnRepository
=== modified file 'tree.py'
--- a/tree.py 2008-06-15 00:41:08 +0000
+++ b/tree.py 2008-06-15 01:13:47 +0000
@@ -29,7 +29,7 @@
import urllib
from bzrlib.plugins.svn.delta import apply_txdelta_handler
-from bzrlib.plugins.svn import core, errors, wc, properties
+from bzrlib.plugins.svn import core, errors, properties, wc
def parse_externals_description(base_url, val):
"""Parse an svn:externals property value.
=== modified file 'workingtree.py'
--- a/workingtree.py 2008-06-15 00:41:08 +0000
+++ b/workingtree.py 2008-06-15 01:13:47 +0000
@@ -31,7 +31,7 @@
from bzrlib.transport.local import LocalTransport
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat
-from bzrlib.plugins.svn import properties
+from bzrlib.plugins.svn import core, properties
from bzrlib.plugins.svn.branch import SvnBranch
from bzrlib.plugins.svn.commit import _revision_id_to_svk_feature
from bzrlib.plugins.svn.convert import SvnConverter
More information about the bazaar-commits
mailing list