##// END OF EJS Templates
convert: bzr use absolute_import
timeless -
r28479:d62b0031 default
parent child Browse files
Show More
@@ -26,12 +26,14 b' demandimport.ignore.extend(['
26
26
27 try:
27 try:
28 # bazaar imports
28 # bazaar imports
29 from bzrlib import (
29 import bzrlib.bzrdir
30 bzrdir,
30 import bzrlib.errors
31 errors,
31 import bzrlib.revision
32 revision,
32 import bzrlib.revisionspec.RevisionSpec
33 )
33 bzrdir = bzrlib.bzrdir
34 from bzrlib.revisionspec import RevisionSpec
34 errors = bzrlib.errors
35 revision = bzrlib.revision
36 revisionspec = bzrlib.revisionspec
35 except ImportError:
37 except ImportError:
36 pass
38 pass
37
39
@@ -66,7 +68,6 b' class bzr_source(common.converter_source'
66 # Lightweight checkouts detection is informational but probably
68 # Lightweight checkouts detection is informational but probably
67 # fragile at API level. It should not terminate the conversion.
69 # fragile at API level. It should not terminate the conversion.
68 try:
70 try:
69 from bzrlib import bzrdir
70 dir = bzrdir.BzrDir.open_containing(path)[0]
71 dir = bzrdir.BzrDir.open_containing(path)[0]
71 try:
72 try:
72 tree = dir.open_workingtree(recommend_upgrade=False)
73 tree = dir.open_workingtree(recommend_upgrade=False)
@@ -109,7 +110,7 b' class bzr_source(common.converter_source'
109 revid = None
110 revid = None
110 for branch in self._bzrbranches():
111 for branch in self._bzrbranches():
111 try:
112 try:
112 r = RevisionSpec.from_string(self.revs[0])
113 r = revisionspec.RevisionSpec.from_string(self.revs[0])
113 info = r.in_history(branch)
114 info = r.in_history(branch)
114 except errors.BzrError:
115 except errors.BzrError:
115 pass
116 pass
General Comments 0
You need to be logged in to leave comments. Login now