diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -36,7 +36,6 @@ from . import ( phases, pycompat, repoview, - revlog, scmutil, sparse, subrepo, @@ -2287,17 +2286,10 @@ class memctx(committablectx): 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: