convert: brz 3.3.0 moved NoSuchFile exception to breezy.transport stable
authorAnton Shestakov <av6@dwimlabs.net>
Wed, 25 Jan 2023 17:52:00 +0400
branchstable
changeset 49947 43bfddcba7d6
parent 49946 76c128d4de4e
child 49948 37de1a154472
convert: brz 3.3.0 moved NoSuchFile exception to breezy.transport
hgext/convert/bzr.py
--- a/hgext/convert/bzr.py	Tue Dec 06 15:11:51 2022 +0100
+++ b/hgext/convert/bzr.py	Wed Jan 25 17:52:00 2023 +0400
@@ -41,6 +41,12 @@
     revision = breezy.revision
     revisionspec = breezy.revisionspec
     revisionspec.RevisionSpec
+
+    try:
+        # brz 3.3.0 (revno: 7614.2.2)
+        from breezy.transport import NoSuchFile
+    except ImportError:
+        from breezy.errors import NoSuchFile
 except ImportError:
     pass
 
@@ -150,7 +156,7 @@
 
         try:
             kind = revtree.kind(name)
-        except breezy.errors.NoSuchFile:
+        except NoSuchFile:
             return None, None
         if kind not in supportedkinds:
             # the file is not available anymore - was deleted