This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8376

tests: collect all branch creation in one place in test-copies-chain-merge.t
ClosedPublic

Authored by martinvonz on Apr 2 2020, 4:59 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4e2845d9452d: tests: collect all branch creation in one place in test-copies-chain-merge.t
Summary

I found this test case really hard to read because it requires
scrolling back and forth between the setup and the verification. The
next patch will move the verification close to the merge commits they
test. This patch prepares for that by moving all branch creation first
so they are separate from the merge commits (because many merge
commits reuse the same branches).

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.Apr 2 2020, 4:59 PM
pulkit accepted this revision.Apr 7 2020, 8:29 AM
pulkit added a subscriber: pulkit.

I was trying to understand what's going on the test modified here and this patch helped me. Thanks!

This revision is now accepted and ready to land.Apr 7 2020, 8:29 AM
marmoute added a subscriber: marmoute.Apr 7 2020, 9:03 AM

I would prefer you wait for planned change to land before you do further change to the file. The coming changes fixes bug and I rather not have to fix too many conflict while doing so.

pulkit added a comment.Apr 7 2020, 9:07 AM
In D8376#125173, @marmoute wrote:

I would prefer you wait for planned change to land before you do further change to the file. The coming changes fixes bug and I rather not have to fix too many conflict while doing so.

I already pushed them, I will resolve conflicts on those couple of patches and update them on heptapod.

martinvonz added a comment.Apr 7 2020, 11:30 AM
In D8376#125174, @pulkit wrote:
In D8376#125173, @marmoute wrote:

I would prefer you wait for planned change to land before you do further change to the file. The coming changes fixes bug and I rather not have to fix too many conflict while doing so.

I already pushed them, I will resolve conflicts on those couple of patches and update them on heptapod.

Thanks, Pulkit!

Revision Contents
Changeset List

PathPackages
Mtests/test-copies-chain-merge.t (175 lines)

Diff 21003

tests/test-copies-chain-merge.t

| |
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
Create a branch that delete a file previous renamed
$ hg up 'desc("i-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rm d
$ hg ci -m 'c-1 delete d'
created new head
$ hg log -G --rev '::.'
@ 6 c-1 delete d
|
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
Create a branch that delete a file previous renamed and recreate it
$ hg up 'desc("i-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rm d
$ hg ci -m 'd-1 delete d'
created new head
$ echo bar > d
$ hg add d
$ hg ci -m 'd-2 re-add d'
$ hg log -G --rev '::.'
@ 8 d-2 re-add d
|
o 7 d-1 delete d
|
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
Having another branch renaming a different file to the same filename as another
$ hg up 'desc("i-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv b g
$ hg ci -m 'e-1 b -move-> g'
created new head
$ hg mv g f
$ hg ci -m 'e-2 g -move-> f'
$ hg log -G --rev '::.'
@ 10 e-2 g -move-> f
|
o 9 e-1 b -move-> g
|
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
Merge the two branches we just defined (in both directions) Merge the two branches we just defined (in both directions)
- one with change to an unrelated file - one with change to an unrelated file
- one with renames in them - one with renames in them
$ hg up 'desc("b-1")' $ hg up 'desc("b-1")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("a-2")' $ hg merge 'desc("a-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mBAm-0 simple merge - one way' $ hg ci -m 'mBAm-0 simple merge - one way'
$ hg up 'desc("a-2")' $ hg up 'desc("a-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")' $ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mABm-0 simple merge - the other way' $ hg ci -m 'mABm-0 simple merge - the other way'
created new head created new head
$ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
@ 7 mABm-0 simple merge - the other way @ 12 mABm-0 simple merge - the other way
|\ |\
+---o 6 mBAm-0 simple merge - one way +---o 11 mBAm-0 simple merge - one way
| |/ | |/
| o 5 b-1: b update | o 5 b-1: b update
| | | |
o | 4 a-2: e -move-> f o | 4 a-2: e -move-> f
| | | |
o | 3 a-1: d -move-> e o | 3 a-1: d -move-> e
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
Create a branch that delete a file previous renamed
$ hg up 'desc("i-2")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg rm d
$ hg ci -m 'c-1 delete d'
created new head
$ hg log -G --rev '::.'
@ 8 c-1 delete d
|
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
Merge: Merge:
- one with change to an unrelated file - one with change to an unrelated file
- one deleting the change - one deleting the change
and recreate an unrelated file after the merge and recreate an unrelated file after the merge
$ hg up 'desc("b-1")' $ hg up 'desc("b-1")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("c-1")' $ hg merge 'desc("c-1")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mBCm-0 simple merge - one way' $ hg ci -m 'mBCm-0 simple merge - one way'
$ echo bar > d $ echo bar > d
$ hg add d $ hg add d
$ hg ci -m 'mBCm-1 re-add d' $ hg ci -m 'mBCm-1 re-add d'
$ hg up 'desc("c-1")' $ hg up 'desc("c-1")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("b-1")' $ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mCBm-0 simple merge - the other way' $ hg ci -m 'mCBm-0 simple merge - the other way'
created new head created new head
$ echo bar > d $ echo bar > d
$ hg add d $ hg add d
$ hg ci -m 'mCBm-1 re-add d' $ hg ci -m 'mCBm-1 re-add d'
$ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))'
@ 12 mCBm-1 re-add d @ 16 mCBm-1 re-add d
| |
o 11 mCBm-0 simple merge - the other way o 15 mCBm-0 simple merge - the other way
|\ |\
| | o 10 mBCm-1 re-add d | | o 14 mBCm-1 re-add d
| | | | | |
+---o 9 mBCm-0 simple merge - one way +---o 13 mBCm-0 simple merge - one way
| |/ | |/
| o 8 c-1 delete d | o 6 c-1 delete d
| | | |
o | 5 b-1: b update o | 5 b-1: b update
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
Create a branch that delete a file previous renamed and recreate it
$ hg up 'desc("i-2")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rm d
$ hg ci -m 'd-1 delete d'
created new head
$ echo bar > d
$ hg add d
$ hg ci -m 'd-2 re-add d'
$ hg log -G --rev '::.'
@ 14 d-2 re-add d
|
o 13 d-1 delete d
|
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
Merge: Merge:
- one with change to an unrelated file - one with change to an unrelated file
- one deleting and recreating the file - one deleting and recreating the file
Note: Note:
| In this case, the merge get conflicting information since on one side we have | In this case, the merge get conflicting information since on one side we have
| a "brand new" d. and one the other one we have "d renamed from c (itself | a "brand new" d. and one the other one we have "d renamed from c (itself
| renamed from c)". | renamed from c)".
| |
| The current code arbitrarily pick one side | The current code arbitrarily pick one side
$ hg up 'desc("b-1")' $ hg up 'desc("b-1")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("d-2")' $ hg merge 'desc("d-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mBDm-0 simple merge - one way' $ hg ci -m 'mBDm-0 simple merge - one way'
$ hg up 'desc("d-2")' $ hg up 'desc("d-2")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")' $ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mDBm-0 simple merge - the other way' $ hg ci -m 'mDBm-0 simple merge - the other way'
created new head created new head
$ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
@ 16 mDBm-0 simple merge - the other way @ 18 mDBm-0 simple merge - the other way
|\ |\
+---o 15 mBDm-0 simple merge - one way +---o 17 mBDm-0 simple merge - one way
| |/ | |/
| o 14 d-2 re-add d | o 8 d-2 re-add d
| | | |
| o 13 d-1 delete d | o 7 d-1 delete d
| | | |
o | 5 b-1: b update o | 5 b-1: b update
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
Having another branch renaming a different file to the same filename as another
$ hg up 'desc("i-2")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv b g
$ hg ci -m 'e-1 b -move-> g'
created new head
$ hg mv g f
$ hg ci -m 'e-2 g -move-> f'
$ hg log -G --rev '::.'
@ 18 e-2 g -move-> f
|
o 17 e-1 b -move-> g
|
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
Merge: Merge:
- the "e-" branch renaming b to f (through 'g') - the "e-" branch renaming b to f (through 'g')
- the "a-" branch renaming d to f (through e) - the "a-" branch renaming d to f (through e)
$ hg up 'desc("a-2")' $ hg up 'desc("a-2")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("e-2")' $ hg merge 'desc("e-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mAEm-0 simple merge - one way' $ hg ci -m 'mAEm-0 simple merge - one way'
$ hg up 'desc("e-2")' $ hg up 'desc("e-2")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("a-2")' $ hg merge 'desc("a-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mEAm-0 simple merge - the other way' $ hg ci -m 'mEAm-0 simple merge - the other way'
created new head created new head
$ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))'
@ 20 mEAm-0 simple merge - the other way @ 20 mEAm-0 simple merge - the other way
|\ |\
+---o 19 mAEm-0 simple merge - one way +---o 19 mAEm-0 simple merge - one way
| |/ | |/
| o 18 e-2 g -move-> f | o 10 e-2 g -move-> f
| | | |
| o 17 e-1 b -move-> g | o 9 e-1 b -move-> g
| | | |
o | 4 a-2: e -move-> f o | 4 a-2: e -move-> f
| | | |
o | 3 a-1: d -move-> e o | 3 a-1: d -move-> e
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
$ hg mv h i $ hg mv h i
$ hg commit -m "f-1: rename h -> i" $ hg commit -m "f-1: rename h -> i"
created new head created new head
$ hg mv --force i d $ hg mv --force i d
$ hg commit -m "f-2: rename i -> d" $ hg commit -m "f-2: rename i -> d"
$ hg debugindex d $ hg debugindex d
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 2 01c2f5eabdc4 000000000000 000000000000 0 2 01c2f5eabdc4 000000000000 000000000000
1 10 b004912a8510 000000000000 000000000000 1 8 b004912a8510 000000000000 000000000000
2 15 0bb5445dc4d0 01c2f5eabdc4 b004912a8510 2 17 0bb5445dc4d0 01c2f5eabdc4 b004912a8510
3 22 c72365ee036f 000000000000 000000000000 3 22 c72365ee036f 000000000000 000000000000
$ hg up 'desc("b-1")' $ hg up 'desc("b-1")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("f-2")' $ hg merge 'desc("f-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mBFm-0 simple merge - one way' $ hg ci -m 'mBFm-0 simple merge - one way'
$ hg up 'desc("f-2")' $ hg up 'desc("f-2")'
created new head created new head
$ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'
@ 27 mGDm-0 simple merge - the other way @ 27 mGDm-0 simple merge - the other way
|\ |\
+---o 26 mDGm-0 simple merge - one way +---o 26 mDGm-0 simple merge - one way
| |/ | |/
| o 25 g-1: update d | o 25 g-1: update d
| | | |
o | 14 d-2 re-add d o | 8 d-2 re-add d
| | | |
o | 13 d-1 delete d o | 7 d-1 delete d
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
$ hg manifest --debug --rev 'desc("d-2")' | grep '644 d' $ hg manifest --debug --rev 'desc("d-2")' | grep '644 d'
b004912a8510032a0350a74daa2803dadfb00e12 644 d b004912a8510032a0350a74daa2803dadfb00e12 644 d
$ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d'
01c2f5eabdc4ce2bdee42b5f86311955e6c8f573 644 d 01c2f5eabdc4ce2bdee42b5f86311955e6c8f573 644 d
$ hg debugindex d $ hg debugindex d
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 2 01c2f5eabdc4 000000000000 000000000000 0 2 01c2f5eabdc4 000000000000 000000000000
1 10 b004912a8510 000000000000 000000000000 1 8 b004912a8510 000000000000 000000000000
2 15 0bb5445dc4d0 01c2f5eabdc4 b004912a8510 2 17 0bb5445dc4d0 01c2f5eabdc4 b004912a8510
3 22 c72365ee036f 000000000000 000000000000 3 22 c72365ee036f 000000000000 000000000000
4 23 863d9bc49190 01c2f5eabdc4 c72365ee036f 4 23 863d9bc49190 01c2f5eabdc4 c72365ee036f
5 25 7bded9d9da1f 01c2f5eabdc4 000000000000 5 25 7bded9d9da1f 01c2f5eabdc4 000000000000
6 26 f04cac32d703 b004912a8510 7bded9d9da1f 6 26 f04cac32d703 b004912a8510 7bded9d9da1f
7 27 d7a5eafb9322 7bded9d9da1f b004912a8510 7 27 d7a5eafb9322 7bded9d9da1f b004912a8510
8 28 2ed7a51aed47 c72365ee036f 7bded9d9da1f 8 28 2ed7a51aed47 c72365ee036f 7bded9d9da1f
(This `hg log` output if wrong, since no merge actually happened). (This `hg log` output if wrong, since no merge actually happened).
$ hg log -Gfr 'desc("mBDm-0")' d $ hg log -Gfr 'desc("mBDm-0")' d
o 15 mBDm-0 simple merge - one way o 17 mBDm-0 simple merge - one way
|\ |\
o : 14 d-2 re-add d o : 8 d-2 re-add d
:/ :/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
This `hg log` output is correct This `hg log` output is correct
$ hg log -Gfr 'desc("mDBm-0")' d $ hg log -Gfr 'desc("mDBm-0")' d
o 14 d-2 re-add d o 8 d-2 re-add d
| |
~ ~
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")'
M b M b
A d A d
a a
R a R a
eb806e34ef6be4c264effd5933d31004ad15a793 644 f eb806e34ef6be4c264effd5933d31004ad15a793 644 f
$ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
0dd616bc7ab1a111921d95d76f69cda5c2ac539c 644 f 0dd616bc7ab1a111921d95d76f69cda5c2ac539c 644 f
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
6da5a2eecb9c833f830b67a4972366d49a9a142c 644 f 6da5a2eecb9c833f830b67a4972366d49a9a142c 644 f
$ hg debugindex f $ hg debugindex f
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 4 0dd616bc7ab1 000000000000 000000000000 0 4 0dd616bc7ab1 000000000000 000000000000
1 18 6da5a2eecb9c 000000000000 000000000000 1 10 6da5a2eecb9c 000000000000 000000000000
2 19 eb806e34ef6b 0dd616bc7ab1 6da5a2eecb9c 2 19 eb806e34ef6b 0dd616bc7ab1 6da5a2eecb9c
$ hg status --copies --rev 'desc("a-2")' --rev 'desc("mAEm-0")' $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mAEm-0")'
M f M f
R b R b
$ hg status --copies --rev 'desc("a-2")' --rev 'desc("mEAm-0")' $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mEAm-0")'
M f M f
R b R b
$ hg status --copies --rev 'desc("e-2")' --rev 'desc("mAEm-0")' $ hg status --copies --rev 'desc("e-2")' --rev 'desc("mAEm-0")'
$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGDm-0")' $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGDm-0")'
M d M d
$ hg log -Gfr 'desc("mDGm-0")' d $ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 simple merge - one way o 26 mDGm-0 simple merge - one way
|\ |\
| o 25 g-1: update d | o 25 g-1: update d
| | | |
o | 14 d-2 re-add d o | 8 d-2 re-add d
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
$ hg log -Gfr 'desc("mDGm-0")' d $ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 simple merge - one way o 26 mDGm-0 simple merge - one way
|\ |\
| o 25 g-1: update d | o 25 g-1: update d
| | | |
o | 14 d-2 re-add d o | 8 d-2 re-add d
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h