Comments
Patch
@@ -34,11 +34,10 @@ from . import (
patch,
pathutil,
phases,
pycompat,
repoview,
- revlog,
scmutil,
sparse,
subrepo,
subrepoutil,
util,
@@ -2285,21 +2284,14 @@ class memctx(committablectx):
# keep this simple for now; just worry about p1
pctx = self._parents[0]
man = pctx.manifest().copy()
for f in self._status.modified:
- p1node = nullid
- p2node = nullid
- p = pctx[f].parents() # if file isn't in pctx, check p2?
- if len(p) > 0:
- p1node = p[0].filenode()
- if len(p) > 1:
- p2node = p[1].filenode()
- man[f] = revlog.hash(self[f].data(), p1node, p2node)
+ man[f] = modifiednodeid
for f in self._status.added:
- man[f] = revlog.hash(self[f].data(), nullid, nullid)
+ man[f] = addednodeid
for f in self._status.removed:
if f in man:
del man[f]