Skip to content
Snippets Groups Projects
Commit d4ac441f authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

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

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

Differential Revision: https://phab.mercurial-scm.org/D10050
parent 8af77240
No related branches found
No related tags found
No related merge requests found
......@@ -14,6 +14,19 @@
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
> [diff]
> git=yes
......@@ -372,5 +385,5 @@
created new head
$ hg mv --force i d
$ hg commit -m "f-2: rename i -> d"
$ hg debugindex d
$ hg debugindex d | ../no-linkrev
rev linkrev nodeid p1 p2
......@@ -376,8 +389,8 @@
rev linkrev nodeid p1 p2
0 2 319179230cc8 000000000000 000000000000 (no-changeset !)
0 2 56647659eff0 000000000000 000000000000 (changeset !)
1 8 b004912a8510 000000000000 000000000000
2 22 6cbc9c2b7b39 000000000000 000000000000 (no-changeset !)
0 * 319179230cc8 000000000000 000000000000 (no-changeset !)
0 * 56647659eff0 000000000000 000000000000 (changeset !)
1 * b004912a8510 000000000000 000000000000
2 * 6cbc9c2b7b39 000000000000 000000000000 (no-changeset !)
$ hg up 'desc("b-1")'
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 !)
......@@ -1543,5 +1556,5 @@
$ hg manifest --debug --rev 'desc("b-1")' | grep '644 d'
319179230cc87769ab3a861ebffe7a534ebb3d85 644 d (no-changeset !)
56647659eff080e06e45c18ea9e848836dadea71 644 d (changeset !)
$ hg debugindex d | head -n 4
$ hg debugindex d | head -n 4 | ../no-linkrev
rev linkrev nodeid p1 p2
......@@ -1547,9 +1560,9 @@
rev linkrev nodeid p1 p2
0 2 319179230cc8 000000000000 000000000000 (no-changeset !)
0 2 56647659eff0 000000000000 000000000000 (changeset !)
1 8 b004912a8510 000000000000 000000000000
2 22 6cbc9c2b7b39 000000000000 000000000000 (no-changeset !)
2 25 b894de5c94aa 56647659eff0 000000000000 (changeset !)
0 * 319179230cc8 000000000000 000000000000 (no-changeset !)
0 * 56647659eff0 000000000000 000000000000 (changeset !)
1 * b004912a8510 000000000000 000000000000
2 * 6cbc9c2b7b39 000000000000 000000000000 (no-changeset !)
2 * b894de5c94aa 56647659eff0 000000000000 (changeset !)
Log output should not include a merge commit as it did not happen
......@@ -1610,5 +1623,5 @@
cedeacc5bf5d9b9be4d7f8394d33a5349bb29c6e 644 f
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
08d1ff5926fbd0285cdeb044cbe8ab651687e86a 644 f
$ hg debugindex f
$ hg debugindex f | ../no-linkrev
rev linkrev nodeid p1 p2
......@@ -1614,7 +1627,7 @@
rev linkrev nodeid p1 p2
0 4 cedeacc5bf5d 000000000000 000000000000
1 10 08d1ff5926fb 000000000000 000000000000
2 19 ffb76cd76542 cedeacc5bf5d 08d1ff5926fb
0 * cedeacc5bf5d 000000000000 000000000000
1 * 08d1ff5926fb 000000000000 000000000000
2 * ffb76cd76542 cedeacc5bf5d 08d1ff5926fb
#else
$ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f'
56647659eff080e06e45c18ea9e848836dadea71 644 f
......@@ -1624,5 +1637,5 @@
56647659eff080e06e45c18ea9e848836dadea71 644 f
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
56647659eff080e06e45c18ea9e848836dadea71 644 f
$ hg debugindex f
$ hg debugindex f | ../no-linkrev
rev linkrev nodeid p1 p2
......@@ -1628,5 +1641,5 @@
rev linkrev nodeid p1 p2
0 4 56647659eff0 000000000000 000000000000
0 * 56647659eff0 000000000000 000000000000
#endif
# Here the filelog based implementation is not looking at the rename
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment