This is an archive of the discontinued Mercurial Phabricator instance.

Differential D744

debug: update debugbundle to use new deltaiter api
ClosedPublic

Authored by durham on Sep 20 2017, 12:42 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG311f6ccf8f23: debug: update debugbundle to use new deltaiter api
Summary

Changegroup now has a deltaiter api for easy iteration over a series of deltas.
Let's use that in the debugbundle command.

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

durham created this revision.Sep 20 2017, 12:42 PM
martinvonz accepted this revision.Sep 20 2017, 1:20 PM
This revision is now accepted and ready to land.Sep 20 2017, 1:20 PM
Closed by commit rHG311f6ccf8f23: debug: update debugbundle to use new deltaiter api (authored by durham). · Explain WhySep 20 2017, 1:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (17 lines)

Diff 1943

mercurial/debugcommands.py

def _debugchangegroup(ui, gen, all=None, indent=0, **opts): def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
indent_string = ' ' * indent indent_string = ' ' * indent
if all: if all:
ui.write(("%sformat: id, p1, p2, cset, delta base, len(delta)\n") ui.write(("%sformat: id, p1, p2, cset, delta base, len(delta)\n")
% indent_string) % indent_string)
def showchunks(named): def showchunks(named):
ui.write("\n%s%s\n" % (indent_string, named)) ui.write("\n%s%s\n" % (indent_string, named))
chain = None for deltadata in gen.deltaiter():
for chunkdata in iter(lambda: gen.deltachunk(chain), {}): node, p1, p2, cs, deltabase, delta, flags = deltadata
node = chunkdata['node']
p1 = chunkdata['p1']
p2 = chunkdata['p2']
cs = chunkdata['cs']
deltabase = chunkdata['deltabase']
delta = chunkdata['delta']
ui.write("%s%s %s %s %s %s %s\n" % ui.write("%s%s %s %s %s %s %s\n" %
(indent_string, hex(node), hex(p1), hex(p2), (indent_string, hex(node), hex(p1), hex(p2),
hex(cs), hex(deltabase), len(delta))) hex(cs), hex(deltabase), len(delta)))
chain = node
chunkdata = gen.changelogheader() chunkdata = gen.changelogheader()
showchunks("changelog") showchunks("changelog")
chunkdata = gen.manifestheader() chunkdata = gen.manifestheader()
showchunks("manifest") showchunks("manifest")
for chunkdata in iter(gen.filelogheader, {}): for chunkdata in iter(gen.filelogheader, {}):
fname = chunkdata['filename'] fname = chunkdata['filename']
showchunks(fname) showchunks(fname)
else: else:
if isinstance(gen, bundle2.unbundle20): if isinstance(gen, bundle2.unbundle20):
raise error.Abort(_('use debugbundle2 for this file')) raise error.Abort(_('use debugbundle2 for this file'))
chunkdata = gen.changelogheader() chunkdata = gen.changelogheader()
chain = None for deltadata in gen.deltaiter():
for chunkdata in iter(lambda: gen.deltachunk(chain), {}): node, p1, p2, cs, deltabase, delta, flags = deltadata
node = chunkdata['node']
ui.write("%s%s\n" % (indent_string, hex(node))) ui.write("%s%s\n" % (indent_string, hex(node)))
chain = node
def _debugobsmarkers(ui, part, indent=0, **opts): def _debugobsmarkers(ui, part, indent=0, **opts):
"""display version and markers contained in 'data'""" """display version and markers contained in 'data'"""
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
data = part.read() data = part.read()
indent_string = ' ' * indent indent_string = ' ' * indent
try: try:
version, markers = obsolete._readmarkers(data) version, markers = obsolete._readmarkers(data)