D6361: overlayworkingctx: don't include added-then-deleted files in memctx
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri May 10 17:44:55 EDT 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
If a file (such as a .orig file) is temporarily added to the
overlayworkingctx and then deleted, it's still going to be in the
_cache dict. In tomemctx(), we created the list of files from
_cache.keys(), so the memctx.files() would include the temporary
file. That was fine because the list of files was only used in
localrepo.commitctx() (I think), where there's an extra filtering of
incorrectly removed files (annotated with an inaccurate "update
manifest" comment). I'd like to call memctx.files() in another case,
but first we need to make it accurate.
diff --git a/mercurial/context.py b/mercurial/context.py
@@ -2055,7 +2055,7 @@
parents = (self._repo[parents], self._repo[parents])
- files = self._cache.keys()
+ files = self.files()
def getfile(repo, memctx, path):
return memfilectx(repo, memctx, path,
To: martinvonz, #hg-reviewers
More information about the Mercurial-devel