equal
deleted
inserted
replaced
8 from __future__ import absolute_import |
8 from __future__ import absolute_import |
9 |
9 |
10 import re |
10 import re |
11 |
11 |
12 from .i18n import _ |
12 from .i18n import _ |
13 from .node import ( |
13 from .node import bin |
14 bin, |
|
15 wdirid, |
|
16 ) |
|
17 from . import ( |
14 from . import ( |
18 color, |
15 color, |
19 dagop, |
16 dagop, |
20 diffutil, |
17 diffutil, |
21 encoding, |
18 encoding, |
776 return hexnode |
773 return hexnode |
777 else: |
774 else: |
778 try: |
775 try: |
779 node = scmutil.resolvehexnodeidprefix(repo, hexnode) |
776 node = scmutil.resolvehexnodeidprefix(repo, hexnode) |
780 except error.WdirUnsupported: |
777 except error.WdirUnsupported: |
781 node = wdirid |
778 node = repo.nodeconstants.wdirid |
782 except error.LookupError: |
779 except error.LookupError: |
783 return hexnode |
780 return hexnode |
784 if not node: |
781 if not node: |
785 return hexnode |
782 return hexnode |
786 cache = context.resource(mapping, b'cache') |
783 cache = context.resource(mapping, b'cache') |