D5989: copies: filter out copies when target is not in destination manifest
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Feb 20 19:27:54 EST 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
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 --git a/tests/test-copies.t b/tests/test-copies.t
@@ -194,9 +194,7 @@
|/ x y
o 0 add x
-BROKEN: x doesn't exist here
$ hg debugpathcopies 1 2
- y -> x
Copies via null revision (there shouldn't be any)
diff --git a/mercurial/copies.py b/mercurial/copies.py
@@ -124,10 +124,13 @@
# file is a copy of an existing file
t[k] = v
- # remove criss-crossed copies
for k, v in list(t.items()):
+ # remove criss-crossed copies
if k in src and v in dst:
+ # remove copies to files that were then removed
+ elif k not in dst:
+ del t[k]
To: martinvonz, #hg-reviewers
More information about the Mercurial-devel