diff mercurial/changelog.py @ 42861:57ea0a81a65c

copies: remove existing copy info from the changeset on amend (BC)

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.

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

--- a/mercurial/changelog.py	Tue Jul 16 21:15:35 2019 -0700
+++ b/mercurial/changelog.py	Tue Jul 16 21:15:39 2019 -0700
@@ -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: