This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9200

copies: make sure deleted copy info do not overwriting unrelated ones
ClosedPublic

Authored by marmoute on Oct 13 2020, 6:40 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGff7e0ca666e8: copies: make sure deleted copy info do not overwriting unrelated ones
rHG46347041e609: copies: make sure deleted copy info do not overwriting unrelated ones
Summary

See test documentation for details. This is yet another corner case for copy
tracing.

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

marmoute created this revision.Oct 13 2020, 6:40 AM
marmoute updated this revision to Diff 23232.Oct 15 2020, 5:07 PM
marmoute retitled this revision from copies: test for deleted copy info not overwriting unrelated ones to copies: make sure deleted copy info do not overwriting unrelated ones.Oct 20 2020, 9:54 AM
marmoute added subscribers: pulkit, martinvonz.Oct 28 2020, 6:19 PM

Gentle ping on this bugfix (cc @pulkit, @martinvonz)

martinvonz accepted this revision.Oct 30 2020, 1:21 AM
martinvonz added inline comments.
mercurial/copies.py
402–407

new_tt and other_tt are not the best variable names, but that's not this patch's fault. Same thing with the unreadable value[0] and value[1].

tests/test-copies-chain-merge.t
1629–1643

This test case seems pretty redundant with the one in test-copies.t(which was also updated in this patch), but that's not a big deal. (Yes, I get that you test upgrades in this file too.)

This revision is now accepted and ready to land.Oct 30 2020, 1:21 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (5 lines)
Mtests/test-copies-chain-merge.t (106 lines)
Mtests/test-copies.t (2 lines)

Diff 23373

mercurial/copies.py

elif ( elif (
changes is not None changes is not None
and other[1] is None and other[1] is None
and dest in changes.salvaged and dest in changes.salvaged
): ):
minor[dest] = value minor[dest] = value
elif changes is not None and dest in changes.merged: elif changes is not None and dest in changes.merged:
minor[dest] = value minor[dest] = value
elif not isancestor(new_tt, other_tt): elif not isancestor(new_tt, other_tt):
if value[1] is not None:
minor[dest] = value
elif isancestor(other_tt, new_tt):
minor[dest] = value minor[dest] = value
martinvonzUnsubmitted
Not Done

new_tt and other_tt are not the best variable names, but that's not this patch's fault. Same thing with the unreadable value[0] and value[1].

martinvonz: `new_tt` and `other_tt` are not the best variable names, but that's not this patch's fault.
def _revinfo_getter_extra(repo): def _revinfo_getter_extra(repo):
"""return a function that return multiple data given a <rev>"i """return a function that return multiple data given a <rev>"i
* p1: revision number of first parent * p1: revision number of first parent
* p2: revision number of first parent * p2: revision number of first parent
* p1copies: mapping of copies from p1 * p1copies: mapping of copies from p1
* p2copies: mapping of copies from p2 * p2copies: mapping of copies from p2

tests/test-copies-chain-merge.t

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 up null --quiet $ hg up null --quiet
Merging a branch where a rename was deleted with a branch where the same file was renamed
------------------------------------------------------------------------------------------
Create a "conflicting" merge where `d` get removed on one branch before its
rename information actually conflict with the other branch.
(the copy information from the branch that was not deleted should win).
$ hg up 'desc("i-0")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv b d
$ hg ci -m "h-1: b -(move)-> d"
created new head
$ hg up 'desc("c-1")'
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg merge 'desc("h-1")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "mCH-delete-before-conflict-m-0"
$ hg up 'desc("h-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("c-1")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "mHC-delete-before-conflict-m-0"
created new head
$ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))'
@ 36 mHC-delete-before-conflict-m-0
|\
+---o 35 mCH-delete-before-conflict-m-0
| |/
| o 34 h-1: b -(move)-> d
| |
o | 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
Test that sidedata computations during upgrades are correct Test that sidedata computations during upgrades are correct
=========================================================== ===========================================================
We upgrade a repository that is not using sidedata (the filelog case) and We upgrade a repository that is not using sidedata (the filelog case) and
check that the same side data have been generated as if they were computed at check that the same side data have been generated as if they were computed at
commit time. commit time.
entry-0014 size 14 entry-0014 size 14
'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
salvaged : d, ; salvaged : d, ;
##### revision 33 ##### ##### revision 33 #####
1 sidedata entries 1 sidedata entries
entry-0014 size 14 entry-0014 size 14
'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
salvaged : d, ; salvaged : d, ;
##### revision 34 #####
1 sidedata entries
entry-0014 size 24
'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00bd'
removed : b, ;
added p1: d, b;
##### revision 35 #####
1 sidedata entries
entry-0014 size 4
'\x00\x00\x00\x00'
##### revision 36 #####
1 sidedata entries
entry-0014 size 4
'\x00\x00\x00\x00'
#endif #endif
Test copy information chaining Test copy information chaining
============================== ==============================
merging with unrelated change does not interfere with the renames merging with unrelated change does not interfere with the renames
$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCB-revert-m-0")' $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCB-revert-m-0")'
M b M b
A d A d
$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBC-revert-m-0")' $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBC-revert-m-0")'
M b M b
A d A d
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCB-revert-m-0")' $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCB-revert-m-0")'
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBC-revert-m-0")' $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBC-revert-m-0")'
Merging a branch where a rename was deleted with a branch where the same file was renamed
------------------------------------------------------------------------------------------
Create a "conflicting" merge where `d` get removed on one branch before its
rename information actually conflict with the other branch.
(the copy information from the branch that was not deleted should win).
$ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))'
@ 36 mHC-delete-before-conflict-m-0
|\
+---o 35 mCH-delete-before-conflict-m-0
| |/
| o 34 h-1: b -(move)-> d
| |
o | 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
martinvonzUnsubmitted
Not Done

This test case seems pretty redundant with the one in test-copies.t(which was also updated in this patch), but that's not a big deal. (Yes, I get that you test upgrades in this file too.)

martinvonz: This test case seems pretty redundant with the one in `test-copies.t`(which was also updated in…
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCH-delete-before-conflict-m")'
A d
b (no-compatibility no-changeset !)
R a
R b
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mHC-delete-before-conflict-m")'
A d
b
R a
R b
$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCH-delete-before-conflict-m")'
A d
b
R b
$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mHC-delete-before-conflict-m")'
A d
b
R b
$ hg status --copies --rev 'desc("h-1")' --rev 'desc("mCH-delete-before-conflict-m")'
R a
$ hg status --copies --rev 'desc("h-1")' --rev 'desc("mHC-delete-before-conflict-m")'
R a

tests/test-copies.t

o | 1 rename x to z o | 1 rename x to z
|/ x z |/ x z
o 0 add x and y o 0 add x and y
x y x y
$ hg debugpathcopies 1 4 $ hg debugpathcopies 1 4
$ hg debugpathcopies 2 4 $ hg debugpathcopies 2 4
x -> z (no-filelog !) x -> z (no-filelog !)
$ hg debugpathcopies 0 4 $ hg debugpathcopies 0 4
x -> z (filelog !) x -> z (no-changeset no-compatibility !)
$ hg debugpathcopies 1 5 $ hg debugpathcopies 1 5
$ 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
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