Consistently use NotSvnBranchPath rather than NotBranchError when checking whether...

[jelmer/subvertpy.git] / fileids.py

diff --git a/fileids.py b/fileids.py
index c8302b5730cbbe7e6ffd193fe808f91e5df1bc64..f7fd2e4d742a447713c1e3ab9e959c8ac1753185 100644 (file)
--- a/fileids.py
+++ b/fileids.py
@@ -16,7 +16,7 @@
 """Generation of file-ids."""
 
 from bzrlib import ui
-from bzrlib.errors import NotBranchError, RevisionNotPresent
+from bzrlib.errors import RevisionNotPresent
 from bzrlib.knit import make_file_factory
 from bzrlib.revision import NULL_REVISION
 from bzrlib.trace import mutter
@@ -24,7 +24,7 @@ from bzrlib.versionedfile import ConstantMapper
 
 import urllib
 
-from bzrlib.plugins.svn import changes
+from bzrlib.plugins.svn import changes, errors
 
 def get_local_changes(paths, branch, mapping, layout, generate_revid, 
                       get_children=None):
@@ -60,7 +60,7 @@ def get_local_changes(paths, branch, mapping, layout, generate_revid,
                 else:
                     data = (data[0], crp, generate_revid(
                                   data[2], cbp, mapping))
-            except NotBranchError:
+            except errors.NotSvnBranchPath:
                 # Copied from outside of a known branch
                 # Make it look like the files were added in this revision
                 if get_children is not None: