This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7845

nodemap: add basic checking of the on disk nodemap content
ClosedPublic

Authored by marmoute on Jan 13 2020, 10:07 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG20e125cdd719: nodemap: add basic checking of the on disk nodemap content
Summary

The simplest check it so verify we have all the revision we needs, and nothing
more.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Jan 13 2020, 10:07 AM
marmoute updated this revision to Diff 19299.Jan 15 2020, 9:55 AM
marmoute updated this revision to Diff 19429.Jan 17 2020, 1:06 PM
marmoute updated this revision to Diff 19761.Jan 31 2020, 10:28 AM
marmoute updated this revision to Diff 19790.Jan 31 2020, 5:59 PM
marmoute updated this revision to Diff 19834.Feb 2 2020, 3:18 AM

small doc update on .#s[1]

marmoute updated this revision to Diff 19893.Feb 4 2020, 7:24 PM

rebase to latest default

marmoute added a commit: rHG20e125cdd719: nodemap: add basic checking of the on disk nodemap content.Feb 10 2020, 8:25 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG20e125cdd719: nodemap: add basic checking of the on disk nodemap content (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 20113

mercurial/debugcommands.py

[ [
( (
b'', b'',
b'dump-new', b'dump-new',
False, False,
_(b'write a (new) persistent binary nodemap on stdin'), _(b'write a (new) persistent binary nodemap on stdin'),
), ),
(b'', b'dump-disk', False, _(b'dump on-disk data on stdin')), (b'', b'dump-disk', False, _(b'dump on-disk data on stdin')),
(
b'',
b'check',
False,
_(b'check that the data on disk data are correct.'),
),
], ],
) )
def debugnodemap(ui, repo, **opts): def debugnodemap(ui, repo, **opts):
"""write and inspect on disk nodemap """write and inspect on disk nodemap
""" """
if opts['dump_new']: if opts['dump_new']:
unfi = repo.unfiltered() unfi = repo.unfiltered()
cl = unfi.changelog cl = unfi.changelog
data = nodemap.persistent_data(cl.index) data = nodemap.persistent_data(cl.index)
ui.write(data) ui.write(data)
elif opts['dump_disk']: elif opts['dump_disk']:
unfi = repo.unfiltered() unfi = repo.unfiltered()
cl = unfi.changelog cl = unfi.changelog
data = nodemap.persisted_data(cl) data = nodemap.persisted_data(cl)
ui.write(data) ui.write(data)
elif opts['check']:
unfi = repo.unfiltered()
cl = unfi.changelog
data = nodemap.persisted_data(cl)
return nodemap.check_data(ui, cl.index, data)
@command( @command(
b'debugobsolete', b'debugobsolete',
[ [
(b'', b'flags', 0, _(b'markers flag')), (b'', b'flags', 0, _(b'markers flag')),
( (
b'', b'',

mercurial/revlogutils/nodemap.py

for idx, v in enumerate(values): for idx, v in enumerate(values):
if v == NO_ENTRY: if v == NO_ENTRY:
continue continue
elif v >= 0: elif v >= 0:
b[idx] = block_map[v] b[idx] = block_map[v]
else: else:
b[idx] = _transform_rev(v) b[idx] = _transform_rev(v)
return block return block
# debug utility
def check_data(ui, index, data):
"""verify that the provided nodemap data are valid for the given idex"""
ret = 0
ui.status((b"revision in index: %d\n") % len(index))
root = parse_data(data)
all_revs = set(_all_revisions(root))
ui.status((b"revision in nodemap: %d\n") % len(all_revs))
for r in range(len(index)):
if r not in all_revs:
msg = b" revision missing from nodemap: %d\n" % r
ui.write_err(msg)
ret = 1
else:
all_revs.remove(r)
if all_revs:
for r in sorted(all_revs):
msg = b" extra revision in nodemap: %d\n" % r
ui.write_err(msg)
ret = 1
return ret
def _all_revisions(root):
"""return all revisions stored in a Trie"""
for block in _walk_trie(root):
for v in block:
if v is None or isinstance(v, Block):
continue
yield v

tests/test-completion.t

debugindexstats: debugindexstats:
debuginstall: template debuginstall: template
debugknown: debugknown:
debuglabelcomplete: debuglabelcomplete:
debuglocks: force-lock, force-wlock, set-lock, set-wlock debuglocks: force-lock, force-wlock, set-lock, set-wlock
debugmanifestfulltextcache: clear, add debugmanifestfulltextcache: clear, add
debugmergestate: debugmergestate:
debugnamecomplete: debugnamecomplete:
debugnodemap: dump-new, dump-disk debugnodemap: dump-new, dump-disk, check
debugobsolete: flags, record-parents, rev, exclusive, index, delete, date, user, template debugobsolete: flags, record-parents, rev, exclusive, index, delete, date, user, template
debugp1copies: rev debugp1copies: rev
debugp2copies: rev debugp2copies: rev
debugpathcomplete: full, normal, added, removed debugpathcomplete: full, normal, added, removed
debugpathcopies: include, exclude debugpathcopies: include, exclude
debugpeer: debugpeer:
debugpickmergetool: rev, changedelete, include, exclude, tool debugpickmergetool: rev, changedelete, include, exclude, tool
debugpushkey: debugpushkey:

tests/test-persistent-nodemap.t

0080: ff ff ff ff ff ff f8 50 ff ff ff ff ff ff ff ff |.......P........| 0080: ff ff ff ff ff ff f8 50 ff ff ff ff ff ff ff ff |.......P........|
0090: ff ff ff ff ff ff ff ff ff ff ec c7 ff ff ff ff |................| 0090: ff ff ff ff ff ff ff ff ff ff ec c7 ff ff ff ff |................|
00a0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| 00a0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
00b0: ff ff ff ff ff ff fa be ff ff f2 fc ff ff ff ff |................| 00b0: ff ff ff ff ff ff fa be ff ff f2 fc ff ff ff ff |................|
00c0: ff ff ff ff ff ff ef ea ff ff ff ff ff ff f9 17 |................| 00c0: ff ff ff ff ff ff ef ea ff ff ff ff ff ff f9 17 |................|
00d0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| 00d0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
00e0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| 00e0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
00f0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| 00f0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
$ hg debugnodemap --check
revision in index: 5001
revision in nodemap: 5001
add a new commit add a new commit
$ hg up $ hg up
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo foo > foo $ echo foo > foo
$ hg add foo $ hg add foo
$ hg ci -m 'foo' $ hg ci -m 'foo'
$ f --size .hg/store/00changelog.n $ f --size .hg/store/00changelog.n
.hg/store/00changelog.n: size=18 .hg/store/00changelog.n: size=18
$ f --sha256 .hg/store/00changelog-*.nd --size $ f --sha256 .hg/store/00changelog-*.nd --size
.hg/store/00changelog-????????????????.nd: size=122880, sha256=bfafebd751c4f6d116a76a37a1dee2a251747affe7efbcc4f4842ccc746d4db9 (glob) .hg/store/00changelog-????????????????.nd: size=122880, sha256=bfafebd751c4f6d116a76a37a1dee2a251747affe7efbcc4f4842ccc746d4db9 (glob)
$ hg debugnodemap --check
revision in index: 5002
revision in nodemap: 5002