amend: don't remove unselected removals from memctx
When there are removed files in the working copy and they are not
selected to be amended into the parent, the `filectxfn` we create for
the `memctx` would still return `None` before this patch. That's
clearly incorrect; we should return the `filectx` from the unamended
commit. Somehow it seems to not matter much except for the case with
copies stored in changesets.
Thanks to Kyle Lippincott for doing all the debugging and identifying
the fix for this issue.
Differential Revision: https://phab.mercurial-scm.org/D12573
$ hg init r1
$ cd r1
$ hg ci --config ui.allowemptycommit=true -m c0
$ hg ci --config ui.allowemptycommit=true -m c1
$ hg ci --config ui.allowemptycommit=true -m c2
$ hg co -q 0
$ hg ci --config ui.allowemptycommit=true -m c3
created new head
$ hg co -q 3
$ hg merge --quiet
$ hg ci --config ui.allowemptycommit=true -m c4
$ hg log -G -T'{desc}'
@ c4
|\
| o c3
| |
o | c2
| |
o | c1
|/
o c0
>>> from mercurial import hg
>>> from mercurial import ui as uimod
>>> repo = hg.repository(uimod.ui())
>>> for anc in repo.changelog.ancestors([4], inclusive=True):
... print(anc)
4
3
2
1
0