# HG changeset patch # User Martin Geisler # Date 1342080230 -7200 # Node ID ad1b5e070f16a7f90fa043e8ead4caa077b23f04 # Parent 528cb91a90ee1ada83842784e1bbc6b831961be9# Parent 4fb2d3d16743918b6f7b84fea31e48d20ec2896b merge with main diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -29,6 +29,11 @@ supportedformats = set(('revlogv1', 'generaldelta')) supported = supportedformats | set(('store', 'fncache', 'shared', 'dotencode')) + openerreqs = set(('revlogv1', 'generaldelta')) + requirements = ['revlogv1'] + + def _baserequirements(self, create): + return self.requirements[:] def __init__(self, baseui, path=None, create=False): repo.repository.__init__(self) @@ -56,7 +61,7 @@ if not os.path.exists(path): util.makedirs(path) util.makedir(self.path, notindexed=True) - requirements = ["revlogv1"] + requirements = self._baserequirements(create) if self.ui.configbool('format', 'usestore', True): os.mkdir(os.path.join(self.path, "store")) requirements.append("store") @@ -120,9 +125,8 @@ def _applyrequirements(self, requirements): self.requirements = requirements - openerreqs = set(('revlogv1', 'generaldelta')) self.sopener.options = dict((r, 1) for r in requirements - if r in openerreqs) + if r in self.openerreqs) def _writerequirements(self): reqfile = self.opener("requires", "w") diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -320,6 +320,15 @@ rev = base base = index[rev][3] return base + def chainlength(self, rev): + index = self.index + base = index[rev][3] + length = index[rev][1] + while base != rev: + rev = base + base = index[rev][3] + length = length + index[rev][1] + return length def flags(self, rev): return self.index[rev][0] & 0xFFFF def rawsize(self, rev): @@ -1046,10 +1055,11 @@ chainbase = basecache[1] else: chainbase = self.chainbase(rev) - dist = l + offset - self.start(chainbase) if self._generaldelta: + dist = l + self.chainlength(rev) base = rev else: + dist = l + offset - self.start(chainbase) base = chainbase return dist, l, data, base, chainbase diff --git a/tests/test-changelog-exec.t b/tests/test-changelog-exec.t --- a/tests/test-changelog-exec.t +++ b/tests/test-changelog-exec.t @@ -49,7 +49,7 @@ $ hg debugindex bar - rev offset length base linkrev nodeid p1 p2 - 0 0 5 0 1 b004912a8510 000000000000 000000000000 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 5 ..... 1 b004912a8510 000000000000 000000000000 (re) $ cd .. diff --git a/tests/test-clone-r.t b/tests/test-clone-r.t --- a/tests/test-clone-r.t +++ b/tests/test-clone-r.t @@ -38,33 +38,33 @@ $ hg commit -m "0.3m" $ hg debugindex -f 1 afile - rev flag offset length size base link p1 p2 nodeid - 0 0000 0 3 2 0 0 -1 -1 362fef284ce2 - 1 0000 3 5 4 1 1 0 -1 125144f7e028 - 2 0000 8 7 6 2 2 1 -1 4c982badb186 - 3 0000 15 9 8 3 3 2 -1 19b1fc555737 + rev flag offset length size ..... link p1 p2 nodeid (re) + 0 0000 0 3 2 ..... 0 -1 -1 362fef284ce2 (re) + 1 0000 3 5 4 ..... 1 0 -1 125144f7e028 (re) + 2 0000 8 7 6 ..... 2 1 -1 4c982badb186 (re) + 3 0000 15 9 8 ..... 3 2 -1 19b1fc555737 (re) $ hg debugindex adifferentfile - rev offset length base linkrev nodeid p1 p2 - 0 0 75 0 7 2565f3199a74 000000000000 000000000000 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 75 ..... 7 2565f3199a74 000000000000 000000000000 (re) $ hg debugindex anotherfile - rev offset length base linkrev nodeid p1 p2 - 0 0 75 0 8 2565f3199a74 000000000000 000000000000 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 75 ..... 8 2565f3199a74 000000000000 000000000000 (re) $ hg debugindex fred - rev offset length base linkrev nodeid p1 p2 - 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 8 ..... 6 12ab3bcc5ea4 000000000000 000000000000 (re) $ hg debugindex --manifest - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 48 ..... 0 43eadb1d2d06 000000000000 000000000000 (re) + 1 48 48 ..... 1 8b89697eba2c 43eadb1d2d06 000000000000 (re) + 2 96 48 ..... 2 626a32663c2f 8b89697eba2c 000000000000 (re) + 3 144 48 ..... 3 f54c32f13478 626a32663c2f 000000000000 (re) + 4 192 .. ..... 6 de68e904d169 626a32663c2f 000000000000 (re) + 5 2.. 68 ..... 7 09bb521d218d de68e904d169 000000000000 (re) + 6 3.. 54 ..... 8 1fde233dfb0f f54c32f13478 000000000000 (re) $ hg verify checking changesets diff --git a/tests/test-clone.t b/tests/test-clone.t --- a/tests/test-clone.t +++ b/tests/test-clone.t @@ -449,8 +449,9 @@ $ rm -r ua $ cat < branchclone.py - > from mercurial import ui, hg + > from mercurial import ui, hg, extensions > myui = ui.ui() + > extensions.loadall(myui) > repo = hg.repository(myui, 'a') > hg.clone(myui, {}, repo, dest="ua", branch=["stable",]) > EOF diff --git a/tests/test-commit.t b/tests/test-commit.t --- a/tests/test-commit.t +++ b/tests/test-commit.t @@ -300,8 +300,8 @@ $ hg debugrename foo foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9 $ hg debugindex bar - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 6 ..... 0 26d3ca0dfd18 000000000000 000000000000 (re) + 1 6 7 ..... 1 d267bddd54f7 26d3ca0dfd18 000000000000 (re) $ cd .. diff --git a/tests/test-copy.t b/tests/test-copy.t --- a/tests/test-copy.t +++ b/tests/test-copy.t @@ -57,8 +57,8 @@ this should show a revision linked to changeset 0 $ hg debugindex a - rev offset length base linkrev nodeid p1 p2 - 0 0 3 0 0 b789fdd96dc2 000000000000 000000000000 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 3 ..... 0 b789fdd96dc2 000000000000 000000000000 (re) we should see one log entry for b @@ -73,8 +73,8 @@ this should show a revision linked to changeset 1 $ hg debugindex b - rev offset length base linkrev nodeid p1 p2 - 0 0 65 0 1 37d9b5d994ea 000000000000 000000000000 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 65 ..... 1 37d9b5d994ea 000000000000 000000000000 (re) this should show the rename information in the metadata @@ -159,8 +159,8 @@ should match $ hg debugindex foo - rev offset length base linkrev nodeid p1 p2 - 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re) $ hg debugrename bar bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd @@ -181,15 +181,15 @@ should show no parents for tip $ hg debugindex bar - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 69 ..... 1 7711d36246cc 000000000000 000000000000 (re) + 1 69 6 ..... 2 bdf70a2b8d03 7711d36246cc 000000000000 (re) + 2 75 81 ..... 3 b2558327ea8d 000000000000 000000000000 (re) should match $ hg debugindex foo - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re) + 1 5 7 ..... 2 dd12c926cf16 2ed2a3912a0b 000000000000 (re) $ hg debugrename bar bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17 diff --git a/tests/test-excessive-merge.t b/tests/test-excessive-merge.t --- a/tests/test-excessive-merge.t +++ b/tests/test-excessive-merge.t @@ -64,12 +64,12 @@ summary: test $ hg debugindex --changelog - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 60 ..... 0 5e0375449e74 000000000000 000000000000 (re) + 1 60 62 ..... 1 96155394af80 5e0375449e74 000000000000 (re) + 2 122 62 ..... 2 92cc4c306b19 5e0375449e74 000000000000 (re) + 3 184 69 ..... 3 e16a66a37edd 92cc4c306b19 96155394af80 (re) + 4 253 29 ..... 4 2ee31f665a86 96155394af80 92cc4c306b19 (re) revision 1 $ hg manifest --debug 1 @@ -89,9 +89,9 @@ 79d7492df40aa0fa093ec4209be78043c181f094 644 b $ hg debugindex a - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re) + 1 5 6 ..... 1 79d7492df40a 2ed2a3912a0b 000000000000 (re) $ hg verify checking changesets diff --git a/tests/test-extra-filelog-entry.t b/tests/test-extra-filelog-entry.t --- a/tests/test-extra-filelog-entry.t +++ b/tests/test-extra-filelog-entry.t @@ -16,6 +16,6 @@ $ hg qrefresh $ hg debugindex b - rev offset length base linkrev nodeid p1 p2 - 0 0 3 0 0 1e88685f5dde 000000000000 000000000000 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 3 ..... 0 1e88685f5dde 000000000000 000000000000 (re) diff --git a/tests/test-filebranch.t b/tests/test-filebranch.t --- a/tests/test-filebranch.t +++ b/tests/test-filebranch.t @@ -76,11 +76,11 @@ main: we should have a merge here: $ hg debugindex --changelog - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 73 ..... 0 cdca01651b96 000000000000 000000000000 (re) + 1 73 68 ..... 1 f6718a9cb7f3 cdca01651b96 000000000000 (re) + 2 141 68 ..... 2 bdd988058d16 cdca01651b96 000000000000 (re) + 3 209 66 ..... 3 d8a521142a3c f6718a9cb7f3 bdd988058d16 (re) log should show foo and quux changed: @@ -100,32 +100,32 @@ foo: we should have a merge here: $ hg debugindex foo - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) + 1 3 4 ..... 1 2ffeddde1b65 b8e02f643373 000000000000 (re) + 2 7 4 ..... 2 33d1fb69067a b8e02f643373 000000000000 (re) + 3 11 4 ..... 3 aa27919ee430 2ffeddde1b65 33d1fb69067a (re) bar: we should not have a merge here: $ hg debugindex bar - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) + 1 3 4 ..... 2 33d1fb69067a b8e02f643373 000000000000 (re) baz: we should not have a merge here: $ hg debugindex baz - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) + 1 3 4 ..... 1 2ffeddde1b65 b8e02f643373 000000000000 (re) quux: we should not have a merge here: $ hg debugindex quux - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) + 1 3 5 ..... 3 6128c0f33108 b8e02f643373 000000000000 (re) Manifest entries should match tips of all files: diff --git a/tests/test-flags.t b/tests/test-flags.t --- a/tests/test-flags.t +++ b/tests/test-flags.t @@ -138,14 +138,14 @@ -rwxr-x--- $ hg debugindex a - rev offset length base linkrev nodeid p1 p2 - 0 0 0 0 0 b80de5d13875 000000000000 000000000000 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) $ hg debugindex -R ../test2 a - rev offset length base linkrev nodeid p1 p2 - 0 0 0 0 0 b80de5d13875 000000000000 000000000000 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) $ hg debugindex -R ../test1 a - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) + 1 0 5 ..... 1 7fe919cc0336 b80de5d13875 000000000000 (re) $ cd .. diff --git a/tests/test-issue522.t b/tests/test-issue522.t --- a/tests/test-issue522.t +++ b/tests/test-issue522.t @@ -49,8 +49,8 @@ c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo $ hg debugindex foo - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re) + 1 5 9 ..... 1 6f4310b00b9a 2ed2a3912a0b 000000000000 (re) + 2 14 5 ..... 2 c6fc755d7e68 6f4310b00b9a 000000000000 (re) diff --git a/tests/test-merge-commit.t b/tests/test-merge-commit.t --- a/tests/test-merge-commit.t +++ b/tests/test-merge-commit.t @@ -35,17 +35,17 @@ $ hg ci -m '3: merge with local rename' $ hg debugindex bar - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) + 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) $ hg debugrename bar bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 $ hg debugindex foo - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re) + 1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re) Revert the content change from rev 2: @@ -88,11 +88,11 @@ $ hg ci -m '5: merge' $ hg debugindex bar - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) + 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) + 2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re) + 3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re) 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 bar - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) + 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) $ hg debugrename bar bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 $ hg debugindex foo - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re) + 1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re) Revert the content change from rev 2: @@ -175,10 +175,10 @@ $ hg ci -m '5: merge' $ hg debugindex bar - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) + 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) + 2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re) + 3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re) $ cd .. diff --git a/tests/test-merge7.t b/tests/test-merge7.t --- a/tests/test-merge7.t +++ b/tests/test-merge7.t @@ -105,12 +105,12 @@ three $ hg debugindex test.txt - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 7 ..... 0 01365c4cca56 000000000000 000000000000 (re) + 1 7 9 ..... 1 7b013192566a 01365c4cca56 000000000000 (re) + 2 16 15 ..... 2 8fe46a3eb557 01365c4cca56 000000000000 (re) + 3 31 2. ..... 3 fc3148072371 7b013192566a 8fe46a3eb557 (re) + 4 5. 25 ..... 4 d40249267ae3 8fe46a3eb557 000000000000 (re) $ hg log changeset: 4:40d11a4173a8 diff --git a/tests/test-rename-merge1.t b/tests/test-rename-merge1.t --- a/tests/test-rename-merge1.t +++ b/tests/test-rename-merge1.t @@ -68,9 +68,9 @@ $ hg ci -m "merge" $ hg debugindex b - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 67 ..... 1 57eacc201a7f 000000000000 000000000000 (re) + 1 67 72 ..... 3 4727ba907962 000000000000 57eacc201a7f (re) $ hg debugrename b b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 diff --git a/tests/test-revlog-packentry.t b/tests/test-revlog-packentry.t --- a/tests/test-revlog-packentry.t +++ b/tests/test-revlog-packentry.t @@ -16,8 +16,8 @@ created new head $ hg debugindex foo - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) + 1 0 24 ..... 1 0376abec49b8 000000000000 000000000000 (re) $ cd .. diff --git a/tests/test-strip-cross.t b/tests/test-strip-cross.t --- a/tests/test-strip-cross.t +++ b/tests/test-strip-cross.t @@ -34,12 +34,12 @@ $ hg clone -q -U -r -1 -r -2 -r -3 -r -4 -r -6 orig crossed $ cd crossed $ hg debugindex --manifest - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 112 ..... 0 6f105cbb914d 000000000000 000000000000 (re) + 1 112 56 ..... 3 1b55917b3699 000000000000 000000000000 (re) + 2 168 123 ..... 1 8f3d04e263e5 000000000000 000000000000 (re) + 3 291 122 ..... 2 f0ef8726ac4f 000000000000 000000000000 (re) + 4 413 87 ..... 4 0b76e38b4070 000000000000 000000000000 (re) $ for i in 012 021 102 120 201 210 manifest-file; do > echo $i @@ -47,45 +47,45 @@ > echo > done 012 - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) + 1 3 3 ..... 1 5d9299349fc0 000000000000 000000000000 (re) + 2 6 3 ..... 2 2661d26c6496 000000000000 000000000000 (re) 021 - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) + 1 3 3 ..... 2 5d9299349fc0 000000000000 000000000000 (re) + 2 6 3 ..... 1 2661d26c6496 000000000000 000000000000 (re) 102 - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 3 ..... 1 b8e02f643373 000000000000 000000000000 (re) + 1 3 3 ..... 0 5d9299349fc0 000000000000 000000000000 (re) + 2 6 3 ..... 2 2661d26c6496 000000000000 000000000000 (re) 120 - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 3 ..... 1 b8e02f643373 000000000000 000000000000 (re) + 1 3 3 ..... 2 5d9299349fc0 000000000000 000000000000 (re) + 2 6 3 ..... 0 2661d26c6496 000000000000 000000000000 (re) 201 - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 3 ..... 2 b8e02f643373 000000000000 000000000000 (re) + 1 3 3 ..... 0 5d9299349fc0 000000000000 000000000000 (re) + 2 6 3 ..... 1 2661d26c6496 000000000000 000000000000 (re) 210 - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 3 ..... 2 b8e02f643373 000000000000 000000000000 (re) + 1 3 3 ..... 1 5d9299349fc0 000000000000 000000000000 (re) + 2 6 3 ..... 0 2661d26c6496 000000000000 000000000000 (re) manifest-file - 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 ..... linkrev nodeid p1 p2 (re) + 0 0 3 ..... 3 b8e02f643373 000000000000 000000000000 (re) + 1 3 3 ..... 4 5d9299349fc0 000000000000 000000000000 (re) $ cd .. $ for i in 0 1 2 3 4; do