This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9171

tests: add test of copies suggested by Pierre-Yves on D9159
ClosedPublic

Authored by martinvonz on Oct 8 2020, 11:14 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd1c44591e751: tests: add test of copies suggested by Pierre-Yves on D9159

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.Oct 8 2020, 11:14 AM
pulkit accepted this revision.Oct 13 2020, 3:40 AM
This revision is now accepted and ready to land.Oct 13 2020, 3:40 AM
marmoute added a subscriber: marmoute.Oct 13 2020, 6:52 AM

This test case should go in tests/test-copies-chain-merge.t since this is where the combination of merging and copies information is tested. It would also ensure that it is properly tested on all the relevant cases. Can we drop it in its current form, and restart review based on a diff on tests/test-copies-chain-merge.t ?

(cc @pulkit )

martinvonz added a comment.Oct 13 2020, 12:22 PM
In D9171#138205, @marmoute wrote:

This test case should go in tests/test-copies-chain-merge.t since this is where the combination of merging and copies information is tested.

That is *one* place where copies and merges are tested, but not the only place. Just search for "merge" in this file if you're curious. There was a very similar case just above the one I added.

It would also ensure that it is properly tested on all the relevant cases.

OTOH, until my next patch in this series, that would mean that it would *not* be tested with copy information in extras.

Can we drop it in its current form, and restart review based on a diff on tests/test-copies-chain-merge.t ?

I don't see any reason to.

marmoute added a comment.Oct 13 2020, 2:42 PM
In D9171#138234, @martinvonz wrote:
In D9171#138205, @marmoute wrote:

This test case should go in tests/test-copies-chain-merge.t since this is where the combination of merging and copies information is tested.

That is *one* place where copies and merges are tested, but not the only place. Just search for "merge" in this file if you're curious. There was a very similar case just above the one I added.

The goal of tests/test-copies-chain-merge.t is to contains an exhaustive testing of copy tracing cases that involves chaining copies+merge. So that tests case must be tested in tests/test-copies-chain-merge.t too.

Revision Contents
Changeset List

PathPackages
Mtests/test-copies.t (47 lines)

Diff 23181

tests/test-copies.t

$ hg debugpathcopies 1 5 $ hg debugpathcopies 1 5
y -> z (no-filelog !) y -> z (no-filelog !)
$ hg debugpathcopies 2 5 $ hg debugpathcopies 2 5
x -> z (no-filelog !) x -> z (no-filelog !)
$ hg debugpathcopies 0 5 $ hg debugpathcopies 0 5
x -> z x -> z
Create x and y, then rename x to z on one side of merge, and rename y to z and
then delete z on the other side.
$ newrepo
$ echo x > x
$ echo y > y
$ hg ci -Aqm 'add x and y'
$ hg mv x z
$ hg ci -qm 'rename x to z'
$ hg co -q 0
$ hg mv y z
$ hg ci -qm 'rename y to z'
$ hg rm z
$ hg ci -m 'delete z'
$ hg merge -q 1
$ echo z > z
$ hg ci -m 'merge 1 into 3'
Try merging the other direction too
$ hg co -q 1
$ hg merge -q 3
$ echo z > z
$ hg ci -m 'merge 3 into 1'
created new head
$ hg l
@ 5 merge 3 into 1
|\ z
+---o 4 merge 1 into 3
| |/ z
| o 3 delete z
| | z
| o 2 rename y to z
| | y z
o | 1 rename x to z
|/ x z
o 0 add x and y
x y
$ hg debugpathcopies 1 4
$ hg debugpathcopies 2 4
x -> z (no-filelog !)
$ hg debugpathcopies 0 4
x -> z (filelog !)
$ hg debugpathcopies 1 5
$ hg debugpathcopies 2 5
x -> z (no-filelog !)
$ hg debugpathcopies 0 5
x -> z
Test for a case in fullcopytracing algorithm where neither of the merging csets Test for a case in fullcopytracing algorithm where neither of the merging csets
is a descendant of the merge base. This test reflects that the algorithm is a descendant of the merge base. This test reflects that the algorithm
correctly finds the copies: correctly finds the copies:
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True
> evolution.allowunstable=True > evolution.allowunstable=True