debugindex: rename the parent column to mention nodeid
We will add new columns with the "revnum" version of the parent. It will be
useful in case we need to inspect a corrupted revlog index.
--- a/mercurial/revlogutils/debug.py Wed Jun 01 00:59:51 2022 +0200
+++ b/mercurial/revlogutils/debug.py Wed Jun 01 01:13:13 2022 +0200
@@ -33,7 +33,11 @@
fm.plain(
b' rev linkrev %s %s %s\n'
- % (b'nodeid'.rjust(idlen), b'p1'.rjust(idlen), b'p2'.rjust(idlen))
+ % (
+ b'nodeid'.rjust(idlen),
+ b'p1-nodeid'.rjust(idlen),
+ b'p2-nodeid'.rjust(idlen),
+ )
)
for rev in revlog:
--- a/tests/test-changelog-exec.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-changelog-exec.t Wed Jun 01 01:13:13 2022 +0200
@@ -51,7 +51,7 @@
$ hg debugindex bar
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 1 b004912a8510 000000000000 000000000000
$ cd ..
--- a/tests/test-clone-r.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-clone-r.t Wed Jun 01 01:13:13 2022 +0200
@@ -45,19 +45,19 @@
3 0000 8 3 2 -1 19b1fc555737
$ hg debugindex adifferentfile
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 7 2565f3199a74 000000000000 000000000000
$ hg debugindex anotherfile
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 8 2565f3199a74 000000000000 000000000000
$ hg debugindex fred
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 6 12ab3bcc5ea4 000000000000 000000000000
$ hg debugindex --manifest
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 43eadb1d2d06 000000000000 000000000000
1 1 8b89697eba2c 43eadb1d2d06 000000000000
2 2 626a32663c2f 8b89697eba2c 000000000000
--- a/tests/test-commit-amend.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-commit-amend.t Wed Jun 01 01:13:13 2022 +0200
@@ -1203,7 +1203,7 @@
R olddirname/commonfile.py
R olddirname/newfile.py
$ hg debugindex newdirname/newfile.py
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 3 34a4d536c0c0 000000000000 000000000000
$ echo a >> newdirname/commonfile.py
@@ -1211,7 +1211,7 @@
$ hg debugrename newdirname/newfile.py
newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def
$ hg debugindex newdirname/newfile.py
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 3 34a4d536c0c0 000000000000 000000000000
#if execbit
--- a/tests/test-commit.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-commit.t Wed Jun 01 01:13:13 2022 +0200
@@ -627,7 +627,7 @@
$ hg debugrename foo
foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9
$ hg debugindex bar
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 26d3ca0dfd18 000000000000 000000000000
1 1 d267bddd54f7 26d3ca0dfd18 000000000000
--- a/tests/test-copies-chain-merge.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-copies-chain-merge.t Wed Jun 01 01:13:13 2022 +0200
@@ -511,7 +511,7 @@
$ hg mv --force i d
$ hg commit -m "f-2: rename i -> d"
$ hg debugindex d | "$PYTHON" ../no-linkrev
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 * d8252ab2e760 000000000000 000000000000 (no-changeset !)
0 * ae258f702dfe 000000000000 000000000000 (changeset !)
1 * b004912a8510 000000000000 000000000000
@@ -567,7 +567,7 @@
$ hg mv --force x t
$ hg commit -m "r-2: rename t -> x"
$ hg debugindex t | "$PYTHON" ../no-linkrev
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 * d74efbf65309 000000000000 000000000000 (no-changeset !)
1 * 02a930b9d7ad 000000000000 000000000000 (no-changeset !)
0 * 5aed6a8dbff0 000000000000 000000000000 (changeset !)
@@ -934,7 +934,7 @@
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
#if no-changeset
$ hg debugindex d | "$PYTHON" ../no-linkrev
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 * d8252ab2e760 000000000000 000000000000
1 * b004912a8510 000000000000 000000000000
2 * 7b79e2fe0c89 000000000000 000000000000
@@ -945,7 +945,7 @@
7 * d55cb4e9ef57 000000000000 000000000000
#else
$ hg debugindex d | "$PYTHON" ../no-linkrev
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 * ae258f702dfe 000000000000 000000000000
1 * b004912a8510 000000000000 000000000000
2 * 5cce88bf349f ae258f702dfe 000000000000
@@ -979,7 +979,7 @@
cea2d99c0fde64672ef61953786fdff34f16e230 644 d (changeset !)
#if no-changeset
$ hg debugindex d | "$PYTHON" ../no-linkrev
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 * d8252ab2e760 000000000000 000000000000
1 * b004912a8510 000000000000 000000000000
2 * 7b79e2fe0c89 000000000000 000000000000
@@ -991,7 +991,7 @@
8 * 1c334238bd42 7b79e2fe0c89 000000000000
#else
$ hg debugindex d | "$PYTHON" ../no-linkrev
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 * ae258f702dfe 000000000000 000000000000
1 * b004912a8510 000000000000 000000000000
2 * 5cce88bf349f ae258f702dfe 000000000000
@@ -2402,7 +2402,7 @@
d8252ab2e760b0d4e5288fd44cbd15a0fa567e16 644 d (no-changeset !)
ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 d (changeset !)
$ hg debugindex d | head -n 4 | "$PYTHON" ../no-linkrev
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 * d8252ab2e760 000000000000 000000000000 (no-changeset !)
0 * ae258f702dfe 000000000000 000000000000 (changeset !)
1 * b004912a8510 000000000000 000000000000
@@ -2475,7 +2475,7 @@
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
e8825b386367b29fec957283a80bb47b47483fe1 644 f
$ hg debugindex f | "$PYTHON" ../no-linkrev
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 * b76eb76580df 000000000000 000000000000
1 * e8825b386367 000000000000 000000000000
2 * 2ff93c643948 b76eb76580df e8825b386367
@@ -2491,7 +2491,7 @@
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f
$ hg debugindex f | "$PYTHON" ../no-linkrev
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 * ae258f702dfe 000000000000 000000000000
1 * d3613c1ec831 ae258f702dfe 000000000000
2 * 05e03c868bbc ae258f702dfe 000000000000
@@ -3063,7 +3063,7 @@
$ hg manifest --debug --rev 'desc("q-2")' | grep '644 v'
c43c088b811fd27983c0a9aadf44f3343cd4cd7e 644 v
$ hg debugindex v | "$PYTHON" ../no-linkrev
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 * 3f91841cd75c 000000000000 000000000000
1 * c43c088b811f 000000000000 000000000000
2 * 0946c662ef16 3f91841cd75c c43c088b811f
@@ -3078,7 +3078,7 @@
$ hg manifest --debug --rev 'desc("q-2")' | grep '644 v'
a38b2fa170219750dac9bc7d19df831f213ba708 644 v
$ hg debugindex v | "$PYTHON" ../no-linkrev
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 * 5aed6a8dbff0 000000000000 000000000000
1 * a38b2fa17021 000000000000 000000000000
2 * 65fde9f6e4d4 5aed6a8dbff0 a38b2fa17021
@@ -3361,7 +3361,7 @@
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
e8825b386367b29fec957283a80bb47b47483fe1 644 f
$ hg debugindex f | "$PYTHON" ../no-linkrev
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 * b76eb76580df 000000000000 000000000000
1 * e8825b386367 000000000000 000000000000
2 * 2ff93c643948 b76eb76580df e8825b386367
@@ -3377,7 +3377,7 @@
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f
$ hg debugindex f | "$PYTHON" ../no-linkrev
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 * ae258f702dfe 000000000000 000000000000
1 * d3613c1ec831 ae258f702dfe 000000000000
2 * 05e03c868bbc ae258f702dfe 000000000000
--- a/tests/test-copies-in-changeset.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-copies-in-changeset.t Wed Jun 01 01:13:13 2022 +0200
@@ -121,13 +121,13 @@
#if extra
$ hg debugindex c
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 1 b789fdd96dc2 000000000000 000000000000
#else
$ hg debugindex c
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 1 37d9b5d994ea 000000000000 000000000000
#endif
@@ -155,13 +155,13 @@
#if extra
$ hg debugindex c
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 1 b789fdd96dc2 000000000000 000000000000
#else
$ hg debugindex c
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 1 37d9b5d994ea 000000000000 000000000000
1 3 029625640347 000000000000 000000000000
--- a/tests/test-copy.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-copy.t Wed Jun 01 01:13:13 2022 +0200
@@ -61,7 +61,7 @@
this should show a revision linked to changeset 0
$ hg debugindex a
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b789fdd96dc2 000000000000 000000000000
we should see one log entry for b
@@ -77,7 +77,7 @@
this should show a revision linked to changeset 1
$ hg debugindex b
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 1 37d9b5d994ea 000000000000 000000000000
this should show the rename information in the metadata
@@ -187,7 +187,7 @@
should match
$ hg debugindex foo
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 2ed2a3912a0b 000000000000 000000000000
$ hg debugrename bar
bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
@@ -217,13 +217,13 @@
should show no parents for tip
$ hg debugindex bar
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 1 7711d36246cc 000000000000 000000000000
1 2 bdf70a2b8d03 7711d36246cc 000000000000
2 3 b2558327ea8d 000000000000 000000000000
should match
$ hg debugindex foo
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 2ed2a3912a0b 000000000000 000000000000
1 2 dd12c926cf16 2ed2a3912a0b 000000000000
$ hg debugrename bar
--- a/tests/test-debugcommands.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-debugcommands.t Wed Jun 01 01:13:13 2022 +0200
@@ -148,30 +148,30 @@
#endif
$ hg debugindex -c
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 07f494440405 000000000000 000000000000
1 1 8cccb4b5fec2 07f494440405 000000000000
2 2 b1e228c512c5 8cccb4b5fec2 000000000000
$ hg debugindex -c --debug
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 07f4944404050f47db2e5c5071e0e84e7a27bba9 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
1 1 8cccb4b5fec20cafeb99dd01c26d4dee8ea4388a 07f4944404050f47db2e5c5071e0e84e7a27bba9 0000000000000000000000000000000000000000
2 2 b1e228c512c5d7066d70562ed839c3323a62d6d2 8cccb4b5fec20cafeb99dd01c26d4dee8ea4388a 0000000000000000000000000000000000000000
$ hg debugindex -m
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 a0c8bcbbb45c 000000000000 000000000000
1 1 57faf8a737ae a0c8bcbbb45c 000000000000
2 2 a35b10320954 57faf8a737ae 000000000000
$ hg debugindex -m --debug
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
1 1 57faf8a737ae7faf490582941a82319ba6529dca a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 0000000000000000000000000000000000000000
2 2 a35b103209548032201c16c7688cb2657f037a38 57faf8a737ae7faf490582941a82319ba6529dca 0000000000000000000000000000000000000000
$ hg debugindex a
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b789fdd96dc2 000000000000 000000000000
$ hg debugindex --debug a
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
debugdelta chain basic output
--- a/tests/test-excessive-merge.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-excessive-merge.t Wed Jun 01 01:13:13 2022 +0200
@@ -64,7 +64,7 @@
summary: test
$ hg debugindex --changelog
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 5e0375449e74 000000000000 000000000000
1 1 96155394af80 5e0375449e74 000000000000
2 2 92cc4c306b19 5e0375449e74 000000000000
@@ -89,7 +89,7 @@
79d7492df40aa0fa093ec4209be78043c181f094 644 b
$ hg debugindex a
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 2ed2a3912a0b 000000000000 000000000000
1 1 79d7492df40a 2ed2a3912a0b 000000000000
--- a/tests/test-extra-filelog-entry.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-extra-filelog-entry.t Wed Jun 01 01:13:13 2022 +0200
@@ -16,6 +16,6 @@
$ hg qrefresh
$ hg debugindex b
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 1e88685f5dde 000000000000 000000000000
--- a/tests/test-filebranch.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-filebranch.t Wed Jun 01 01:13:13 2022 +0200
@@ -72,7 +72,7 @@
main: we should have a merge here:
$ hg debugindex --changelog
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 cdca01651b96 000000000000 000000000000
1 1 f6718a9cb7f3 cdca01651b96 000000000000
2 2 bdd988058d16 cdca01651b96 000000000000
@@ -96,7 +96,7 @@
foo: we should have a merge here:
$ hg debugindex foo
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b8e02f643373 000000000000 000000000000
1 1 2ffeddde1b65 b8e02f643373 000000000000
2 2 33d1fb69067a b8e02f643373 000000000000
@@ -105,21 +105,21 @@
bar: we should not have a merge here:
$ hg debugindex bar
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b8e02f643373 000000000000 000000000000
1 2 33d1fb69067a b8e02f643373 000000000000
baz: we should not have a merge here:
$ hg debugindex baz
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b8e02f643373 000000000000 000000000000
1 1 2ffeddde1b65 b8e02f643373 000000000000
quux: we should not have a merge here:
$ hg debugindex quux
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b8e02f643373 000000000000 000000000000
1 3 6128c0f33108 b8e02f643373 000000000000
--- a/tests/test-flags.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-flags.t Wed Jun 01 01:13:13 2022 +0200
@@ -145,13 +145,13 @@
-rwxr-x---
$ hg debugindex a
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b80de5d13875 000000000000 000000000000
$ hg debugindex -R ../test2 a
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b80de5d13875 000000000000 000000000000
$ hg debugindex -R ../test1 a
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b80de5d13875 000000000000 000000000000
1 1 7fe919cc0336 b80de5d13875 000000000000
--- a/tests/test-issue522.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-issue522.t Wed Jun 01 01:13:13 2022 +0200
@@ -45,7 +45,7 @@
c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo
$ hg debugindex foo
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 2ed2a3912a0b 000000000000 000000000000
1 1 6f4310b00b9a 2ed2a3912a0b 000000000000
2 2 c6fc755d7e68 6f4310b00b9a 000000000000
--- a/tests/test-merge-commit.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-merge-commit.t Wed Jun 01 01:13:13 2022 +0200
@@ -35,7 +35,7 @@
$ hg ci -m '3: merge with local rename'
$ hg debugindex bar
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 2 d35118874825 000000000000 000000000000
1 3 5345f5ab8abd 000000000000 d35118874825
@@ -43,7 +43,7 @@
bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
$ hg debugindex foo
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 690b295714ae 000000000000 000000000000
1 1 9e25c27b8757 690b295714ae 000000000000
@@ -87,7 +87,7 @@
$ hg ci -m '5: merge'
$ hg debugindex bar
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 2 d35118874825 000000000000 000000000000
1 3 5345f5ab8abd 000000000000 d35118874825
2 4 ff4b45017382 d35118874825 000000000000
@@ -122,7 +122,7 @@
$ hg ci -m '3: merge with remote rename'
$ hg debugindex bar
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 2 d35118874825 000000000000 000000000000
1 3 5345f5ab8abd 000000000000 d35118874825
@@ -130,7 +130,7 @@
bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
$ hg debugindex foo
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 690b295714ae 000000000000 000000000000
1 1 9e25c27b8757 690b295714ae 000000000000
@@ -174,7 +174,7 @@
$ hg ci -m '5: merge'
$ hg debugindex bar
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 2 d35118874825 000000000000 000000000000
1 3 5345f5ab8abd 000000000000 d35118874825
2 4 ff4b45017382 d35118874825 000000000000
--- a/tests/test-merge7.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-merge7.t Wed Jun 01 01:13:13 2022 +0200
@@ -105,7 +105,7 @@
three
$ hg debugindex test.txt
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 01365c4cca56 000000000000 000000000000
1 1 7b013192566a 01365c4cca56 000000000000
2 2 8fe46a3eb557 01365c4cca56 000000000000
--- a/tests/test-narrow-debugcommands.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-narrow-debugcommands.t Wed Jun 01 01:13:13 2022 +0200
@@ -16,19 +16,19 @@
adding foo/bar/f
adding foo/f
$ hg debugindex -m
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 14a5d056d75a 000000000000 000000000000
$ hg debugindex --dir foo
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 e635c7857aef 000000000000 000000000000
$ hg debugindex --dir foo/
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 e635c7857aef 000000000000 000000000000
$ hg debugindex --dir foo/bar
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 e091d4224761 000000000000 000000000000
$ hg debugindex --dir foo/bar/
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 e091d4224761 000000000000 000000000000
$ hg debugdata -m 0
foo\x00e635c7857aef92ac761ce5741a99da159abbbb24t (esc)
--- a/tests/test-narrow-update.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-narrow-update.t Wed Jun 01 01:13:13 2022 +0200
@@ -33,7 +33,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow
$ hg debugindex -c
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 9958b1af2add 000000000000 000000000000
1 1 2db4ce2a3bfe 9958b1af2add 000000000000
2 2 0980ee31a742 2db4ce2a3bfe 000000000000
--- a/tests/test-rename-merge1.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-rename-merge1.t Wed Jun 01 01:13:13 2022 +0200
@@ -65,7 +65,7 @@
$ hg ci -m "merge"
$ hg debugindex b
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 1 57eacc201a7f 000000000000 000000000000
1 3 4727ba907962 000000000000 57eacc201a7f
--- a/tests/test-revlog-packentry.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-revlog-packentry.t Wed Jun 01 01:13:13 2022 +0200
@@ -16,7 +16,7 @@
created new head
$ hg debugindex foo
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b80de5d13875 000000000000 000000000000
1 1 0376abec49b8 000000000000 000000000000
--- a/tests/test-strip-cross.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-strip-cross.t Wed Jun 01 01:13:13 2022 +0200
@@ -39,37 +39,37 @@
> echo
> done
012
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b8e02f643373 000000000000 000000000000
1 1 5d9299349fc0 000000000000 000000000000
2 2 2661d26c6496 000000000000 000000000000
021
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b8e02f643373 000000000000 000000000000
1 2 5d9299349fc0 000000000000 000000000000
2 1 2661d26c6496 000000000000 000000000000
102
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 1 b8e02f643373 000000000000 000000000000
1 0 5d9299349fc0 000000000000 000000000000
2 2 2661d26c6496 000000000000 000000000000
120
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 1 b8e02f643373 000000000000 000000000000
1 2 5d9299349fc0 000000000000 000000000000
2 0 2661d26c6496 000000000000 000000000000
201
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 2 b8e02f643373 000000000000 000000000000
1 0 5d9299349fc0 000000000000 000000000000
2 1 2661d26c6496 000000000000 000000000000
210
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 2 b8e02f643373 000000000000 000000000000
1 1 5d9299349fc0 000000000000 000000000000
2 0 2661d26c6496 000000000000 000000000000
@@ -127,7 +127,7 @@
$ hg clone -q -U -r 1 -r 2 -r 3 -r 4 orig crossed
$ cd crossed
$ hg debugindex --manifest
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 2 6bbc6fee55c2 000000000000 000000000000
1 0 1c556153fe54 000000000000 000000000000
2 1 1f76dba919fd 000000000000 000000000000
@@ -182,7 +182,7 @@
$ hg --config experimental.treemanifest=True clone -q -U -r 1 -r 2 -r 3 -r 4 orig crossed
$ cd crossed
$ hg debugindex --dir dir
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 2 6bbc6fee55c2 000000000000 000000000000
1 0 1c556153fe54 000000000000 000000000000
2 1 1f76dba919fd 000000000000 000000000000
--- a/tests/test-treemanifest.t Wed Jun 01 00:59:51 2022 +0200
+++ b/tests/test-treemanifest.t Wed Jun 01 01:13:13 2022 +0200
@@ -130,7 +130,7 @@
$ cat dir1/b
6
$ hg debugindex --dir dir1
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 1 8b3ffd73f901 000000000000 000000000000
1 2 68e9d057c5a8 8b3ffd73f901 000000000000
2 4 4698198d2624 68e9d057c5a8 000000000000
@@ -276,7 +276,7 @@
Parent of tree root manifest should be flat manifest, and two for merge
$ hg debugindex -m
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 0 40536115ed9e 000000000000 000000000000
1 1 f3376063c255 40536115ed9e 000000000000
2 2 5d9b9da231a2 40536115ed9e 000000000000
@@ -296,13 +296,13 @@
Turning off treemanifest config has no effect
$ hg debugindex --dir dir1
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 4 064927a0648a 000000000000 000000000000
1 5 25ecb8cb8618 000000000000 000000000000
$ echo 2 > dir1/a
$ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a'
$ hg debugindex --dir dir1
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 4 064927a0648a 000000000000 000000000000
1 5 25ecb8cb8618 000000000000 000000000000
2 6 5b16163a30c6 25ecb8cb8618 000000000000
@@ -315,7 +315,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
$ hg debugindex --dir dir1
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 4 064927a0648a 000000000000 000000000000
1 5 25ecb8cb8618 000000000000 000000000000
@@ -342,7 +342,7 @@
saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)
$ hg unbundle -q .hg/strip-backup/*
$ hg debugindex --dir dir1
- rev linkrev nodeid p1 p2
+ rev linkrev nodeid p1-nodeid p2-nodeid
0 4 064927a0648a 000000000000 000000000000
1 5 25ecb8cb8618 000000000000 000000000000
2 6 5b16163a30c6 25ecb8cb8618 000000000000