This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6751

tests: show invalid copies when turning off copies-in-changeset
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6f0273558c4b: tests: show invalid copies when turning off copies-in-changeset
Summary

If you turn on copies in changesets and write a commit with a copy,
then turn it off and amend the commit while undoing the copy, the
invalid copy information will remain. The read path doesn't crash in
invalid copy data, but it seems better to not produce the invalid
data.

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 child revision: D6752: copies: remove existing copy info from the changeset on amend (BC).Aug 20 2019, 12:29 PM
martinvonz retitled this revision from test: show invalid copies when turning off copies-in-changeset to tests: show invalid copies when turning off copies-in-changeset.
martinvonz added a commit: rHG6f0273558c4b: tests: show invalid copies when turning off copies-in-changeset.Sep 5 2019, 3:15 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG6f0273558c4b: tests: show invalid copies when turning off copies-in-changeset (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-copies-in-changeset.t (14 lines)

Diff 16380

tests/test-copies-in-changeset.t

\x01 (esc) \x01 (esc)
a a
$ hg showcopies $ hg showcopies
a -> j a -> j
$ hg showcopies --config experimental.copies.read-from=compatibility $ hg showcopies --config experimental.copies.read-from=compatibility
a -> j a -> j
$ hg showcopies --config experimental.copies.read-from=filelog-only $ hg showcopies --config experimental.copies.read-from=filelog-only
a -> j a -> j
Existing copy information in the changeset gets removed on amend and writing
copy information on to the filelog
$ hg ci --amend -m 'copy a to j, v2' \
> --config experimental.copies.write-to=filelog-only
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 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
filesadded: filesadded:
filesremoved: filesremoved: