This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6752

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

Authored by martinvonz on Aug 20 2019, 12:29 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG57ea0a81a65c: copies: remove existing copy info from the changeset on amend (BC)
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Aug 20 2019, 12:29 PM
martinvonz added a commit: rHG57ea0a81a65c: copies: remove existing copy info from the changeset on amend (BC).Sep 5 2019, 3:15 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG57ea0a81a65c: copies: remove existing copy info from the changeset on amend (BC) (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 16381

mercurial/changelog.py

del extra["branch"] del extra["branch"]
elif branch in (".", "null", "tip"): elif branch in (".", "null", "tip"):
raise error.StorageError(_('the name \'%s\' is reserved') raise error.StorageError(_('the name \'%s\' is reserved')
% branch) % branch)
extrasentries = p1copies, p2copies, filesadded, filesremoved extrasentries = p1copies, p2copies, filesadded, filesremoved
if extra is None and any(x is not None for x in extrasentries): if extra is None and any(x is not None for x in extrasentries):
extra = {} extra = {}
sortedfiles = sorted(files) sortedfiles = sorted(files)
if extra is not None:
for name in ('p1copies', 'p2copies', 'filesadded', 'filesremoved'):
extra.pop(name, None)
if p1copies is not None: if p1copies is not None:
extra['p1copies'] = encodecopies(sortedfiles, p1copies) extra['p1copies'] = encodecopies(sortedfiles, p1copies)
if p2copies is not None: if p2copies is not None:
extra['p2copies'] = encodecopies(sortedfiles, p2copies) extra['p2copies'] = encodecopies(sortedfiles, p2copies)
if filesadded is not None: if filesadded is not None:
extra['filesadded'] = encodefileindices(sortedfiles, filesadded) extra['filesadded'] = encodefileindices(sortedfiles, filesadded)
if filesremoved is not None: if filesremoved is not None:
extra['filesremoved'] = encodefileindices(sortedfiles, filesremoved) extra['filesremoved'] = encodefileindices(sortedfiles, filesremoved)

tests/test-copies-in-changeset.t

a -> j a -> j
Existing copy information in the changeset gets removed on amend and writing Existing copy information in the changeset gets removed on amend and writing
copy information on to the filelog copy information on to the filelog
$ hg ci --amend -m 'copy a to j, v2' \ $ hg ci --amend -m 'copy a to j, v2' \
> --config experimental.copies.write-to=filelog-only > --config experimental.copies.write-to=filelog-only
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/dd7bb9581359-a6e6b6d2-amend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/dd7bb9581359-a6e6b6d2-amend.hg
$ hg changesetcopies $ hg changesetcopies
files: j files: j
filesadded: 0
filesremoved:
p1copies: 0\x00a (esc)
p2copies:
$ hg showcopies --config experimental.copies.read-from=filelog-only $ hg showcopies --config experimental.copies.read-from=filelog-only
a -> j a -> j
The entries should be written to extras even if they're empty (so the client The entries should be written to extras even if they're empty (so the client
won't have to fall back to reading from filelogs) won't have to fall back to reading from filelogs)
$ echo x >> j $ echo x >> j
$ hg ci -m 'modify j' --config experimental.copies.write-to=compatibility $ hg ci -m 'modify j' --config experimental.copies.write-to=compatibility
$ hg changesetcopies $ hg changesetcopies
files: j files: j