This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6321

tests: slightly modify a linkrev test to prepare for expanding it
ClosedPublic

Authored by martinvonz on Apr 28 2019, 3:00 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG20fce2742399: tests: slightly modify a linkrev test to prepare for expanding it
Summary

The test case checks that the copy tracing code doesn't get confused
by linkrevs when walking a file's ancestors. This patch chnages the
test slightly so a second commit is grafted, thus producing a second
"bad" linkrev. I'll use this in the next patch to demonstrate a bug.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mtests/test-mv-cp-st-diff.t (40 lines)

Diff 14940

tests/test-mv-cp-st-diff.t

$ touch f $ touch f
$ hg ci -Aqm 'empty f' $ hg ci -Aqm 'empty f'
Make a simple change Make a simple change
$ echo change > f $ echo change > f
$ hg ci -m 'change f' $ hg ci -m 'change f'
Make a rename because we want to track renames. It is also important that the
faulty linkrev is not only the "start" commit to ensure the linkrev will be
used.
$ hg mv f renamed
$ hg ci -m renamed
Make a second branch, we use a named branch to create a simple commit Make a second branch, we use a named branch to create a simple commit
that does not touch f. that does not touch f.
$ hg up -qr 'desc(empty)' $ hg up -qr 'desc(empty)'
$ hg branch -q dev $ hg branch -q dev
$ hg ci -Aqm dev $ hg ci -Aqm dev
Graft the initial change, as f was untouched, we reuse the same entry and the Graft the initial change and the rename. As f was untouched, we reuse the same
linkrev point to the older branch. entry and the linkrev point to the older branch.
$ hg graft -q 'desc(change)' $ hg graft -q 'desc(change)'
$ hg graft -q 'desc(renamed)'
Make a rename because we want to track renames. It is also important that the
faulty linkrev is not the "start" commit to ensure the linkrev will be used.
$ hg mv f renamed
$ hg ci -m renamed
$ hg log -G -T '{rev} {desc}' $ hg log -G -T '{rev} {desc}'
@ 4 renamed @ 5 renamed
| |
o 3 change f o 4 change f
| |
o 2 dev o 3 dev
| |
| o 2 renamed
| |
| o 1 change f | o 1 change f
|/ |/
o 0 empty f o 0 empty f
The copy tracking should still reach rev 2 (branch creation). The copy tracking should still reach rev 3 (branch creation).
accessing the parent of 4 (renamed) should not jump use to revision 1. accessing the parent of 5 (renamed) should not jump use to revision 1.
$ hg diff --git -r 'desc(dev)' -r . $ hg diff --git -r 'desc(dev)' -r .
diff --git a/f b/renamed diff --git a/f b/renamed
rename from f rename from f
rename to renamed rename to renamed
--- a/f --- a/f
+++ b/renamed +++ b/renamed
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+change +change
Check debug output for copy tracing Check debug output for copy tracing
$ hg status --copies --rev 'desc(dev)' --rev . --config devel.debug.copies=yes --debug $ hg status --copies --rev 'desc(dev)' --rev . --config devel.debug.copies=yes --debug
debug.copies: searching copies from a51f36ab1704 to 7935fd48a8f9 debug.copies: searching copies from a51f36ab1704 to 1f4aa1fd627b
debug.copies: search mode: forward debug.copies: search mode: forward
debug.copies: looking into rename from a51f36ab1704 to 7935fd48a8f9 debug.copies: looking into rename from a51f36ab1704 to 1f4aa1fd627b
debug.copies: search limit: 2 debug.copies: search limit: 3
debug.copies: missing file to search: 1 debug.copies: missing files to search: 1
debug.copies: tracing file: renamed debug.copies: tracing file: renamed
debug.copies: rename of: f debug.copies: rename of: f
debug.copies: time: * seconds (glob) debug.copies: time: * seconds (glob)
A renamed A renamed
f f
R f R f
$ cd .. $ cd ..