This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10050

test-copies: filter out the linkrev part of `debugindex`
ClosedPublic

Authored by marmoute on Feb 22 2021, 9:35 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9cd4f58467af: test-copies: filter out the linkrev part of `debugindex`
rHGd4ac441f0ef2: test-copies: filter out the linkrev part of `debugindex`
Summary

It is not really useful for the tests and is a large source of churn when adding
more revisions to the tests.

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.Feb 22 2021, 9:35 AM
baymax updated this revision to Diff 25767.Feb 22 2021, 11:34 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHGd4ac441f0ef2: test-copies: filter out the linkrev part of `debugindex`.Feb 24 2021, 10:56 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd4ac441f0ef2: test-copies: filter out the linkrev part of `debugindex` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 25832

tests/test-copies-chain-merge.t

#testcases filelog compatibility changeset sidedata upgraded #testcases filelog compatibility changeset sidedata upgraded
===================================================== =====================================================
Test Copy tracing for chain of copies involving merge Test Copy tracing for chain of copies involving merge
===================================================== =====================================================
This test files covers copies/rename case for a chains of commit where merges This test files covers copies/rename case for a chains of commit where merges
are involved. It cheks we do not have unwanted update of behavior and that the are involved. It cheks we do not have unwanted update of behavior and that the
different options to retrieve copies behave correctly. different options to retrieve copies behave correctly.
Setup Setup
===== =====
use git diff to see rename use git diff to see rename
$ cat << EOF >> ./no-linkrev
> #!$PYTHON
> # filter out linkrev part of the debugindex command
> import sys
> for line in sys.stdin:
> if " linkrev " in line:
> print(line.rstrip())
> else:
> l = "%s *%s" % (line[:6], line[14:].rstrip())
> print(l)
> EOF
$ chmod +x no-linkrev
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [diff] > [diff]
> git=yes > git=yes
> [command-templates] > [command-templates]
> log={desc}\n > log={desc}\n
> EOF > EOF
#if compatibility #if compatibility
$ hg up 'desc("i-2")' $ hg up 'desc("i-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 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 | ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 2 319179230cc8 000000000000 000000000000 (no-changeset !) 0 * 319179230cc8 000000000000 000000000000 (no-changeset !)
0 2 56647659eff0 000000000000 000000000000 (changeset !) 0 * 56647659eff0 000000000000 000000000000 (changeset !)
1 8 b004912a8510 000000000000 000000000000 1 * b004912a8510 000000000000 000000000000
2 22 6cbc9c2b7b39 000000000000 000000000000 (no-changeset !) 2 * 6cbc9c2b7b39 000000000000 000000000000 (no-changeset !)
$ hg up 'desc("b-1")' $ hg up 'desc("b-1")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
$ hg merge 'desc("f-2")' $ hg merge 'desc("f-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "mBFm-0 $case_desc - one way" $ hg ci -m "mBFm-0 $case_desc - one way"
$ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644 d' $ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644 d'
b004912a8510032a0350a74daa2803dadfb00e12 644 d b004912a8510032a0350a74daa2803dadfb00e12 644 d
$ 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'
319179230cc87769ab3a861ebffe7a534ebb3d85 644 d (no-changeset !) 319179230cc87769ab3a861ebffe7a534ebb3d85 644 d (no-changeset !)
56647659eff080e06e45c18ea9e848836dadea71 644 d (changeset !) 56647659eff080e06e45c18ea9e848836dadea71 644 d (changeset !)
$ hg debugindex d | head -n 4 $ hg debugindex d | head -n 4 | ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 2 319179230cc8 000000000000 000000000000 (no-changeset !) 0 * 319179230cc8 000000000000 000000000000 (no-changeset !)
0 2 56647659eff0 000000000000 000000000000 (changeset !) 0 * 56647659eff0 000000000000 000000000000 (changeset !)
1 8 b004912a8510 000000000000 000000000000 1 * b004912a8510 000000000000 000000000000
2 22 6cbc9c2b7b39 000000000000 000000000000 (no-changeset !) 2 * 6cbc9c2b7b39 000000000000 000000000000 (no-changeset !)
2 25 b894de5c94aa 56647659eff0 000000000000 (changeset !) 2 * b894de5c94aa 56647659eff0 000000000000 (changeset !)
Log output should not include a merge commit as it did not happen Log output should not include a merge commit as it did not happen
$ hg log -Gfr 'desc("mBDm-0")' d $ hg log -Gfr 'desc("mBDm-0")' d
o d-2 re-add d o d-2 re-add d
| |
~ ~
$ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f'
ffb76cd765422a18759a335d8a81fa2bd455be6b 644 f ffb76cd765422a18759a335d8a81fa2bd455be6b 644 f
$ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f'
ffb76cd765422a18759a335d8a81fa2bd455be6b 644 f ffb76cd765422a18759a335d8a81fa2bd455be6b 644 f
$ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
cedeacc5bf5d9b9be4d7f8394d33a5349bb29c6e 644 f cedeacc5bf5d9b9be4d7f8394d33a5349bb29c6e 644 f
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
08d1ff5926fbd0285cdeb044cbe8ab651687e86a 644 f 08d1ff5926fbd0285cdeb044cbe8ab651687e86a 644 f
$ hg debugindex f $ hg debugindex f | ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 4 cedeacc5bf5d 000000000000 000000000000 0 * cedeacc5bf5d 000000000000 000000000000
1 10 08d1ff5926fb 000000000000 000000000000 1 * 08d1ff5926fb 000000000000 000000000000
2 19 ffb76cd76542 cedeacc5bf5d 08d1ff5926fb 2 * ffb76cd76542 cedeacc5bf5d 08d1ff5926fb
#else #else
$ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f'
56647659eff080e06e45c18ea9e848836dadea71 644 f 56647659eff080e06e45c18ea9e848836dadea71 644 f
$ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f'
56647659eff080e06e45c18ea9e848836dadea71 644 f 56647659eff080e06e45c18ea9e848836dadea71 644 f
$ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
56647659eff080e06e45c18ea9e848836dadea71 644 f 56647659eff080e06e45c18ea9e848836dadea71 644 f
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
56647659eff080e06e45c18ea9e848836dadea71 644 f 56647659eff080e06e45c18ea9e848836dadea71 644 f
$ hg debugindex f $ hg debugindex f | ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 4 56647659eff0 000000000000 000000000000 0 * 56647659eff0 000000000000 000000000000
#endif #endif
# Here the filelog based implementation is not looking at the rename # Here the filelog based implementation is not looking at the rename
# information (because the file exist on both side). However the changelog # information (because the file exist on both side). However the changelog
# based on works fine. We have different output. # based on works fine. We have different output.
$ hg status --copies --rev 'desc("a-2")' --rev 'desc("mAEm-0")' $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mAEm-0")'
M f (no-changeset !) M f (no-changeset !)