Show More
@@ -10,8 +10,7 b'' | |||
|
10 | 10 | import copy |
|
11 | 11 | import os |
|
12 | 12 | |
|
13 |
from mercurial import |
|
|
14 | discovery | |
|
13 | from mercurial import error, manifest, match as match_, util, discovery | |
|
15 | 14 | from mercurial import node as node_ |
|
16 | 15 | from mercurial.i18n import _ |
|
17 | 16 | from mercurial import localrepo |
@@ -92,14 +91,8 b' def reposetup(ui, repo):' | |||
|
92 | 91 | else: |
|
93 | 92 | # some calls in this function rely on the old version of status |
|
94 | 93 | self.lfstatus = False |
|
95 | if isinstance(node1, context.changectx): | |
|
96 |
|
|
|
97 | else: | |
|
98 | ctx1 = self[node1] | |
|
99 | if isinstance(node2, context.changectx): | |
|
100 | ctx2 = node2 | |
|
101 | else: | |
|
102 | ctx2 = self[node2] | |
|
94 | ctx1 = self[node1] | |
|
95 | ctx2 = self[node2] | |
|
103 | 96 | working = ctx2.rev() is None |
|
104 | 97 | parentworking = working and ctx1 == self['.'] |
|
105 | 98 |
General Comments 0
You need to be logged in to leave comments.
Login now