equal
deleted
inserted
replaced
12 pycompat, |
12 pycompat, |
13 registrar, |
13 registrar, |
14 util, |
14 util, |
15 ) |
15 ) |
16 |
16 |
17 getmarkers = None |
|
18 successorssets = None |
17 successorssets = None |
19 try: |
18 try: |
20 from mercurial import obsutil |
19 from mercurial import obsutil |
21 getmarkers = getattr(obsutil, 'getmarkers', None) |
|
22 successorssets = getattr(obsutil, 'successorssets', None) |
20 successorssets = getattr(obsutil, 'successorssets', None) |
23 except ImportError: |
21 except ImportError: |
24 pass |
22 pass |
25 |
23 |
26 if getmarkers is None: |
|
27 getmarkers = obsolete.getmarkers |
|
28 if successorssets is None: |
24 if successorssets is None: |
29 successorssets = obsolete.successorssets |
25 successorssets = obsolete.successorssets |
30 |
26 |
31 if pycompat.ispy3: |
27 if pycompat.ispy3: |
32 def branchmapitems(branchmap): |
28 def branchmapitems(branchmap): |