Merge 0.4.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 15 Jun 2008 01:13:47 +0000 (03:13 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 15 Jun 2008 01:13:47 +0000 (03:13 +0200)
auth.py
commit.py
core.py [new file with mode: 0644]
logwalker.py
ra.py [new file with mode: 0644]
remote.py
tree.py
workingtree.py

diff --git a/auth.py b/auth.py
index 0640efaf84dcb3c9d80442a2e854d13ae5f37efc..b613676ca33b56f3a25b2e4e58e28263e7fc8429 100644 (file)
--- a/auth.py
+++ b/auth.py
 
 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
index 005700c4fd561eadfe03e2b6528d929fe695ee90..5ccd94f5fd8e86a0bbdc9759df102a9edbd28068 100644 (file)
--- a/commit.py
+++ b/commit.py
@@ -27,7 +27,7 @@ from bzrlib.repository import RootCommitBuilder, InterRepository
 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
 
diff --git a/core.py b/core.py
new file mode 100644 (file)
index 0000000..afc4f78
--- /dev/null
+++ b/core.py
@@ -0,0 +1,20 @@
+# Copyright (C) 2005-2007 Jelmer Vernooij <jelmer@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
index 423e0d2e6aef9244d5986a5f15f31373a5507827..5c2e93be2e362c0bba202ea79c9fcd437c6ba0f8 100644 (file)
@@ -24,9 +24,9 @@ from bzrlib.plugins.svn.core import SubversionException
 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):
diff --git a/ra.py b/ra.py
new file mode 100644 (file)
index 0000000..9549d27
--- /dev/null
+++ b/ra.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2005-2007 Jelmer Vernooij <jelmer@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
index 85815d21b5d04a9d09ef6fa628cfd6c57c5d6f9d..59acbb72dc1b6d96542ba84c4dbe7ab299cbde6b 100644 (file)
--- a/remote.py
+++ b/remote.py
@@ -25,6 +25,7 @@ from bzrlib.transport.local import LocalTransport
 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
diff --git a/tree.py b/tree.py
index ee61ffeb1a4b8d20ae12d5e3202107aeadcddb7c..30edf1433b40c03e8550d0b24fbd8ca11d3f7658 100644 (file)
--- a/tree.py
+++ b/tree.py
@@ -29,7 +29,7 @@ from cStringIO import StringIO
 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.
index ca93fcf56ef0835479c3e8289135b22ecfc6889b..c581c904803a5ed15862bde3877f01423c68b703 100644 (file)
@@ -31,7 +31,7 @@ from bzrlib.revisiontree import RevisionTree
 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