D6752: copies: remove existing copy info from the changeset on amend (BC)
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Tue Aug 20 16:29:30 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
When amending a changeset with copy information in the changeset and
the new changeset doesn't have any copy information (or similar for
"filesadded" and "filesremoved"), we shouldn't keep it.
A drawback of this is that we now unconditionally remove these four
entries from the extras, breaking any extensions that happened to
write entries with the same names (which seems very unlikely).
I think I'd heard that there was list of blacklisted keys that would
be removed from the extras when a commit is rewritten, but I couldn't
find that. It would make sense to add the keys mentioned above there
instead of the custom filtering I've added in this patch.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6752
AFFECTED FILES
mercurial/changelog.py
tests/test-copies-in-changeset.t
CHANGE DETAILS
diff --git a/tests/test-copies-in-changeset.t b/tests/test-copies-in-changeset.t
--- a/tests/test-copies-in-changeset.t
+++ b/tests/test-copies-in-changeset.t
@@ -140,11 +140,7 @@
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/dd7bb9581359-a6e6b6d2-amend.hg
$ hg changesetcopies
files: j
- filesadded: 0
- filesremoved:
- p1copies: 0\x00a (esc)
- p2copies:
$ hg showcopies --config experimental.copies.read-from=filelog-only
a -> j
The entries should be written to extras even if they're empty (so the client
diff --git a/mercurial/changelog.py b/mercurial/changelog.py
--- a/mercurial/changelog.py
+++ b/mercurial/changelog.py
@@ -637,6 +637,9 @@
if extra is None and any(x is not None for x in extrasentries):
extra = {}
sortedfiles = sorted(files)
+ if extra is not None:
+ for name in ('p1copies', 'p2copies', 'filesadded', 'filesremoved'):
+ extra.pop(name, None)
if p1copies is not None:
extra['p1copies'] = encodecopies(sortedfiles, p1copies)
if p2copies is not None:
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list