This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10223

debugdiscovery: add support for Json output
ClosedPublic

Authored by marmoute on Mar 15 2021, 7:00 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3a8cf5b9c820: debugdiscovery: add support for Json output
Summary

They are some pre-output that will be impractical, I'll take care of it in the
next changeset.

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.Mar 15 2021, 7:00 PM
marmoute added a commit: rHG3a8cf5b9c820: debugdiscovery: add support for Json output.Mar 16 2021, 5:59 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG3a8cf5b9c820: debugdiscovery: add support for Json output (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 26449

mercurial/debugcommands.py

), ),
( (
b'', b'',
b'remote-as-revs', b'remote-as-revs',
"", "",
'use local as remote, with only these these revisions', 'use local as remote, with only these these revisions',
), ),
] ]
+ cmdutil.remoteopts, + cmdutil.remoteopts
+ cmdutil.formatteropts,
_(b'[--rev REV] [OTHER]'), _(b'[--rev REV] [OTHER]'),
) )
def debugdiscovery(ui, repo, remoteurl=b"default", **opts): def debugdiscovery(ui, repo, remoteurl=b"default", **opts):
"""runs the changeset discovery protocol in isolation """runs the changeset discovery protocol in isolation
The local peer can be "replaced" by a subset of the local repository by The local peer can be "replaced" by a subset of the local repository by
using the `--local-as-revs` flag. Int he same way, usual `remote` peer can using the `--local-as-revs` flag. Int he same way, usual `remote` peer can
be "replaced" by a subset of the local repository using the be "replaced" by a subset of the local repository using the
data[b'nb-missing-heads'] = len(heads_missing) data[b'nb-missing-heads'] = len(heads_missing)
data[b'nb-missing-roots'] = len(roots_missing) data[b'nb-missing-roots'] = len(roots_missing)
data[b'nb-ini_und'] = len(initial_undecided) data[b'nb-ini_und'] = len(initial_undecided)
data[b'nb-ini_und-heads'] = len(heads_initial_undecided) data[b'nb-ini_und-heads'] = len(heads_initial_undecided)
data[b'nb-ini_und-roots'] = len(roots_initial_undecided) data[b'nb-ini_und-roots'] = len(roots_initial_undecided)
data[b'nb-ini_und-common'] = len(common_initial_undecided) data[b'nb-ini_und-common'] = len(common_initial_undecided)
data[b'nb-ini_und-missing'] = len(missing_initial_undecided) data[b'nb-ini_und-missing'] = len(missing_initial_undecided)
fm = ui.formatter(b'debugdiscovery', opts)
fm.startitem()
fm.data(**pycompat.strkwargs(data))
# display discovery summary # display discovery summary
ui.writenoi18n(b"elapsed time: %(elapsed)f seconds\n" % data) fm.plain(b"elapsed time: %(elapsed)f seconds\n" % data)
ui.writenoi18n(b"round-trips: %(total-roundtrips)9d\n" % data) fm.plain(b"round-trips: %(total-roundtrips)9d\n" % data)
ui.writenoi18n(b"heads summary:\n") fm.plain(b"heads summary:\n")
ui.writenoi18n(b" total common heads: %(nb-common-heads)9d\n" % data) fm.plain(b" total common heads: %(nb-common-heads)9d\n" % data)
ui.writenoi18n( fm.plain(b" also local heads: %(nb-common-heads-local)9d\n" % data)
b" also local heads: %(nb-common-heads-local)9d\n" % data fm.plain(b" also remote heads: %(nb-common-heads-remote)9d\n" % data)
) fm.plain(b" both: %(nb-common-heads-both)9d\n" % data)
ui.writenoi18n( fm.plain(b" local heads: %(nb-head-local)9d\n" % data)
b" also remote heads: %(nb-common-heads-remote)9d\n" % data fm.plain(b" common: %(nb-common-heads-local)9d\n" % data)
) fm.plain(b" missing: %(nb-head-local-missing)9d\n" % data)
ui.writenoi18n(b" both: %(nb-common-heads-both)9d\n" % data) fm.plain(b" remote heads: %(nb-head-remote)9d\n" % data)
ui.writenoi18n(b" local heads: %(nb-head-local)9d\n" % data) fm.plain(b" common: %(nb-common-heads-remote)9d\n" % data)
ui.writenoi18n( fm.plain(b" unknown: %(nb-head-remote-unknown)9d\n" % data)
b" common: %(nb-common-heads-local)9d\n" % data fm.plain(b"local changesets: %(nb-revs)9d\n" % data)
) fm.plain(b" common: %(nb-revs-common)9d\n" % data)
ui.writenoi18n( fm.plain(b" heads: %(nb-common-heads)9d\n" % data)
b" missing: %(nb-head-local-missing)9d\n" % data fm.plain(b" roots: %(nb-common-roots)9d\n" % data)
) fm.plain(b" missing: %(nb-revs-missing)9d\n" % data)
ui.writenoi18n(b" remote heads: %(nb-head-remote)9d\n" % data) fm.plain(b" heads: %(nb-missing-heads)9d\n" % data)
ui.writenoi18n( fm.plain(b" roots: %(nb-missing-roots)9d\n" % data)
b" common: %(nb-common-heads-remote)9d\n" % data fm.plain(b" first undecided set: %(nb-ini_und)9d\n" % data)
) fm.plain(b" heads: %(nb-ini_und-heads)9d\n" % data)
ui.writenoi18n( fm.plain(b" roots: %(nb-ini_und-roots)9d\n" % data)
b" unknown: %(nb-head-remote-unknown)9d\n" % data fm.plain(b" common: %(nb-ini_und-common)9d\n" % data)
) fm.plain(b" missing: %(nb-ini_und-missing)9d\n" % data)
ui.writenoi18n(b"local changesets: %(nb-revs)9d\n" % data)
ui.writenoi18n(b" common: %(nb-revs-common)9d\n" % data)
ui.writenoi18n(b" heads: %(nb-common-heads)9d\n" % data)
ui.writenoi18n(b" roots: %(nb-common-roots)9d\n" % data)
ui.writenoi18n(b" missing: %(nb-revs-missing)9d\n" % data)
ui.writenoi18n(b" heads: %(nb-missing-heads)9d\n" % data)
ui.writenoi18n(b" roots: %(nb-missing-roots)9d\n" % data)
ui.writenoi18n(b" first undecided set: %(nb-ini_und)9d\n" % data)
ui.writenoi18n(b" heads: %(nb-ini_und-heads)9d\n" % data)
ui.writenoi18n(b" roots: %(nb-ini_und-roots)9d\n" % data)
ui.writenoi18n(b" common: %(nb-ini_und-common)9d\n" % data)
ui.writenoi18n(b" missing: %(nb-ini_und-missing)9d\n" % data)
if ui.verbose: if ui.verbose:
ui.writenoi18n( fm.plain(
b"common heads: %s\n" b"common heads: %s\n"
% b" ".join(sorted(short(n) for n in heads_common)) % b" ".join(sorted(short(n) for n in heads_common))
) )
fm.end()
_chunksize = 4 << 10 _chunksize = 4 << 10
@command( @command(
b'debugdownload', b'debugdownload',
[ [

tests/test-completion.t

debugcommands: debugcommands:
debugcomplete: options debugcomplete: options
debugcreatestreamclonebundle: debugcreatestreamclonebundle:
debugdag: tags, branches, dots, spaces debugdag: tags, branches, dots, spaces
debugdata: changelog, manifest, dir debugdata: changelog, manifest, dir
debugdate: extended debugdate: extended
debugdeltachain: changelog, manifest, dir, template debugdeltachain: changelog, manifest, dir, template
debugdirstate: nodates, dates, datesort debugdirstate: nodates, dates, datesort
debugdiscovery: old, nonheads, rev, seed, local-as-revs, remote-as-revs, ssh, remotecmd, insecure debugdiscovery: old, nonheads, rev, seed, local-as-revs, remote-as-revs, ssh, remotecmd, insecure, template
debugdownload: output debugdownload: output
debugextensions: template debugextensions: template
debugfileset: rev, all-files, show-matcher, show-stage debugfileset: rev, all-files, show-matcher, show-stage
debugformat: template debugformat: template
debugfsinfo: debugfsinfo:
debuggetbundle: head, common, type debuggetbundle: head, common, type
debugignore: debugignore:
debugindex: changelog, manifest, dir, template debugindex: changelog, manifest, dir, template

tests/test-setdiscovery.t

heads: 25 heads: 25
roots: 25 roots: 25
first undecided set: 400 first undecided set: 400
heads: 25 heads: 25
roots: 1 roots: 1
common: 300 common: 300
missing: 100 missing: 100
common heads: 3ee37d65064a common heads: 3ee37d65064a
Test -T json output
-------------------
$ hg -R a debugdiscovery \
> -T json \
> --debug \
> --local-as-revs 'first(heads(all()), 25)' \
> --remote-as-revs 'last(heads(all()), 25)' \
> --config devel.discovery.randomize=false
query 1; heads
searching for changes
taking quick initial sample
query 2; still undecided: 375, sample size is: 81
sampling from both directions
query 3; still undecided: 3, sample size is: 3
3 total queries in *s (glob)
[
{
"elapsed": *, (glob)
"nb-common-heads": 1,
"nb-common-heads-both": 0,
"nb-common-heads-local": 0,
"nb-common-heads-remote": 0,
"nb-common-roots": 1,
"nb-head-local": 25,
"nb-head-local-missing": 25,
"nb-head-remote": 25,
"nb-head-remote-unknown": 25,
"nb-ini_und": 400,
"nb-ini_und-common": 300,
"nb-ini_und-heads": 25,
"nb-ini_und-missing": 100,
"nb-ini_und-roots": 1,
"nb-missing-heads": 25,
"nb-missing-roots": 25,
"nb-revs": 400,
"nb-revs-common": 300,
"nb-revs-missing": 100,
"total-roundtrips": 3
}
]