Merge property changes from 0.4.

[jelmer/subvertpy.git] / mapping3 / __init__.py

diff --git a/mapping3/__init__.py b/mapping3/__init__.py
index c301cb4ba89c5e32f7bf27c11c4ab352db4fb8f2..08393a851c38468e18b16eeb4364a01c46e730e0 100644 (file)
--- a/mapping3/__init__.py
+++ b/mapping3/__init__.py
@@ -16,14 +16,13 @@
 from bzrlib import osutils, ui
 from bzrlib.errors import InvalidRevisionId
 from bzrlib.trace import mutter
-from bzrlib.plugins.svn import mapping
-from layout import RepositoryLayout
-from mapping3.scheme import (BranchingScheme, guess_scheme_from_branch_path, 
+from bzrlib.plugins.svn import core, constants, mapping, properties
+from bzrlib.plugins.svn.layout import RepositoryLayout
+from bzrlib.plugins.svn.mapping3.scheme import (BranchingScheme, guess_scheme_from_branch_path, 
                              guess_scheme_from_history, ListBranchingScheme, 
                              parse_list_scheme_text, NoBranchingScheme,
                              TrunkBranchingScheme, ListBranchingScheme)
-import sha, svn
-from svn.core import SubversionException
+import sha
 
 SVN_PROP_BZR_BRANCHING_SCHEME = 'bzr:branching-scheme'
 
@@ -66,14 +65,15 @@ class SchemeDerivedLayout(RepositoryLayout):
 
     def get_branches(self, revnum, project=""):
         def check_path(path):
-            return self.repository.transport.check_path(path, revnum) == svn.core.svn_node_dir
+            return self.repository.transport.check_path(path, revnum) == core.NODE_DIR
         def find_children(path):
             try:
+                assert not path.startswith("/")
                 dirents = self.repository.transport.get_dir(path, revnum)[0]
-            except SubversionException, (msg, num):
-                if num == svn.core.SVN_ERR_FS_NOT_DIRECTORY:
+            except core.SubversionException, (msg, num):
+                if num == constants.ERR_FS_NOT_DIRECTORY:
                     return None
-                if num == svn.core.SVN_ERR_FS_NOT_FOUND:
+                if num == constants.ERR_FS_NOT_FOUND:
                     return None
                 raise
             return dirents.keys()
@@ -121,7 +121,7 @@ def set_property_scheme(repository, scheme):
     def done(revmetadata, pool):
         pass
     editor = repository.transport.get_commit_editor(
-            {svn.core.SVN_PROP_REVISION_LOG: "Updating branching scheme for Bazaar."},
+            {properties.PROP_REVISION_LOG: "Updating branching scheme for Bazaar."},
             done, None, False)
     root = editor.open_root(-1)
     editor.change_dir_prop(root, SVN_PROP_BZR_BRANCHING_SCHEME,