This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3027

debugcommands: drop base revision from debugindex
ClosedPublic

Authored by indygreg on Apr 2 2018, 11:53 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG009d0283de5f: debugcommands: drop base revision from debugindex
Summary

Revlog index data consists of generic index metadata that will
likely be implemented across all storage engines and revlog-specifc
metadata.

Most tests printing index data only care about the generic fields.

This commit drops the printing of the base revision from
hg debugindex. This value is an implementation detail of
revlogs / delta chains. If tests are interested in verifying this
implementation detail, hg debugdeltachain is a better command.

Most tests were skipping over this field anyway. Tests that weren't
looked like they were newer. So my guess is we forgot to make them
skip the field to match the style of the older tests. This reinforces
my belief that the base revision is not worth having in
hg debugindex.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Apr 2 2018, 11:53 PM
durin42 accepted this revision.Apr 3 2018, 11:21 AM
This revision is now accepted and ready to land.Apr 3 2018, 11:21 AM
Closed by commit rHG009d0283de5f: debugcommands: drop base revision from debugindex (authored by indygreg). · Explain WhyApr 3 2018, 12:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 7528

mercurial/debugcommands.py

def debugindex(ui, repo, file_=None, **opts): def debugindex(ui, repo, file_=None, **opts):
"""dump the contents of an index file""" """dump the contents of an index file"""
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
r = cmdutil.openrevlog(repo, 'debugindex', file_, opts) r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
format = opts.get('format', 0) format = opts.get('format', 0)
if format not in (0, 1): if format not in (0, 1):
raise error.Abort(_("unknown format %d") % format) raise error.Abort(_("unknown format %d") % format)
generaldelta = r.version & revlog.FLAG_GENERALDELTA
if generaldelta:
basehdr = ' delta'
else:
basehdr = ' base'
if ui.debugflag: if ui.debugflag:
shortfn = hex shortfn = hex
else: else:
shortfn = short shortfn = short
# There might not be anything in r, so have a sane default # There might not be anything in r, so have a sane default
idlen = 12 idlen = 12
for i in r: for i in r:
idlen = len(shortfn(r.node(i))) idlen = len(shortfn(r.node(i)))
break break
if format == 0: if format == 0:
ui.write((" rev offset length " + basehdr + " linkrev" ui.write((" rev offset length linkrev"
" %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen))) " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
elif format == 1: elif format == 1:
ui.write((" rev flag offset length" ui.write((" rev flag offset length size link p1 p2"
" size " + basehdr + " link p1 p2"
" %s\n") % "nodeid".rjust(idlen)) " %s\n") % "nodeid".rjust(idlen))
for i in r: for i in r:
node = r.node(i) node = r.node(i)
if generaldelta:
base = r.deltaparent(i)
else:
base = r.chainbase(i)
if format == 0: if format == 0:
try: try:
pp = r.parents(node) pp = r.parents(node)
except Exception: except Exception:
pp = [nullid, nullid] pp = [nullid, nullid]
ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( ui.write("% 6d % 9d % 7d % 7d %s %s %s\n" % (
i, r.start(i), r.length(i), base, r.linkrev(i), i, r.start(i), r.length(i), r.linkrev(i),
shortfn(node), shortfn(pp[0]), shortfn(pp[1]))) shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
elif format == 1: elif format == 1:
pr = r.parentrevs(i) pr = r.parentrevs(i)
ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % ( ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d %s\n" % (
i, r.flags(i), r.start(i), r.length(i), r.rawsize(i), i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
base, r.linkrev(i), pr[0], pr[1], shortfn(node))) r.linkrev(i), pr[0], pr[1], shortfn(node)))
@command('debugindexdot', cmdutil.debugrevlogopts, @command('debugindexdot', cmdutil.debugrevlogopts,
_('-c|-m|FILE'), optionalrepo=True) _('-c|-m|FILE'), optionalrepo=True)
def debugindexdot(ui, repo, file_=None, **opts): def debugindexdot(ui, repo, file_=None, **opts):
"""dump an index DAG as a graphviz dot file""" """dump an index DAG as a graphviz dot file"""
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts) r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
ui.write(("digraph G {\n")) ui.write(("digraph G {\n"))

tests/test-changelog-exec.t

date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
files: foo files: foo
description: description:
merge merge
$ hg debugindex bar $ hg debugindex bar
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 5 ..... 1 b004912a8510 000000000000 000000000000 (re) 0 0 5 1 b004912a8510 000000000000 000000000000
$ cd .. $ cd ..

tests/test-clone-r.t

$ hg update -C 3 $ hg update -C 3
1 files updated, 0 files merged, 2 files removed, 0 files unresolved 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg mv afile anotherfile $ hg mv afile anotherfile
$ hg commit -m "0.3m" $ hg commit -m "0.3m"
$ hg debugindex -f 1 afile $ hg debugindex -f 1 afile
rev flag offset length size ..... link p1 p2 nodeid (re) rev flag offset length size link p1 p2 nodeid
0 0000 0 3 2 ..... 0 -1 -1 362fef284ce2 (re) 0 0000 0 3 2 0 -1 -1 362fef284ce2
1 0000 3 5 4 ..... 1 0 -1 125144f7e028 (re) 1 0000 3 5 4 1 0 -1 125144f7e028
2 0000 8 7 6 ..... 2 1 -1 4c982badb186 (re) 2 0000 8 7 6 2 1 -1 4c982badb186
3 0000 15 9 8 ..... 3 2 -1 19b1fc555737 (re) 3 0000 15 9 8 3 2 -1 19b1fc555737
$ hg debugindex adifferentfile $ hg debugindex adifferentfile
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 75 ..... 7 2565f3199a74 000000000000 000000000000 (re) 0 0 75 7 2565f3199a74 000000000000 000000000000
$ hg debugindex anotherfile $ hg debugindex anotherfile
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 75 ..... 8 2565f3199a74 000000000000 000000000000 (re) 0 0 75 8 2565f3199a74 000000000000 000000000000
$ hg debugindex fred $ hg debugindex fred
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 8 ..... 6 12ab3bcc5ea4 000000000000 000000000000 (re) 0 0 8 6 12ab3bcc5ea4 000000000000 000000000000
$ hg debugindex --manifest $ hg debugindex --manifest
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 48 ..... 0 43eadb1d2d06 000000000000 000000000000 (re) 0 0 48 0 43eadb1d2d06 000000000000 000000000000
1 48 48 ..... 1 8b89697eba2c 43eadb1d2d06 000000000000 (re) 1 48 48 1 8b89697eba2c 43eadb1d2d06 000000000000
2 96 48 ..... 2 626a32663c2f 8b89697eba2c 000000000000 (re) 2 96 48 2 626a32663c2f 8b89697eba2c 000000000000
3 144 48 ..... 3 f54c32f13478 626a32663c2f 000000000000 (re) 3 144 48 3 f54c32f13478 626a32663c2f 000000000000
4 192 .. ..... 6 de68e904d169 626a32663c2f 000000000000 (re) 4 192 .. 6 de68e904d169 626a32663c2f 000000000000 (re)
5 2.. .. ..... 7 09bb521d218d de68e904d169 000000000000 (re) 5 2.. .. 7 09bb521d218d de68e904d169 000000000000 (re)
6 3.. 54 ..... 8 1fde233dfb0f f54c32f13478 000000000000 (re) 6 3.. 54 8 1fde233dfb0f f54c32f13478 000000000000 (re)
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
4 files, 9 changesets, 7 total revisions 4 files, 9 changesets, 7 total revisions

tests/test-commit-amend.t

$ hg status -C --rev 2 $ hg status -C --rev 2
A newdirname/commonfile.py A newdirname/commonfile.py
olddirname/commonfile.py olddirname/commonfile.py
A newdirname/newfile.py A newdirname/newfile.py
olddirname/newfile.py olddirname/newfile.py
R olddirname/commonfile.py R olddirname/commonfile.py
R olddirname/newfile.py R olddirname/newfile.py
$ hg debugindex newdirname/newfile.py $ hg debugindex newdirname/newfile.py
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 89 -1 3 34a4d536c0c0 000000000000 000000000000 0 0 89 3 34a4d536c0c0 000000000000 000000000000
$ echo a >> newdirname/commonfile.py $ echo a >> newdirname/commonfile.py
$ hg ci --amend -m bug $ hg ci --amend -m bug
$ hg debugrename newdirname/newfile.py $ hg debugrename newdirname/newfile.py
newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def
$ hg debugindex newdirname/newfile.py $ hg debugindex newdirname/newfile.py
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 89 -1 3 34a4d536c0c0 000000000000 000000000000 0 0 89 3 34a4d536c0c0 000000000000 000000000000
#if execbit #if execbit
Test if amend preserves executable bit changes Test if amend preserves executable bit changes
$ chmod +x newdirname/commonfile.py $ chmod +x newdirname/commonfile.py
$ hg ci -m chmod $ hg ci -m chmod
$ hg ci --amend -m "chmod amended" $ hg ci --amend -m "chmod amended"
$ hg ci --amend -m "chmod amended second time" $ hg ci --amend -m "chmod amended second time"

tests/test-commit.t

$ hg cp bar foo $ hg cp bar foo
$ echo >> bar $ echo >> bar
$ hg ci -m 'cp bar foo; change bar' $ hg ci -m 'cp bar foo; change bar'
$ hg debugrename foo $ hg debugrename foo
foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9 foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9
$ hg debugindex bar $ hg debugindex bar
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 6 ..... 0 26d3ca0dfd18 000000000000 000000000000 (re) 0 0 6 0 26d3ca0dfd18 000000000000 000000000000
1 6 7 ..... 1 d267bddd54f7 26d3ca0dfd18 000000000000 (re) 1 6 7 1 d267bddd54f7 26d3ca0dfd18 000000000000
Test making empty commits Test making empty commits
$ hg commit --config ui.allowemptycommit=True -m "empty commit" $ hg commit --config ui.allowemptycommit=True -m "empty commit"
$ hg log -r . -v --stat $ hg log -r . -v --stat
changeset: 2:d809f3644287 changeset: 2:d809f3644287
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000

tests/test-copy.t

user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: 1 summary: 1
this should show a revision linked to changeset 0 this should show a revision linked to changeset 0
$ hg debugindex a $ hg debugindex a
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 ..... 0 b789fdd96dc2 000000000000 000000000000 (re) 0 0 3 0 b789fdd96dc2 000000000000 000000000000
we should see one log entry for b we should see one log entry for b
$ hg log b $ hg log b
changeset: 1:93580a2c28a5 changeset: 1:93580a2c28a5
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: 2 summary: 2
this should show a revision linked to changeset 1 this should show a revision linked to changeset 1
$ hg debugindex b $ hg debugindex b
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 65 ..... 1 37d9b5d994ea 000000000000 000000000000 (re) 0 0 65 1 37d9b5d994ea 000000000000 000000000000
this should show the rename information in the metadata this should show the rename information in the metadata
$ hg debugdata b 0 | head -3 | tail -2 $ hg debugdata b 0 | head -3 | tail -2
copy: a copy: a
copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
$ md5sum.py .hg/store/data/b.i $ md5sum.py .hg/store/data/b.i
foo foo
shouldn't show copy shouldn't show copy
$ hg commit -m2 $ hg commit -m2
$ hg st -C $ hg st -C
should match should match
$ hg debugindex foo $ hg debugindex foo
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re) 0 0 5 0 2ed2a3912a0b 000000000000 000000000000
$ hg debugrename bar $ hg debugrename bar
bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
$ echo bleah > foo $ echo bleah > foo
$ echo quux > bar $ echo quux > bar
$ hg commit -m3 $ hg commit -m3
should not be renamed should not be renamed
The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
M bar M bar
foo foo
$ hg commit -m3 $ hg commit -m3
should show no parents for tip should show no parents for tip
$ hg debugindex bar $ hg debugindex bar
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 69 ..... 1 7711d36246cc 000000000000 000000000000 (re) 0 0 69 1 7711d36246cc 000000000000 000000000000
1 69 6 ..... 2 bdf70a2b8d03 7711d36246cc 000000000000 (re) 1 69 6 2 bdf70a2b8d03 7711d36246cc 000000000000
2 75 71 ..... 3 b2558327ea8d 000000000000 000000000000 (re) 2 75 71 3 b2558327ea8d 000000000000 000000000000
should match should match
$ hg debugindex foo $ hg debugindex foo
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re) 0 0 5 0 2ed2a3912a0b 000000000000 000000000000
1 5 7 ..... 2 dd12c926cf16 2ed2a3912a0b 000000000000 (re) 1 5 7 2 dd12c926cf16 2ed2a3912a0b 000000000000
$ hg debugrename bar $ hg debugrename bar
bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17 bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
should show no copies should show no copies
$ hg st -C $ hg st -C
copy --after on an added file copy --after on an added file
$ cp bar baz $ cp bar baz

tests/test-debugcommands.t

compression ratio : 0 compression ratio : 0
uncompressed data size (min/max/avg) : 43 / 43 / 43 uncompressed data size (min/max/avg) : 43 / 43 / 43
full revision size (min/max/avg) : 44 / 44 / 44 full revision size (min/max/avg) : 44 / 44 / 44
delta size (min/max/avg) : 0 / 0 / 0 delta size (min/max/avg) : 0 / 0 / 0
Test debugindex, with and without the --debug flag Test debugindex, with and without the --debug flag
$ hg debugindex a $ hg debugindex a
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 .... 0 b789fdd96dc2 000000000000 000000000000 (re) 0 0 3 0 b789fdd96dc2 000000000000 000000000000
$ hg --debug debugindex a $ hg --debug debugindex a
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 .... 0 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 (re) 0 0 3 0 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
$ hg debugindex -f 1 a $ hg debugindex -f 1 a
rev flag offset length size ..... link p1 p2 nodeid (re) rev flag offset length size link p1 p2 nodeid
0 0000 0 3 2 .... 0 -1 -1 b789fdd96dc2 (re) 0 0000 0 3 2 0 -1 -1 b789fdd96dc2
$ hg --debug debugindex -f 1 a $ hg --debug debugindex -f 1 a
rev flag offset length size ..... link p1 p2 nodeid (re) rev flag offset length size link p1 p2 nodeid
0 0000 0 3 2 .... 0 -1 -1 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 (re) 0 0000 0 3 2 0 -1 -1 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
debugdelta chain basic output debugdelta chain basic output
$ hg debugdeltachain -m $ hg debugdeltachain -m
rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
0 1 1 -1 base 44 43 44 1.02326 44 0 0.00000 0 1 1 -1 base 44 43 44 1.02326 44 0 0.00000
$ hg debugdeltachain -m -T '{rev} {chainid} {chainlen}\n' $ hg debugdeltachain -m -T '{rev} {chainid} {chainlen}\n'

tests/test-excessive-merge.t

summary: branch a summary: branch a
changeset: 0:5e0375449e74 changeset: 0:5e0375449e74
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: test summary: test
$ hg debugindex --changelog $ hg debugindex --changelog
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 60 ..... 0 5e0375449e74 000000000000 000000000000 (re) 0 0 60 0 5e0375449e74 000000000000 000000000000
1 60 62 ..... 1 96155394af80 5e0375449e74 000000000000 (re) 1 60 62 1 96155394af80 5e0375449e74 000000000000
2 122 62 ..... 2 92cc4c306b19 5e0375449e74 000000000000 (re) 2 122 62 2 92cc4c306b19 5e0375449e74 000000000000
3 184 69 ..... 3 e16a66a37edd 92cc4c306b19 96155394af80 (re) 3 184 69 3 e16a66a37edd 92cc4c306b19 96155394af80
4 253 69 ..... 4 2ee31f665a86 96155394af80 92cc4c306b19 (re) 4 253 69 4 2ee31f665a86 96155394af80 92cc4c306b19
revision 1 revision 1
$ hg manifest --debug 1 $ hg manifest --debug 1
79d7492df40aa0fa093ec4209be78043c181f094 644 a 79d7492df40aa0fa093ec4209be78043c181f094 644 a
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b
revision 2 revision 2
$ hg manifest --debug 2 $ hg manifest --debug 2
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b 79d7492df40aa0fa093ec4209be78043c181f094 644 b
revision 3 revision 3
$ hg manifest --debug 3 $ hg manifest --debug 3
79d7492df40aa0fa093ec4209be78043c181f094 644 a 79d7492df40aa0fa093ec4209be78043c181f094 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b 79d7492df40aa0fa093ec4209be78043c181f094 644 b
revision 4 revision 4
$ hg manifest --debug 4 $ hg manifest --debug 4
79d7492df40aa0fa093ec4209be78043c181f094 644 a 79d7492df40aa0fa093ec4209be78043c181f094 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b 79d7492df40aa0fa093ec4209be78043c181f094 644 b
$ hg debugindex a $ hg debugindex a
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re) 0 0 5 0 2ed2a3912a0b 000000000000 000000000000
1 5 6 ..... 1 79d7492df40a 2ed2a3912a0b 000000000000 (re) 1 5 6 1 79d7492df40a 2ed2a3912a0b 000000000000
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
2 files, 5 changesets, 4 total revisions 2 files, 5 changesets, 4 total revisions

tests/test-extra-filelog-entry.t

adding b adding b
$ echo cc > b $ echo cc > b
$ hg qnew -f foo.diff $ hg qnew -f foo.diff
$ echo b > b $ echo b > b
$ hg qrefresh $ hg qrefresh
$ hg debugindex b $ hg debugindex b
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 ..... 0 1e88685f5dde 000000000000 000000000000 (re) 0 0 3 0 1e88685f5dde 000000000000 000000000000

tests/test-filebranch.t

$ echo 2b > baz $ echo 2b > baz
$ echo new > quux $ echo new > quux
$ hg ci -m "merge" $ hg ci -m "merge"
main: we should have a merge here: main: we should have a merge here:
$ hg debugindex --changelog $ hg debugindex --changelog
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 73 ..... 0 cdca01651b96 000000000000 000000000000 (re) 0 0 73 0 cdca01651b96 000000000000 000000000000
1 73 68 ..... 1 f6718a9cb7f3 cdca01651b96 000000000000 (re) 1 73 68 1 f6718a9cb7f3 cdca01651b96 000000000000
2 141 68 ..... 2 bdd988058d16 cdca01651b96 000000000000 (re) 2 141 68 2 bdd988058d16 cdca01651b96 000000000000
3 209 66 ..... 3 d8a521142a3c f6718a9cb7f3 bdd988058d16 (re) 3 209 66 3 d8a521142a3c f6718a9cb7f3 bdd988058d16
log should show foo and quux changed: log should show foo and quux changed:
$ hg log -v -r tip $ hg log -v -r tip
changeset: 3:d8a521142a3c changeset: 3:d8a521142a3c
tag: tip tag: tip
parent: 1:f6718a9cb7f3 parent: 1:f6718a9cb7f3
parent: 2:bdd988058d16 parent: 2:bdd988058d16
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
files: foo quux files: foo quux
description: description:
merge merge
foo: we should have a merge here: foo: we should have a merge here:
$ hg debugindex foo $ hg debugindex foo
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) 0 0 3 0 b8e02f643373 000000000000 000000000000
1 3 4 ..... 1 2ffeddde1b65 b8e02f643373 000000000000 (re) 1 3 4 1 2ffeddde1b65 b8e02f643373 000000000000
2 7 4 ..... 2 33d1fb69067a b8e02f643373 000000000000 (re) 2 7 4 2 33d1fb69067a b8e02f643373 000000000000
3 11 4 ..... 3 aa27919ee430 2ffeddde1b65 33d1fb69067a (re) 3 11 4 3 aa27919ee430 2ffeddde1b65 33d1fb69067a
bar: we should not have a merge here: bar: we should not have a merge here:
$ hg debugindex bar $ hg debugindex bar
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) 0 0 3 0 b8e02f643373 000000000000 000000000000
1 3 4 ..... 2 33d1fb69067a b8e02f643373 000000000000 (re) 1 3 4 2 33d1fb69067a b8e02f643373 000000000000
baz: we should not have a merge here: baz: we should not have a merge here:
$ hg debugindex baz $ hg debugindex baz
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) 0 0 3 0 b8e02f643373 000000000000 000000000000
1 3 4 ..... 1 2ffeddde1b65 b8e02f643373 000000000000 (re) 1 3 4 1 2ffeddde1b65 b8e02f643373 000000000000
quux: we should not have a merge here: quux: we should not have a merge here:
$ hg debugindex quux $ hg debugindex quux
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) 0 0 3 0 b8e02f643373 000000000000 000000000000
1 3 5 ..... 3 6128c0f33108 b8e02f643373 000000000000 (re) 1 3 5 3 6128c0f33108 b8e02f643373 000000000000
Manifest entries should match tips of all files: Manifest entries should match tips of all files:
$ hg manifest --debug $ hg manifest --debug
33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644 bar 33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644 bar
2ffeddde1b65b4827f6746174a145474129fa2ce 644 baz 2ffeddde1b65b4827f6746174a145474129fa2ce 644 baz
aa27919ee4303cfd575e1fb932dd64d75aa08be4 644 foo aa27919ee4303cfd575e1fb932dd64d75aa08be4 644 foo
6128c0f33108e8cfbb4e0824d13ae48b466d7280 644 quux 6128c0f33108e8cfbb4e0824d13ae48b466d7280 644 quux

tests/test-flags.t

$ ls -l ../test[123]/a > foo $ ls -l ../test[123]/a > foo
$ cut -b 1-10 < foo $ cut -b 1-10 < foo
-rwxr-x--- -rwxr-x---
-rwxr-x--- -rwxr-x---
-rwxr-x--- -rwxr-x---
$ hg debugindex a $ hg debugindex a
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) 0 0 0 0 b80de5d13875 000000000000 000000000000
$ hg debugindex -R ../test2 a $ hg debugindex -R ../test2 a
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) 0 0 0 0 b80de5d13875 000000000000 000000000000
$ hg debugindex -R ../test1 a $ hg debugindex -R ../test1 a
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) 0 0 0 0 b80de5d13875 000000000000 000000000000
1 0 5 ..... 1 7fe919cc0336 b80de5d13875 000000000000 (re) 1 0 5 1 7fe919cc0336 b80de5d13875 000000000000
$ cd .. $ cd ..

tests/test-issue522.t

M foo M foo
$ hg ci -m 'merge' $ hg ci -m 'merge'
$ hg manifest --debug | grep foo $ hg manifest --debug | grep foo
c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo
$ hg debugindex foo $ hg debugindex foo
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re) 0 0 5 0 2ed2a3912a0b 000000000000 000000000000
1 5 9 ..... 1 6f4310b00b9a 2ed2a3912a0b 000000000000 (re) 1 5 9 1 6f4310b00b9a 2ed2a3912a0b 000000000000
2 14 5 ..... 2 c6fc755d7e68 6f4310b00b9a 000000000000 (re) 2 14 5 2 c6fc755d7e68 6f4310b00b9a 000000000000

tests/test-merge-commit.t

$ cat bar $ cat bar
line0 line0
line1 line1
line2 line2
$ hg ci -m '3: merge with local rename' $ hg ci -m '3: merge with local rename'
$ hg debugindex bar $ hg debugindex bar
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) 0 0 77 2 d35118874825 000000000000 000000000000
1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) 1 77 76 3 5345f5ab8abd 000000000000 d35118874825
$ hg debugrename bar $ hg debugrename bar
bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
$ hg debugindex foo $ hg debugindex foo
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re) 0 0 7 0 690b295714ae 000000000000 000000000000
1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re) 1 7 13 1 9e25c27b8757 690b295714ae 000000000000
Revert the content change from rev 2: Revert the content change from rev 2:
$ hg up -C 2 $ hg up -C 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm bar $ rm bar
$ echo line1 > bar $ echo line1 > bar
$ cat bar $ cat bar
line1 line1
line2 line2
$ hg ci -m '5: merge' $ hg ci -m '5: merge'
$ hg debugindex bar $ hg debugindex bar
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) 0 0 77 2 d35118874825 000000000000 000000000000
1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) 1 77 76 3 5345f5ab8abd 000000000000 d35118874825
2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re) 2 153 7 4 ff4b45017382 d35118874825 000000000000
3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re) 3 160 13 5 3701b4893544 ff4b45017382 5345f5ab8abd
Same thing, but with the merge on 3 having the rename Same thing, but with the merge on 3 having the rename
on the remote parent: on the remote parent:
$ cd .. $ cd ..
$ hg clone -U -r 1 -r 2 a b $ hg clone -U -r 1 -r 2 a b
adding changesets adding changesets
$ cat bar $ cat bar
line0 line0
line1 line1
line2 line2
$ hg ci -m '3: merge with remote rename' $ hg ci -m '3: merge with remote rename'
$ hg debugindex bar $ hg debugindex bar
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) 0 0 77 2 d35118874825 000000000000 000000000000
1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) 1 77 76 3 5345f5ab8abd 000000000000 d35118874825
$ hg debugrename bar $ hg debugrename bar
bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
$ hg debugindex foo $ hg debugindex foo
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re) 0 0 7 0 690b295714ae 000000000000 000000000000
1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re) 1 7 13 1 9e25c27b8757 690b295714ae 000000000000
Revert the content change from rev 2: Revert the content change from rev 2:
$ hg up -C 2 $ hg up -C 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm bar $ rm bar
$ echo line1 > bar $ echo line1 > bar
$ cat bar $ cat bar
line1 line1
line2 line2
$ hg ci -m '5: merge' $ hg ci -m '5: merge'
$ hg debugindex bar $ hg debugindex bar
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) 0 0 77 2 d35118874825 000000000000 000000000000
1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) 1 77 76 3 5345f5ab8abd 000000000000 d35118874825
2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re) 2 153 7 4 ff4b45017382 d35118874825 000000000000
3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re) 3 160 13 5 3701b4893544 ff4b45017382 5345f5ab8abd
$ cd .. $ cd ..

tests/test-merge7.t

<<<<<<< working copy: 50c3a7e29886 - test: Merge 1 <<<<<<< working copy: 50c3a7e29886 - test: Merge 1
two-point-five two-point-five
======= =======
two-point-one two-point-one
>>>>>>> merge rev: 40d11a4173a8 - test: two -> two-point-one >>>>>>> merge rev: 40d11a4173a8 - test: two -> two-point-one
three three
$ hg debugindex test.txt $ hg debugindex test.txt
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 7 ..... 0 01365c4cca56 000000000000 000000000000 (re) 0 0 7 0 01365c4cca56 000000000000 000000000000
1 7 9 ..... 1 7b013192566a 01365c4cca56 000000000000 (re) 1 7 9 1 7b013192566a 01365c4cca56 000000000000
2 16 15 ..... 2 8fe46a3eb557 01365c4cca56 000000000000 (re) 2 16 15 2 8fe46a3eb557 01365c4cca56 000000000000
3 31 2. ..... 3 fc3148072371 7b013192566a 8fe46a3eb557 (re) 3 31 2. 3 fc3148072371 7b013192566a 8fe46a3eb557 (re)
4 5. 25 ..... 4 d40249267ae3 8fe46a3eb557 000000000000 (re) 4 5. 25 4 d40249267ae3 8fe46a3eb557 000000000000 (re)
$ hg log $ hg log
changeset: 4:40d11a4173a8 changeset: 4:40d11a4173a8
tag: tip tag: tip
parent: 2:96b70246a118 parent: 2:96b70246a118
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: two -> two-point-one summary: two -> two-point-one

tests/test-narrow-debugcommands.t

$ echo narrowhg-experimental >> .hg/requires $ echo narrowhg-experimental >> .hg/requires
$ mkdir -p foo/bar $ mkdir -p foo/bar
$ echo b > foo/f $ echo b > foo/f
$ echo c > foo/bar/f $ echo c > foo/bar/f
$ hg commit -Am hi $ hg commit -Am hi
adding foo/bar/f adding foo/bar/f
adding foo/f adding foo/f
$ hg debugindex -m $ hg debugindex -m
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 47 -1 0 14a5d056d75a 000000000000 000000000000 0 0 47 0 14a5d056d75a 000000000000 000000000000
$ hg debugindex --dir foo $ hg debugindex --dir foo
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 77 -1 0 e635c7857aef 000000000000 000000000000 0 0 77 0 e635c7857aef 000000000000 000000000000
$ hg debugindex --dir foo/ $ hg debugindex --dir foo/
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 77 -1 0 e635c7857aef 000000000000 000000000000 0 0 77 0 e635c7857aef 000000000000 000000000000
$ hg debugindex --dir foo/bar $ hg debugindex --dir foo/bar
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 44 -1 0 e091d4224761 000000000000 000000000000 0 0 44 0 e091d4224761 000000000000 000000000000
$ hg debugindex --dir foo/bar/ $ hg debugindex --dir foo/bar/
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 44 -1 0 e091d4224761 000000000000 000000000000 0 0 44 0 e091d4224761 000000000000 000000000000
$ hg debugdata -m 0 $ hg debugdata -m 0
foo\x00e635c7857aef92ac761ce5741a99da159abbbb24t (esc) foo\x00e635c7857aef92ac761ce5741a99da159abbbb24t (esc)
$ hg debugdata --dir foo 0 $ hg debugdata --dir foo 0
bar\x00e091d42247613adff5d41b67f15fe7189ee97b39t (esc) bar\x00e091d42247613adff5d41b67f15fe7189ee97b39t (esc)
f\x001e88685f5ddec574a34c70af492f95b6debc8741 (esc) f\x001e88685f5ddec574a34c70af492f95b6debc8741 (esc)
$ hg debugdata --dir foo/ 0 $ hg debugdata --dir foo/ 0
bar\x00e091d42247613adff5d41b67f15fe7189ee97b39t (esc) bar\x00e091d42247613adff5d41b67f15fe7189ee97b39t (esc)
f\x001e88685f5ddec574a34c70af492f95b6debc8741 (esc) f\x001e88685f5ddec574a34c70af492f95b6debc8741 (esc)
$ hg debugdata --dir foo/bar 0 $ hg debugdata --dir foo/bar 0
f\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc) f\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)
$ hg debugdata --dir foo/bar/ 0 $ hg debugdata --dir foo/bar/ 0
f\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc) f\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)

tests/test-narrow-update.t

adding manifests adding manifests
adding file changes adding file changes
added 4 changesets with 2 changes to 1 files added 4 changesets with 2 changes to 1 files
new changesets *:* (glob) new changesets *:* (glob)
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow $ cd narrow
$ hg debugindex -c $ hg debugindex -c
rev offset length base linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 64 0 0 9958b1af2add 000000000000 000000000000 0 0 64 0 9958b1af2add 000000000000 000000000000
1 64 81 1 1 2db4ce2a3bfe 9958b1af2add 000000000000 1 64 81 1 2db4ce2a3bfe 9958b1af2add 000000000000
2 145 75 2 2 0980ee31a742 2db4ce2a3bfe 000000000000 2 145 75 2 0980ee31a742 2db4ce2a3bfe 000000000000
3 220 (76|77) 3 3 4410145019b7 0980ee31a742 000000000000 (re) 3 220 (76|77) 3 4410145019b7 0980ee31a742 000000000000 (re)
$ hg update -q 0 $ hg update -q 0
Can update to revision with changes inside Can update to revision with changes inside
$ hg update -q 'desc("add inside and outside")' $ hg update -q 'desc("add inside and outside")'
$ hg update -q 'desc("modify inside")' $ hg update -q 'desc("modify inside")'
$ find * $ find *

tests/test-parseindex.t

> data = open("limit/.hg/store/00changelog.i", "rb").read() > data = open("limit/.hg/store/00changelog.i", "rb").read()
> for n, p in [('limit', '\0\0\0\x02'), ('segv', '\0\x01\0\0')]: > for n, p in [('limit', '\0\0\0\x02'), ('segv', '\0\x01\0\0')]:
> # corrupt p1 at rev0 and p2 at rev1 > # corrupt p1 at rev0 and p2 at rev1
> d = data[:24] + p + data[28:127 + 28] + p + data[127 + 32:] > d = data[:24] + p + data[28:127 + 28] + p + data[127 + 32:]
> open(n + "/.hg/store/00changelog.i", "wb").write(d) > open(n + "/.hg/store/00changelog.i", "wb").write(d)
> EOF > EOF
$ hg -R limit debugindex -f1 -c $ hg -R limit debugindex -f1 -c
rev flag offset length size base link p1 p2 nodeid rev flag offset length size link p1 p2 nodeid
0 0000 0 63 62 0 0 2 -1 7c31755bf9b5 0 0000 0 63 62 0 2 -1 7c31755bf9b5
1 0000 63 66 65 1 1 0 2 26333235a41c 1 0000 63 66 65 1 0 2 26333235a41c
$ hg -R limit debugdeltachain -c $ hg -R limit debugdeltachain -c
rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
0 1 1 -1 base 63 62 63 1.01613 63 0 0.00000 0 1 1 -1 base 63 62 63 1.01613 63 0 0.00000
1 2 1 -1 base 66 65 66 1.01538 66 0 0.00000 1 2 1 -1 base 66 65 66 1.01538 66 0 0.00000
$ hg -R segv debugindex -f1 -c $ hg -R segv debugindex -f1 -c
rev flag offset length size base link p1 p2 nodeid rev flag offset length size link p1 p2 nodeid
0 0000 0 63 62 0 0 65536 -1 7c31755bf9b5 0 0000 0 63 62 0 65536 -1 7c31755bf9b5
1 0000 63 66 65 1 1 0 65536 26333235a41c 1 0000 63 66 65 1 0 65536 26333235a41c
$ hg -R segv debugdeltachain -c $ hg -R segv debugdeltachain -c
rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
0 1 1 -1 base 63 62 63 1.01613 63 0 0.00000 0 1 1 -1 base 63 62 63 1.01613 63 0 0.00000
1 2 1 -1 base 66 65 66 1.01538 66 0 0.00000 1 2 1 -1 base 66 65 66 1.01538 66 0 0.00000
$ cat <<EOF > test.py $ cat <<EOF > test.py
> import sys > import sys

tests/test-rename-merge1.t

C c2 C c2
$ cat b $ cat b
blahblah blahblah
$ hg ci -m "merge" $ hg ci -m "merge"
$ hg debugindex b $ hg debugindex b
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 67 ..... 1 57eacc201a7f 000000000000 000000000000 (re) 0 0 67 1 57eacc201a7f 000000000000 000000000000
1 67 72 ..... 3 4727ba907962 000000000000 57eacc201a7f (re) 1 67 72 3 4727ba907962 000000000000 57eacc201a7f
$ hg debugrename b $ hg debugrename b
b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66
This used to trigger a "divergent renames" warning, despite no renames This used to trigger a "divergent renames" warning, despite no renames
$ hg cp b b3 $ hg cp b b3
$ hg cp b b4 $ hg cp b b4

tests/test-revlog-packentry.t

this should be stored as a delta against rev 0 this should be stored as a delta against rev 0
$ echo foo bar baz > foo $ echo foo bar baz > foo
$ hg ci -Am 'add foo again' $ hg ci -Am 'add foo again'
adding foo adding foo
created new head created new head
$ hg debugindex foo $ hg debugindex foo
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) 0 0 0 0 b80de5d13875 000000000000 000000000000
1 0 13 ..... 1 0376abec49b8 000000000000 000000000000 (re) 1 0 13 1 0376abec49b8 000000000000 000000000000
$ cd .. $ cd ..

tests/test-revlog.t

$ hg init $ hg init
>>> open("a.i", "wb").write( >>> open("a.i", "wb").write(
... b"""eJxjYGZgZIAAYQYGxhgom+k/FMx8YKx9ZUaKSOyqo4cnuKb8mbqHV5cBCVTMWb1Cwqkhe4Gsg9AD ... b"""eJxjYGZgZIAAYQYGxhgom+k/FMx8YKx9ZUaKSOyqo4cnuKb8mbqHV5cBCVTMWb1Cwqkhe4Gsg9AD
... Joa3dYtcYYYBAQ8Qr4OqZAYRICPTSr5WKd/42rV36d+8/VmrNpv7NP1jQAXrQE4BqQUARngwVA==""" ... Joa3dYtcYYYBAQ8Qr4OqZAYRICPTSr5WKd/42rV36d+8/VmrNpv7NP1jQAXrQE4BqQUARngwVA=="""
... .decode("base64").decode("zlib")) ... .decode("base64").decode("zlib"))
$ hg debugindex a.i $ hg debugindex a.i
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 19 -1 2 99e0332bd498 000000000000 000000000000 0 0 19 2 99e0332bd498 000000000000 000000000000
1 19 12 0 3 6674f57a23d8 99e0332bd498 000000000000 1 19 12 3 6674f57a23d8 99e0332bd498 000000000000
$ hg debugdata a.i 1 2>&1 | egrep 'Error:.*decoded' $ hg debugdata a.i 1 2>&1 | egrep 'Error:.*decoded'
(mercurial\.\w+\.mpatch\.)?mpatchError: patch cannot be decoded (re) (mercurial\.\w+\.mpatch\.)?mpatchError: patch cannot be decoded (re)

tests/test-strip-cross.t

$ commit '201 210' '021 120' '012 102' $ commit '201 210' '021 120' '012 102'
$ HGUSER=another-user; export HGUSER $ HGUSER=another-user; export HGUSER
$ commit 'manifest-file' $ commit 'manifest-file'
$ commit '012' 'manifest-file' $ commit '012' 'manifest-file'
$ cd .. $ cd ..
$ hg clone -q -U -r -1 -r -2 -r -3 -r -4 -r -6 orig crossed $ hg clone -q -U -r -1 -r -2 -r -3 -r -4 -r -6 orig crossed
$ cd crossed $ cd crossed
$ hg debugindex --manifest $ hg debugindex --manifest
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 112 ..... 0 6f105cbb914d 000000000000 000000000000 (re) 0 0 112 0 6f105cbb914d 000000000000 000000000000
1 112 56 ..... 3 1b55917b3699 000000000000 000000000000 (re) 1 112 56 3 1b55917b3699 000000000000 000000000000
2 168 123 ..... 1 8f3d04e263e5 000000000000 000000000000 (re) 2 168 123 1 8f3d04e263e5 000000000000 000000000000
3 291 122 ..... 2 f0ef8726ac4f 000000000000 000000000000 (re) 3 291 122 2 f0ef8726ac4f 000000000000 000000000000
4 413 87 ..... 4 0b76e38b4070 000000000000 000000000000 (re) 4 413 87 4 0b76e38b4070 000000000000 000000000000
$ for i in 012 021 102 120 201 210 manifest-file; do $ for i in 012 021 102 120 201 210 manifest-file; do
> echo $i > echo $i
> hg debugindex $i > hg debugindex $i
> echo > echo
> done > done
012 012
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) 0 0 3 0 b8e02f643373 000000000000 000000000000
1 3 3 ..... 1 5d9299349fc0 000000000000 000000000000 (re) 1 3 3 1 5d9299349fc0 000000000000 000000000000
2 6 3 ..... 2 2661d26c6496 000000000000 000000000000 (re) 2 6 3 2 2661d26c6496 000000000000 000000000000
021 021
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) 0 0 3 0 b8e02f643373 000000000000 000000000000
1 3 3 ..... 2 5d9299349fc0 000000000000 000000000000 (re) 1 3 3 2 5d9299349fc0 000000000000 000000000000
2 6 3 ..... 1 2661d26c6496 000000000000 000000000000 (re) 2 6 3 1 2661d26c6496 000000000000 000000000000
102 102
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 ..... 1 b8e02f643373 000000000000 000000000000 (re) 0 0 3 1 b8e02f643373 000000000000 000000000000
1 3 3 ..... 0 5d9299349fc0 000000000000 000000000000 (re) 1 3 3 0 5d9299349fc0 000000000000 000000000000
2 6 3 ..... 2 2661d26c6496 000000000000 000000000000 (re) 2 6 3 2 2661d26c6496 000000000000 000000000000
120 120
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 ..... 1 b8e02f643373 000000000000 000000000000 (re) 0 0 3 1 b8e02f643373 000000000000 000000000000
1 3 3 ..... 2 5d9299349fc0 000000000000 000000000000 (re) 1 3 3 2 5d9299349fc0 000000000000 000000000000
2 6 3 ..... 0 2661d26c6496 000000000000 000000000000 (re) 2 6 3 0 2661d26c6496 000000000000 000000000000
201 201
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 ..... 2 b8e02f643373 000000000000 000000000000 (re) 0 0 3 2 b8e02f643373 000000000000 000000000000
1 3 3 ..... 0 5d9299349fc0 000000000000 000000000000 (re) 1 3 3 0 5d9299349fc0 000000000000 000000000000
2 6 3 ..... 1 2661d26c6496 000000000000 000000000000 (re) 2 6 3 1 2661d26c6496 000000000000 000000000000
210 210
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 ..... 2 b8e02f643373 000000000000 000000000000 (re) 0 0 3 2 b8e02f643373 000000000000 000000000000
1 3 3 ..... 1 5d9299349fc0 000000000000 000000000000 (re) 1 3 3 1 5d9299349fc0 000000000000 000000000000
2 6 3 ..... 0 2661d26c6496 000000000000 000000000000 (re) 2 6 3 0 2661d26c6496 000000000000 000000000000
manifest-file manifest-file
rev offset length ..... linkrev nodeid p1 p2 (re) rev offset length linkrev nodeid p1 p2
0 0 3 ..... 3 b8e02f643373 000000000000 000000000000 (re) 0 0 3 3 b8e02f643373 000000000000 000000000000
1 3 3 ..... 4 5d9299349fc0 000000000000 000000000000 (re) 1 3 3 4 5d9299349fc0 000000000000 000000000000
$ cd .. $ cd ..
$ for i in 0 1 2 3 4; do $ for i in 0 1 2 3 4; do
> hg clone -q -U --pull crossed $i > hg clone -q -U --pull crossed $i
> echo "% Trying to strip revision $i" > echo "% Trying to strip revision $i"
> hg --cwd $i strip $i > hg --cwd $i strip $i
> echo "% Verifying" > echo "% Verifying"
> hg --cwd $i verify > hg --cwd $i verify

tests/test-treemanifest.t

1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'conflict-free merge involving dir1/' $ hg ci -m 'conflict-free merge involving dir1/'
$ cat dir1/a $ cat dir1/a
5 5
$ cat dir1/b $ cat dir1/b
6 6
$ hg debugindex --dir dir1 $ hg debugindex --dir dir1
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 54 -1 1 8b3ffd73f901 000000000000 000000000000 0 0 54 1 8b3ffd73f901 000000000000 000000000000
1 54 68 0 2 68e9d057c5a8 8b3ffd73f901 000000000000 1 54 68 2 68e9d057c5a8 8b3ffd73f901 000000000000
2 122 12 1 4 4698198d2624 68e9d057c5a8 000000000000 2 122 12 4 4698198d2624 68e9d057c5a8 000000000000
3 134 55 1 5 44844058ccce 68e9d057c5a8 000000000000 3 134 55 5 44844058ccce 68e9d057c5a8 000000000000
4 189 55 1 6 bf3d9b744927 68e9d057c5a8 000000000000 4 189 55 6 bf3d9b744927 68e9d057c5a8 000000000000
5 244 55 4 7 dde7c0af2a03 bf3d9b744927 44844058ccce 5 244 55 7 dde7c0af2a03 bf3d9b744927 44844058ccce
Merge keeping directory from parent 1 does not create revlog entry. (Note that Merge keeping directory from parent 1 does not create revlog entry. (Note that
dir1's manifest does change, but only because dir1/a's filelog changes.) dir1's manifest does change, but only because dir1/a's filelog changes.)
$ hg co 'desc("add dir2")' $ hg co 'desc("add dir2")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 8 > dir2/a $ echo 8 > dir2/a
$ hg ci -m 'modify dir2/a' $ hg ci -m 'modify dir2/a'
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'merge of flat manifests to new tree manifest' $ hg ci -m 'merge of flat manifests to new tree manifest'
created new head created new head
$ hg diff -r 3 $ hg diff -r 3
Parent of tree root manifest should be flat manifest, and two for merge Parent of tree root manifest should be flat manifest, and two for merge
$ hg debugindex -m $ hg debugindex -m
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 80 -1 0 40536115ed9e 000000000000 000000000000 0 0 80 0 40536115ed9e 000000000000 000000000000
1 80 83 0 1 f3376063c255 40536115ed9e 000000000000 1 80 83 1 f3376063c255 40536115ed9e 000000000000
2 163 89 0 2 5d9b9da231a2 40536115ed9e 000000000000 2 163 89 2 5d9b9da231a2 40536115ed9e 000000000000
3 252 83 2 3 d17d663cbd8a 5d9b9da231a2 f3376063c255 3 252 83 3 d17d663cbd8a 5d9b9da231a2 f3376063c255
4 335 124 1 4 51e32a8c60ee f3376063c255 000000000000 4 335 124 4 51e32a8c60ee f3376063c255 000000000000
5 459 126 2 5 cc5baa78b230 5d9b9da231a2 f3376063c255 5 459 126 5 cc5baa78b230 5d9b9da231a2 f3376063c255
Status across flat/tree boundary should work Status across flat/tree boundary should work
$ hg status --rev '.^' --rev . $ hg status --rev '.^' --rev .
M a M a
M dir1/a M dir1/a
M dir1/dir1/a M dir1/dir1/a
Turning off treemanifest config has no effect Turning off treemanifest config has no effect
$ hg debugindex --dir dir1 $ hg debugindex --dir dir1
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 127 -1 4 064927a0648a 000000000000 000000000000 0 0 127 4 064927a0648a 000000000000 000000000000
1 127 111 0 5 25ecb8cb8618 000000000000 000000000000 1 127 111 5 25ecb8cb8618 000000000000 000000000000
$ echo 2 > dir1/a $ echo 2 > dir1/a
$ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a' $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a'
$ hg debugindex --dir dir1 $ hg debugindex --dir dir1
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 127 -1 4 064927a0648a 000000000000 000000000000 0 0 127 4 064927a0648a 000000000000 000000000000
1 127 111 0 5 25ecb8cb8618 000000000000 000000000000 1 127 111 5 25ecb8cb8618 000000000000 000000000000
2 238 55 1 6 5b16163a30c6 25ecb8cb8618 000000000000 2 238 55 6 5b16163a30c6 25ecb8cb8618 000000000000
Stripping and recovering changes should work Stripping and recovering changes should work
$ hg st --change tip $ hg st --change tip
M dir1/a M dir1/a
$ hg --config extensions.strip= strip tip $ hg --config extensions.strip= strip tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
$ hg debugindex --dir dir1 $ hg debugindex --dir dir1
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 127 -1 4 064927a0648a 000000000000 000000000000 0 0 127 4 064927a0648a 000000000000 000000000000
1 127 111 0 5 25ecb8cb8618 000000000000 000000000000 1 127 111 5 25ecb8cb8618 000000000000 000000000000
$ hg incoming .hg/strip-backup/* $ hg incoming .hg/strip-backup/*
comparing with .hg/strip-backup/*-backup.hg (glob) comparing with .hg/strip-backup/*-backup.hg (glob)
searching for changes searching for changes
changeset: 6:51cfd7b1e13b changeset: 6:51cfd7b1e13b
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: modify dir1/a summary: modify dir1/a
$ hg pull .hg/strip-backup/* $ hg pull .hg/strip-backup/*
pulling from .hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg pulling from .hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets 51cfd7b1e13b new changesets 51cfd7b1e13b
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg --config extensions.strip= strip tip $ hg --config extensions.strip= strip tip
saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)
$ hg unbundle -q .hg/strip-backup/* $ hg unbundle -q .hg/strip-backup/*
$ hg debugindex --dir dir1 $ hg debugindex --dir dir1
rev offset length delta linkrev nodeid p1 p2 rev offset length linkrev nodeid p1 p2
0 0 127 -1 4 064927a0648a 000000000000 000000000000 0 0 127 4 064927a0648a 000000000000 000000000000
1 127 111 0 5 25ecb8cb8618 000000000000 000000000000 1 127 111 5 25ecb8cb8618 000000000000 000000000000
2 238 55 1 6 5b16163a30c6 25ecb8cb8618 000000000000 2 238 55 6 5b16163a30c6 25ecb8cb8618 000000000000
$ hg st --change tip $ hg st --change tip
M dir1/a M dir1/a
Shelving and unshelving should work Shelving and unshelving should work
$ echo foo >> dir1/a $ echo foo >> dir1/a
$ hg --config extensions.shelve= shelve $ hg --config extensions.shelve= shelve
shelved as default shelved as default