[PATCH] commands: update debugindex to display more fields
in3xes at gmail.com
in3xes at gmail.com
Wed Oct 27 17:34:38 UTC 2010
# HG changeset patch
# User Pradeepkumar Gayam <in3xes at gmail.com>
# Date 1288135189 -19800
# Branch stable
# Node ID 9cf20092114a67397e82c2f783ef2b11de584b78
# Parent b00eda50ad2b8d4ce385486e82dd72e421c7d793
commands: update debugindex to display more fields
One more column(size) is added to debugindex command output, and previously parents are displayed by hashes, now they are displayed by revision numbers improving readability. Optional revision flags can also be displayed with --flags.
Previous output of debugindex:
hg debugindex FILE
rev offset length base linkrev nodeid p1 p2
0 0 2307 0 0 b6444347c629 000000000000 000000000000
1 2307 77 0 5 06763db6de79 b6444347c629 000000000000
Current output without flags:
hg debugindex FILE
rev offset length size base linkrev p1 p2 nodeid
0 0 2307 7801 0 0 -1 -1 b6444347c629
1 2307 77 7841 0 5 0 -1 06763db6de79
Current output with flags:
hg debugindex --flags FILE
rev flags offset length size base linkrev p1 p2 nodeid
0 0000 0 2307 7801 0 0 -1 -1 b6444347c629
1 0000 2307 77 7841 0 5 0 -1 06763db6de79
diff -r b00eda50ad2b -r 9cf20092114a mercurial/commands.py
--- a/mercurial/commands.py Wed Oct 20 17:38:21 2010 -0500
+++ b/mercurial/commands.py Wed Oct 27 04:49:49 2010 +0530
@@ -1260,26 +1260,37 @@
m = util.matchdate(range)
ui.write("match: %s\n" % m(d[0]))
-def debugindex(ui, repo, file_):
+def debugindex(ui, repo, file_, **opts):
"""dump the contents of an index file"""
r = None
if repo:
filelog = repo.file(file_)
if len(filelog):
r = filelog
+ flags = opts.get('flags')
if not r:
r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
- ui.write(" rev offset length base linkrev"
- " nodeid p1 p2\n")
+ if flags:
+ format = "% 6d % 05x % 9d % 7d % 6d % 6d % 7d % 6d % 6d %s\n"
+ ui.write(" rev flags offset length size base linkrev"
+ " p1 p2 nodeid\n")
+ else:
+ format = "% 6d % 9d % 7d % 6d % 6d % 7d % 6d %6d %s\n"
+ ui.write(" rev offset length size base linkrev"
+ " p1 p2 nodeid\n")
for i in r:
+ values = []
node = r.node(i)
try:
- pp = r.parents(node)
+ pp = r.parentrevs(i)
except:
- pp = [nullid, nullid]
- ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
- i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
- short(node), short(pp[0]), short(pp[1])))
+ pp = [-1, -1]
+ values = [i, r.start(i), r.length(i), r.rawsize(i), r.base(i), r.linkrev(i),
+ pp[0], pp[1], short(node)]
+
+ if flags:
+ values.insert(1, r.flags(i))
+ ui.write(format % tuple(values))
def debugindexdot(ui, repo, file_):
"""dump an index DAG as a graphviz dot file"""
@@ -4131,7 +4142,8 @@
_('[-e] DATE [RANGE]')),
"debugdata": (debugdata, [], _('FILE REV')),
"debugfsinfo": (debugfsinfo, [], _('[PATH]')),
- "debugindex": (debugindex, [], _('FILE')),
+ "debugindex": (debugindex, [('f', 'flags', None, _('display revision flags'))],
+ _('FILE')),
"debugindexdot": (debugindexdot, [], _('FILE')),
"debuginstall": (debuginstall, [], ''),
"debugpushkey": (debugpushkey, [], _('REPO NAMESPACE [KEY OLD NEW]')),
diff -r b00eda50ad2b -r 9cf20092114a tests/test-bundle-r.t
--- a/tests/test-bundle-r.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-bundle-r.t Wed Oct 27 04:49:49 2010 +0530
@@ -27,29 +27,29 @@
$ hg mv afile anotherfile
$ hg commit -m "0.3m"
$ hg debugindex .hg/store/data/afile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 362fef284ce2 000000000000 000000000000
- 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000
- 2 8 7 2 2 4c982badb186 125144f7e028 000000000000
- 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 0 -1 -1 362fef284ce2
+ 1 3 5 4 1 1 0 -1 125144f7e028
+ 2 8 7 6 2 2 1 -1 4c982badb186
+ 3 15 9 8 3 3 2 -1 19b1fc555737
$ hg debugindex .hg/store/data/adifferentfile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 75 0 7 2565f3199a74 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 75 74 0 7 -1 -1 2565f3199a74
$ hg debugindex .hg/store/data/anotherfile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 75 0 8 2565f3199a74 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 75 74 0 8 -1 -1 2565f3199a74
$ hg debugindex .hg/store/data/fred.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 8 7 0 6 -1 -1 12ab3bcc5ea4
$ hg debugindex .hg/store/00manifest.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000
- 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000
- 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000
- 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000
- 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000
- 5 250 68 3 7 09bb521d218d de68e904d169 000000000000
- 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 48 47 0 0 -1 -1 43eadb1d2d06
+ 1 48 48 47 1 1 0 -1 8b89697eba2c
+ 2 96 48 47 2 2 1 -1 626a32663c2f
+ 3 144 48 47 3 3 2 -1 f54c32f13478
+ 4 192 58 93 3 6 2 -1 de68e904d169
+ 5 250 68 102 3 7 4 -1 09bb521d218d
+ 6 318 54 53 6 8 3 -1 1fde233dfb0f
$ hg verify
checking changesets
checking manifests
diff -r b00eda50ad2b -r 9cf20092114a tests/test-changelog-exec.t
--- a/tests/test-changelog-exec.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-changelog-exec.t Wed Oct 27 04:49:49 2010 +0530
@@ -49,5 +49,5 @@
$ hg debugindex .hg/store/data/bar.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 5 0 1 b004912a8510 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 5 4 0 1 -1 -1 b004912a8510
diff -r b00eda50ad2b -r 9cf20092114a tests/test-clone-r.t
--- a/tests/test-clone-r.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-clone-r.t Wed Oct 27 04:49:49 2010 +0530
@@ -38,33 +38,33 @@
$ hg commit -m "0.3m"
$ hg debugindex .hg/store/data/afile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 362fef284ce2 000000000000 000000000000
- 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000
- 2 8 7 2 2 4c982badb186 125144f7e028 000000000000
- 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 0 -1 -1 362fef284ce2
+ 1 3 5 4 1 1 0 -1 125144f7e028
+ 2 8 7 6 2 2 1 -1 4c982badb186
+ 3 15 9 8 3 3 2 -1 19b1fc555737
$ hg debugindex .hg/store/data/adifferentfile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 75 0 7 2565f3199a74 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 75 74 0 7 -1 -1 2565f3199a74
$ hg debugindex .hg/store/data/anotherfile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 75 0 8 2565f3199a74 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 75 74 0 8 -1 -1 2565f3199a74
$ hg debugindex .hg/store/data/fred.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 8 7 0 6 -1 -1 12ab3bcc5ea4
$ hg debugindex .hg/store/00manifest.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000
- 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000
- 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000
- 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000
- 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000
- 5 250 68 3 7 09bb521d218d de68e904d169 000000000000
- 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 48 47 0 0 -1 -1 43eadb1d2d06
+ 1 48 48 47 1 1 0 -1 8b89697eba2c
+ 2 96 48 47 2 2 1 -1 626a32663c2f
+ 3 144 48 47 3 3 2 -1 f54c32f13478
+ 4 192 58 93 3 6 2 -1 de68e904d169
+ 5 250 68 102 3 7 4 -1 09bb521d218d
+ 6 318 54 53 6 8 3 -1 1fde233dfb0f
$ hg verify
checking changesets
diff -r b00eda50ad2b -r 9cf20092114a tests/test-commit-copy.t
--- a/tests/test-commit-copy.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-commit-copy.t Wed Oct 27 04:49:49 2010 +0530
@@ -11,6 +11,6 @@
$ hg debugrename foo
foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9
$ hg debugindex .hg/store/data/bar.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 6 0 0 26d3ca0dfd18 000000000000 000000000000
- 1 6 7 1 1 d267bddd54f7 26d3ca0dfd18 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 6 5 0 0 -1 -1 26d3ca0dfd18
+ 1 6 7 6 1 1 0 -1 d267bddd54f7
diff -r b00eda50ad2b -r 9cf20092114a tests/test-copy.t
--- a/tests/test-copy.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-copy.t Wed Oct 27 04:49:49 2010 +0530
@@ -50,8 +50,8 @@
this should show a revision linked to changeset 0
$ hg debugindex .hg/store/data/a.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 b789fdd96dc2 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 0 -1 -1 b789fdd96dc2
we should see one log entry for b
@@ -66,8 +66,8 @@
this should show a revision linked to changeset 1
$ hg debugindex .hg/store/data/b.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 65 0 1 37d9b5d994ea 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 65 64 0 1 -1 -1 37d9b5d994ea
this should show the rename information in the metadata
diff -r b00eda50ad2b -r 9cf20092114a tests/test-copy2.t
--- a/tests/test-copy2.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-copy2.t Wed Oct 27 04:49:49 2010 +0530
@@ -47,8 +47,8 @@
should match
$ hg debugindex .hg/store/data/foo.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 5 4 0 0 -1 -1 2ed2a3912a0b
$ hg debugrename bar
bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
@@ -69,15 +69,15 @@
should show no parents for tip
$ hg debugindex .hg/store/data/bar.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 69 0 1 7711d36246cc 000000000000 000000000000
- 1 69 6 1 2 bdf70a2b8d03 7711d36246cc 000000000000
- 2 75 81 1 3 b2558327ea8d 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 69 68 0 1 -1 -1 7711d36246cc
+ 1 69 6 5 1 2 0 -1 bdf70a2b8d03
+ 2 75 81 70 1 3 -1 -1 b2558327ea8d
should match
$ hg debugindex .hg/store/data/foo.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000
- 1 5 7 1 2 dd12c926cf16 2ed2a3912a0b 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 5 4 0 0 -1 -1 2ed2a3912a0b
+ 1 5 7 6 1 2 0 -1 dd12c926cf16
$ hg debugrename bar
bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
diff -r b00eda50ad2b -r 9cf20092114a tests/test-debugcomplete.t
--- a/tests/test-debugcomplete.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-debugcomplete.t Wed Oct 27 04:49:49 2010 +0530
@@ -212,7 +212,7 @@
debugdata:
debugdate: extended
debugfsinfo:
- debugindex:
+ debugindex: flags
debugindexdot:
debuginstall:
debugpushkey:
diff -r b00eda50ad2b -r 9cf20092114a tests/test-excessive-merge.t
--- a/tests/test-excessive-merge.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-excessive-merge.t Wed Oct 27 04:49:49 2010 +0530
@@ -64,12 +64,12 @@
summary: test
$ hg debugindex .hg/store/00changelog.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 60 0 0 5e0375449e74 000000000000 000000000000
- 1 60 62 1 1 96155394af80 5e0375449e74 000000000000
- 2 122 62 2 2 92cc4c306b19 5e0375449e74 000000000000
- 3 184 69 3 3 e16a66a37edd 92cc4c306b19 96155394af80
- 4 253 29 3 4 2ee31f665a86 96155394af80 92cc4c306b19
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 60 59 0 0 -1 -1 5e0375449e74
+ 1 60 62 61 1 1 0 -1 96155394af80
+ 2 122 62 61 2 2 0 -1 92cc4c306b19
+ 3 184 69 68 3 3 2 1 e16a66a37edd
+ 4 253 29 68 3 4 1 2 2ee31f665a86
revision 1
$ hg manifest --debug 1
@@ -89,9 +89,9 @@
79d7492df40aa0fa093ec4209be78043c181f094 644 b
$ hg debugindex .hg/store/data/a.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000
- 1 5 6 1 1 79d7492df40a 2ed2a3912a0b 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 5 4 0 0 -1 -1 2ed2a3912a0b
+ 1 5 6 5 1 1 0 -1 79d7492df40a
$ hg verify
checking changesets
diff -r b00eda50ad2b -r 9cf20092114a tests/test-extra-filelog-entry.t
--- a/tests/test-extra-filelog-entry.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-extra-filelog-entry.t Wed Oct 27 04:49:49 2010 +0530
@@ -16,6 +16,6 @@
$ hg qrefresh
$ hg debugindex .hg/store/data/b.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 1e88685f5dde 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 0 -1 -1 1e88685f5dde
diff -r b00eda50ad2b -r 9cf20092114a tests/test-filebranch.t
--- a/tests/test-filebranch.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-filebranch.t Wed Oct 27 04:49:49 2010 +0530
@@ -76,11 +76,11 @@
main: we should have a merge here:
$ hg debugindex .hg/store/00changelog.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 73 0 0 cdca01651b96 000000000000 000000000000
- 1 73 68 1 1 f6718a9cb7f3 cdca01651b96 000000000000
- 2 141 68 2 2 bdd988058d16 cdca01651b96 000000000000
- 3 209 66 3 3 d8a521142a3c f6718a9cb7f3 bdd988058d16
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 73 72 0 0 -1 -1 cdca01651b96
+ 1 73 68 67 1 1 0 -1 f6718a9cb7f3
+ 2 141 68 67 2 2 0 -1 bdd988058d16
+ 3 209 66 65 3 3 1 2 d8a521142a3c
log should show foo and quux changed:
@@ -100,32 +100,32 @@
foo: we should have a merge here:
$ hg debugindex .hg/store/data/foo.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 b8e02f643373 000000000000 000000000000
- 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000
- 2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000
- 3 11 4 3 3 aa27919ee430 2ffeddde1b65 33d1fb69067a
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 0 -1 -1 b8e02f643373
+ 1 3 4 3 1 1 0 -1 2ffeddde1b65
+ 2 7 4 3 2 2 0 -1 33d1fb69067a
+ 3 11 4 3 3 3 1 2 aa27919ee430
bar: we should not have a merge here:
$ hg debugindex .hg/store/data/bar.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 b8e02f643373 000000000000 000000000000
- 1 3 4 1 2 33d1fb69067a b8e02f643373 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 0 -1 -1 b8e02f643373
+ 1 3 4 3 1 2 0 -1 33d1fb69067a
baz: we should not have a merge here:
$ hg debugindex .hg/store/data/baz.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 b8e02f643373 000000000000 000000000000
- 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 0 -1 -1 b8e02f643373
+ 1 3 4 3 1 1 0 -1 2ffeddde1b65
quux: we should not have a merge here:
$ hg debugindex .hg/store/data/quux.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 b8e02f643373 000000000000 000000000000
- 1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 0 -1 -1 b8e02f643373
+ 1 3 5 4 1 3 0 -1 6128c0f33108
Manifest entries should match tips of all files:
diff -r b00eda50ad2b -r 9cf20092114a tests/test-flags.t
--- a/tests/test-flags.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-flags.t Wed Oct 27 04:49:49 2010 +0530
@@ -138,12 +138,12 @@
-rwxr-x---
$ hg debugindex .hg/store/data/a.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 0 0 0 b80de5d13875 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 0 0 0 0 -1 -1 b80de5d13875
$ hg debugindex ../test2/.hg/store/data/a.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 0 0 0 b80de5d13875 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 0 0 0 0 -1 -1 b80de5d13875
$ hg debugindex ../test1/.hg/store/data/a.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 0 0 0 b80de5d13875 000000000000 000000000000
- 1 0 5 1 1 7fe919cc0336 b80de5d13875 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 0 0 0 0 -1 -1 b80de5d13875
+ 1 0 5 4 1 1 0 -1 7fe919cc0336
diff -r b00eda50ad2b -r 9cf20092114a tests/test-http-clone-r.t
--- a/tests/test-http-clone-r.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-http-clone-r.t Wed Oct 27 04:49:49 2010 +0530
@@ -47,29 +47,29 @@
$ hg mv afile anotherfile
$ hg commit -m "0.3m"
$ hg debugindex .hg/store/data/afile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 362fef284ce2 000000000000 000000000000
- 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000
- 2 8 7 2 2 4c982badb186 125144f7e028 000000000000
- 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 0 -1 -1 362fef284ce2
+ 1 3 5 4 1 1 0 -1 125144f7e028
+ 2 8 7 6 2 2 1 -1 4c982badb186
+ 3 15 9 8 3 3 2 -1 19b1fc555737
$ hg debugindex .hg/store/data/adifferentfile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 75 0 7 2565f3199a74 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 75 74 0 7 -1 -1 2565f3199a74
$ hg debugindex .hg/store/data/anotherfile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 75 0 8 2565f3199a74 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 75 74 0 8 -1 -1 2565f3199a74
$ hg debugindex .hg/store/data/fred.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 8 7 0 6 -1 -1 12ab3bcc5ea4
$ hg debugindex .hg/store/00manifest.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000
- 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000
- 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000
- 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000
- 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000
- 5 250 68 3 7 09bb521d218d de68e904d169 000000000000
- 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 48 47 0 0 -1 -1 43eadb1d2d06
+ 1 48 48 47 1 1 0 -1 8b89697eba2c
+ 2 96 48 47 2 2 1 -1 626a32663c2f
+ 3 144 48 47 3 3 2 -1 f54c32f13478
+ 4 192 58 93 3 6 2 -1 de68e904d169
+ 5 250 68 102 3 7 4 -1 09bb521d218d
+ 6 318 54 53 6 8 3 -1 1fde233dfb0f
$ hg verify
checking changesets
checking manifests
diff -r b00eda50ad2b -r 9cf20092114a tests/test-issue522.t
--- a/tests/test-issue522.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-issue522.t Wed Oct 27 04:49:49 2010 +0530
@@ -49,8 +49,8 @@
c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo
$ hg debugindex .hg/store/data/foo.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000
- 1 5 9 1 1 6f4310b00b9a 2ed2a3912a0b 000000000000
- 2 14 5 2 2 c6fc755d7e68 6f4310b00b9a 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 5 4 0 0 -1 -1 2ed2a3912a0b
+ 1 5 9 8 1 1 0 -1 6f4310b00b9a
+ 2 14 5 4 2 2 1 -1 c6fc755d7e68
diff -r b00eda50ad2b -r 9cf20092114a tests/test-merge-commit.t
--- a/tests/test-merge-commit.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-merge-commit.t Wed Oct 27 04:49:49 2010 +0530
@@ -35,17 +35,17 @@
$ hg ci -m '3: merge with local rename'
$ hg debugindex .hg/store/data/bar.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 77 0 2 d35118874825 000000000000 000000000000
- 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 77 76 0 2 -1 -1 d35118874825
+ 1 77 76 82 0 3 -1 0 5345f5ab8abd
$ hg debugrename bar
bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
$ hg debugindex .hg/store/data/foo.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 7 0 0 690b295714ae 000000000000 000000000000
- 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 7 6 0 0 -1 -1 690b295714ae
+ 1 7 13 12 1 1 0 -1 9e25c27b8757
Revert the content change from rev 2:
@@ -88,11 +88,11 @@
$ hg ci -m '5: merge'
$ hg debugindex .hg/store/data/bar.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 77 0 2 d35118874825 000000000000 000000000000
- 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825
- 2 153 7 2 4 ff4b45017382 d35118874825 000000000000
- 3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 77 76 0 2 -1 -1 d35118874825
+ 1 77 76 82 0 3 -1 0 5345f5ab8abd
+ 2 153 7 6 2 4 0 -1 ff4b45017382
+ 3 160 13 12 3 5 2 1 3701b4893544
Same thing, but with the merge on 3 having the rename
@@ -122,17 +122,17 @@
$ hg ci -m '3: merge with remote rename'
$ hg debugindex .hg/store/data/bar.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 77 0 2 d35118874825 000000000000 000000000000
- 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 77 76 0 2 -1 -1 d35118874825
+ 1 77 76 82 0 3 -1 0 5345f5ab8abd
$ hg debugrename bar
bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
$ hg debugindex .hg/store/data/foo.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 7 0 0 690b295714ae 000000000000 000000000000
- 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 7 6 0 0 -1 -1 690b295714ae
+ 1 7 13 12 1 1 0 -1 9e25c27b8757
Revert the content change from rev 2:
@@ -175,9 +175,9 @@
$ hg ci -m '5: merge'
$ hg debugindex .hg/store/data/bar.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 77 0 2 d35118874825 000000000000 000000000000
- 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825
- 2 153 7 2 4 ff4b45017382 d35118874825 000000000000
- 3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 77 76 0 2 -1 -1 d35118874825
+ 1 77 76 82 0 3 -1 0 5345f5ab8abd
+ 2 153 7 6 2 4 0 -1 ff4b45017382
+ 3 160 13 12 3 5 2 1 3701b4893544
diff -r b00eda50ad2b -r 9cf20092114a tests/test-merge7.t
--- a/tests/test-merge7.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-merge7.t Wed Oct 27 04:49:49 2010 +0530
@@ -105,12 +105,12 @@
three
$ hg debugindex .hg/store/data/test.txt.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 7 0 0 01365c4cca56 000000000000 000000000000
- 1 7 9 1 1 7b013192566a 01365c4cca56 000000000000
- 2 16 15 2 2 8fe46a3eb557 01365c4cca56 000000000000
- 3 31 27 2 3 fc3148072371 7b013192566a 8fe46a3eb557
- 4 58 25 4 4 d40249267ae3 8fe46a3eb557 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 7 6 0 0 -1 -1 01365c4cca56
+ 1 7 9 8 1 1 0 -1 7b013192566a
+ 2 16 15 14 2 2 0 -1 8fe46a3eb557
+ 3 31 27 25 2 3 1 2 fc3148072371
+ 4 58 25 24 4 4 2 -1 d40249267ae3
$ hg log
changeset: 4:40d11a4173a8
diff -r b00eda50ad2b -r 9cf20092114a tests/test-push-r.t
--- a/tests/test-push-r.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-push-r.t Wed Oct 27 04:49:49 2010 +0530
@@ -55,33 +55,33 @@
$ hg commit -m "0.3m"
$ hg debugindex .hg/store/data/afile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 362fef284ce2 000000000000 000000000000
- 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000
- 2 8 7 2 2 4c982badb186 125144f7e028 000000000000
- 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 0 -1 -1 362fef284ce2
+ 1 3 5 4 1 1 0 -1 125144f7e028
+ 2 8 7 6 2 2 1 -1 4c982badb186
+ 3 15 9 8 3 3 2 -1 19b1fc555737
$ hg debugindex .hg/store/data/adifferentfile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 75 0 7 2565f3199a74 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 75 74 0 7 -1 -1 2565f3199a74
$ hg debugindex .hg/store/data/anotherfile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 75 0 8 2565f3199a74 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 75 74 0 8 -1 -1 2565f3199a74
$ hg debugindex .hg/store/data/fred.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 8 7 0 6 -1 -1 12ab3bcc5ea4
$ hg debugindex .hg/store/00manifest.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000
- 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000
- 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000
- 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000
- 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000
- 5 250 68 3 7 09bb521d218d de68e904d169 000000000000
- 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 48 47 0 0 -1 -1 43eadb1d2d06
+ 1 48 48 47 1 1 0 -1 8b89697eba2c
+ 2 96 48 47 2 2 1 -1 626a32663c2f
+ 3 144 48 47 3 3 2 -1 f54c32f13478
+ 4 192 58 93 3 6 2 -1 de68e904d169
+ 5 250 68 102 3 7 4 -1 09bb521d218d
+ 6 318 54 53 6 8 3 -1 1fde233dfb0f
$ hg verify
checking changesets
diff -r b00eda50ad2b -r 9cf20092114a tests/test-rename-merge1.t
--- a/tests/test-rename-merge1.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-rename-merge1.t Wed Oct 27 04:49:49 2010 +0530
@@ -68,9 +68,9 @@
$ hg ci -m "merge"
$ hg debugindex .hg/store/data/b.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 67 0 1 57eacc201a7f 000000000000 000000000000
- 1 67 72 1 3 4727ba907962 000000000000 57eacc201a7f
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 67 66 0 1 -1 -1 57eacc201a7f
+ 1 67 72 71 1 3 -1 0 4727ba907962
$ hg debugrename b
b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66
diff -r b00eda50ad2b -r 9cf20092114a tests/test-revlog-packentry.t
--- a/tests/test-revlog-packentry.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-revlog-packentry.t Wed Oct 27 04:49:49 2010 +0530
@@ -16,6 +16,6 @@
created new head
$ hg debugindex .hg/store/data/foo.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 0 0 0 b80de5d13875 000000000000 000000000000
- 1 0 24 0 1 0376abec49b8 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 0 0 0 0 -1 -1 b80de5d13875
+ 1 0 24 12 0 1 -1 -1 0376abec49b8
diff -r b00eda50ad2b -r 9cf20092114a tests/test-ssh-clone-r.t
--- a/tests/test-ssh-clone-r.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-ssh-clone-r.t Wed Oct 27 04:49:49 2010 +0530
@@ -70,29 +70,29 @@
$ hg mv afile anotherfile
$ hg commit -m "0.3m"
$ hg debugindex .hg/store/data/afile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 362fef284ce2 000000000000 000000000000
- 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000
- 2 8 7 2 2 4c982badb186 125144f7e028 000000000000
- 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 0 -1 -1 362fef284ce2
+ 1 3 5 4 1 1 0 -1 125144f7e028
+ 2 8 7 6 2 2 1 -1 4c982badb186
+ 3 15 9 8 3 3 2 -1 19b1fc555737
$ hg debugindex .hg/store/data/adifferentfile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 75 0 7 2565f3199a74 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 75 74 0 7 -1 -1 2565f3199a74
$ hg debugindex .hg/store/data/anotherfile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 75 0 8 2565f3199a74 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 75 74 0 8 -1 -1 2565f3199a74
$ hg debugindex .hg/store/data/fred.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 8 7 0 6 -1 -1 12ab3bcc5ea4
$ hg debugindex .hg/store/00manifest.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000
- 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000
- 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000
- 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000
- 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000
- 5 250 68 3 7 09bb521d218d de68e904d169 000000000000
- 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 48 47 0 0 -1 -1 43eadb1d2d06
+ 1 48 48 47 1 1 0 -1 8b89697eba2c
+ 2 96 48 47 2 2 1 -1 626a32663c2f
+ 3 144 48 47 3 3 2 -1 f54c32f13478
+ 4 192 58 93 3 6 2 -1 de68e904d169
+ 5 250 68 102 3 7 4 -1 09bb521d218d
+ 6 318 54 53 6 8 3 -1 1fde233dfb0f
$ hg verify
checking changesets
checking manifests
diff -r b00eda50ad2b -r 9cf20092114a tests/test-strip-cross.t
--- a/tests/test-strip-cross.t Wed Oct 20 17:38:21 2010 -0500
+++ b/tests/test-strip-cross.t Wed Oct 27 04:49:49 2010 +0530
@@ -38,53 +38,53 @@
> echo
> done
crossed/.hg/store/00manifest.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 112 0 0 6f105cbb914d 000000000000 000000000000
- 1 112 56 1 3 1b55917b3699 000000000000 000000000000
- 2 168 123 1 1 8f3d04e263e5 000000000000 000000000000
- 3 291 122 1 2 f0ef8726ac4f 000000000000 000000000000
- 4 413 87 4 4 0b76e38b4070 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 112 270 0 0 -1 -1 6f105cbb914d
+ 1 112 56 55 1 3 -1 -1 1b55917b3699
+ 2 168 123 270 1 1 -1 -1 8f3d04e263e5
+ 3 291 122 270 1 2 -1 -1 f0ef8726ac4f
+ 4 413 87 100 4 4 -1 -1 0b76e38b4070
crossed/.hg/store/data/012.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 b8e02f643373 000000000000 000000000000
- 1 3 3 1 1 5d9299349fc0 000000000000 000000000000
- 2 6 3 2 2 2661d26c6496 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 0 -1 -1 b8e02f643373
+ 1 3 3 2 1 1 -1 -1 5d9299349fc0
+ 2 6 3 2 2 2 -1 -1 2661d26c6496
crossed/.hg/store/data/021.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 b8e02f643373 000000000000 000000000000
- 1 3 3 1 2 5d9299349fc0 000000000000 000000000000
- 2 6 3 2 1 2661d26c6496 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 0 -1 -1 b8e02f643373
+ 1 3 3 2 1 2 -1 -1 5d9299349fc0
+ 2 6 3 2 2 1 -1 -1 2661d26c6496
crossed/.hg/store/data/102.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 1 b8e02f643373 000000000000 000000000000
- 1 3 3 1 0 5d9299349fc0 000000000000 000000000000
- 2 6 3 2 2 2661d26c6496 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 1 -1 -1 b8e02f643373
+ 1 3 3 2 1 0 -1 -1 5d9299349fc0
+ 2 6 3 2 2 2 -1 -1 2661d26c6496
crossed/.hg/store/data/120.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 1 b8e02f643373 000000000000 000000000000
- 1 3 3 1 2 5d9299349fc0 000000000000 000000000000
- 2 6 3 2 0 2661d26c6496 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 1 -1 -1 b8e02f643373
+ 1 3 3 2 1 2 -1 -1 5d9299349fc0
+ 2 6 3 2 2 0 -1 -1 2661d26c6496
crossed/.hg/store/data/201.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 2 b8e02f643373 000000000000 000000000000
- 1 3 3 1 0 5d9299349fc0 000000000000 000000000000
- 2 6 3 2 1 2661d26c6496 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 2 -1 -1 b8e02f643373
+ 1 3 3 2 1 0 -1 -1 5d9299349fc0
+ 2 6 3 2 2 1 -1 -1 2661d26c6496
crossed/.hg/store/data/210.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 2 b8e02f643373 000000000000 000000000000
- 1 3 3 1 1 5d9299349fc0 000000000000 000000000000
- 2 6 3 2 0 2661d26c6496 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 2 -1 -1 b8e02f643373
+ 1 3 3 2 1 1 -1 -1 5d9299349fc0
+ 2 6 3 2 2 0 -1 -1 2661d26c6496
crossed/.hg/store/data/manifest-file.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 3 b8e02f643373 000000000000 000000000000
- 1 3 3 1 4 5d9299349fc0 000000000000 000000000000
+ rev offset length size base linkrev p1 p2 nodeid
+ 0 0 3 2 0 3 -1 -1 b8e02f643373
+ 1 3 3 2 1 4 -1 -1 5d9299349fc0
$ for i in 0 1 2 3 4; do
> hg clone -q -U --pull crossed $i
More information about the Mercurial-devel
mailing list