comparison mercurial/context.py @ 42290:e79aeb518aa1

overlayworkingctx: don't include added-then-deleted files in memctx

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.

Differential Revision: https://phab.mercurial-scm.org/D6361

42289:83b225fbd788

        if parents[1] is None:
            parents = (self._repo[parents[0]], None)
        else:
            parents = (self._repo[parents[0]], self._repo[parents[1]])

        files = self._cache.keys()
        def getfile(repo, memctx, path):
            if self._cache[path]['exists']:
                return memfilectx(repo, memctx, path,
                                  self._cache[path]['data'],
                                  'l' in self._cache[path]['flags'],

42290:e79aeb518aa1

        if parents[1] is None:
            parents = (self._repo[parents[0]], None)
        else:
            parents = (self._repo[parents[0]], self._repo[parents[1]])

        files = self.files()
        def getfile(repo, memctx, path):
            if self._cache[path]['exists']:
                return memfilectx(repo, memctx, path,
                                  self._cache[path]['data'],
                                  'l' in self._cache[path]['flags'],