equal
deleted
inserted
replaced
14 from mercurial.i18n import _ |
14 from mercurial.i18n import _ |
15 |
15 |
16 from mercurial import ( |
16 from mercurial import ( |
17 error, |
17 error, |
18 localrepo, |
18 localrepo, |
19 match as match_, |
19 match as matchmod, |
20 scmutil, |
20 scmutil, |
21 ) |
21 ) |
22 |
22 |
23 from . import ( |
23 from . import ( |
24 lfcommands, |
24 lfcommands, |
101 ctx2 = self[node2] |
101 ctx2 = self[node2] |
102 working = ctx2.rev() is None |
102 working = ctx2.rev() is None |
103 parentworking = working and ctx1 == self['.'] |
103 parentworking = working and ctx1 == self['.'] |
104 |
104 |
105 if match is None: |
105 if match is None: |
106 match = match_.always(self.root, self.getcwd()) |
106 match = matchmod.always(self.root, self.getcwd()) |
107 |
107 |
108 wlock = None |
108 wlock = None |
109 try: |
109 try: |
110 try: |
110 try: |
111 # updating the dirstate is optional |
111 # updating the dirstate is optional |