This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5989

copies: filter out copies when target is not in destination manifest
ClosedPublic

Authored by martinvonz on Feb 20 2019, 7:27 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd5edb5d3a337: copies: filter out copies when target is not in destination manifest
rHG58d50c697dc7: copies: filter out copies when target is not in destination manifest
Summary

When chaining a series of commits that copied a file with a series
that removed the destination file, we would still include the copy in
the result. Similar to the previous patch, I have checked that `hg
status --copies` is not affected by this bug, but I wouldn't be
surprised if some commands are.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (5 lines)
Mtests/test-copies.t (2 lines)

Diff 14159

mercurial/copies.py

t[k] = t[v] t[k] = t[v]
if v not in dst: if v not in dst:
# chain was a rename, not a copy # chain was a rename, not a copy
del t[v] del t[v]
if v in src: if v in src:
# file is a copy of an existing file # file is a copy of an existing file
t[k] = v t[k] = v
# remove criss-crossed copies
for k, v in list(t.items()): for k, v in list(t.items()):
# remove criss-crossed copies
if k in src and v in dst: if k in src and v in dst:
del t[k] del t[k]
# remove copies to files that were then removed
elif k not in dst:
del t[k]
return t return t
def _tracefile(fctx, am, limit=node.nullrev): def _tracefile(fctx, am, limit=node.nullrev):
"""return file context that is the ancestor of fctx present in ancestor """return file context that is the ancestor of fctx present in ancestor
manifest am, stopping after the first ancestor lower than limit""" manifest am, stopping after the first ancestor lower than limit"""
for f in fctx.ancestors(): for f in fctx.ancestors():

tests/test-copies.t

created new head created new head
$ hg l $ hg l
@ 2 remove x @ 2 remove x
| x | x
| o 1 rename x to y | o 1 rename x to y
|/ x y |/ x y
o 0 add x o 0 add x
x x
BROKEN: x doesn't exist here
$ hg debugpathcopies 1 2 $ hg debugpathcopies 1 2
y -> x
Copies via null revision (there shouldn't be any) Copies via null revision (there shouldn't be any)
$ newrepo $ newrepo
$ echo x > x $ echo x > x
$ hg ci -Aqm 'add x' $ hg ci -Aqm 'add x'
$ hg cp x y $ hg cp x y
$ hg ci -m 'copy x to y' $ hg ci -m 'copy x to y'
$ hg co -q null $ hg co -q null