Show More
@@ -17,6 +17,11 b' import revlog' | |||||
17 |
|
17 | |||
18 | propertycache = util.propertycache |
|
18 | propertycache = util.propertycache | |
19 |
|
19 | |||
|
20 | # Phony node value to stand-in for new files in some uses of | |||
|
21 | # manifests. Manifests support 21-byte hashes for nodes which are | |||
|
22 | # dirty in the working copy. | |||
|
23 | _newnode = '!' * 21 | |||
|
24 | ||||
20 | class basectx(object): |
|
25 | class basectx(object): | |
21 | """A basectx object represents the common logic for its children: |
|
26 | """A basectx object represents the common logic for its children: | |
22 | changectx: read-only context that is already present in the repo, |
|
27 | changectx: read-only context that is already present in the repo, | |
@@ -128,7 +133,7 b' class basectx(object):' | |||||
128 | if (fn not in deletedset and |
|
133 | if (fn not in deletedset and | |
129 | ((fn in withflags and mf1.flags(fn) != mf2.flags(fn)) or |
|
134 | ((fn in withflags and mf1.flags(fn) != mf2.flags(fn)) or | |
130 | (mf1[fn] != mf2node and |
|
135 | (mf1[fn] != mf2node and | |
131 | (mf2node or self[fn].cmp(other[fn]))))): |
|
136 | (mf2node != _newnode or self[fn].cmp(other[fn]))))): | |
132 | modified.append(fn) |
|
137 | modified.append(fn) | |
133 | elif listclean: |
|
138 | elif listclean: | |
134 | clean.append(fn) |
|
139 | clean.append(fn) | |
@@ -1408,7 +1413,7 b' class workingctx(committablectx):' | |||||
1408 | mf = self._repo['.']._manifestmatches(match, s) |
|
1413 | mf = self._repo['.']._manifestmatches(match, s) | |
1409 | modified, added, removed = s[0:3] |
|
1414 | modified, added, removed = s[0:3] | |
1410 | for f in modified + added: |
|
1415 | for f in modified + added: | |
1411 |
mf[f] = |
|
1416 | mf[f] = _newnode | |
1412 | mf.setflag(f, self.flags(f)) |
|
1417 | mf.setflag(f, self.flags(f)) | |
1413 | for f in removed: |
|
1418 | for f in removed: | |
1414 | if f in mf: |
|
1419 | if f in mf: |
General Comments 0
You need to be logged in to leave comments.
Login now