( )⚙ D10224 debugdiscovery: also integrate the discovery output in the json one

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10224

debugdiscovery: also integrate the discovery output in the json one
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG67a2ecea8bd9: debugdiscovery: also integrate the discovery output in the json one
Summary

We add a way for formatter to informs code that free output is unwanted, and we
incorporate it in the json output.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

Diff 26389

mercurial/debugcommands.py

# debugcommands.py - command processing for debug* commands # debugcommands.py - command processing for debug* commands
# #
# Copyright 2005-2016 Matt Mackall <mpm@selenic.com> # Copyright 2005-2016 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import codecs import codecs
import collections import collections
import contextlib
import difflib import difflib
import errno import errno
import glob import glob
import operator import operator
import os import os
import platform import platform
import random import random
import re import re
nodes = [repo[r].node() for r in revs] nodes = [repo[r].node() for r in revs]
common, any, hds = setdiscovery.findcommonheads( common, any, hds = setdiscovery.findcommonheads(
ui, repo, remote, ancestorsof=nodes, audit=data ui, repo, remote, ancestorsof=nodes, audit=data
) )
return common, hds return common, hds
remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, revs=None) remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, revs=None)
localrevs = opts[b'rev'] localrevs = opts[b'rev']
fm = ui.formatter(b'debugdiscovery', opts)
if fm.strict_format:
@contextlib.contextmanager
def may_capture_output():
ui.pushbuffer()
yield
data[b'output'] = ui.popbuffer()
else:
may_capture_output = util.nullcontextmanager
with may_capture_output():
with util.timedcm('debug-discovery') as t: with util.timedcm('debug-discovery') as t:
common, hds = doit(localrevs, remoterevs) common, hds = doit(localrevs, remoterevs)
# compute all statistics # compute all statistics
heads_common = set(common) heads_common = set(common)
heads_remote = set(hds) heads_remote = set(hds)
heads_local = set(repo.heads()) heads_local = set(repo.heads())
# note: they cannot be a local or remote head that is in common and not # note: they cannot be a local or remote head that is in common and not
# itself a head of common. # itself a head of common.
heads_common_local = heads_common & heads_local heads_common_local = heads_common & heads_local
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.startitem()
fm.data(**pycompat.strkwargs(data)) fm.data(**pycompat.strkwargs(data))
# display discovery summary # display discovery summary
fm.plain(b"elapsed time: %(elapsed)f seconds\n" % data) fm.plain(b"elapsed time: %(elapsed)f seconds\n" % data)
fm.plain(b"round-trips: %(total-roundtrips)9d\n" % data) fm.plain(b"round-trips: %(total-roundtrips)9d\n" % data)
fm.plain(b"heads summary:\n") fm.plain(b"heads summary:\n")
fm.plain(b" total common heads: %(nb-common-heads)9d\n" % data) fm.plain(b" total common heads: %(nb-common-heads)9d\n" % data)
fm.plain(b" also local heads: %(nb-common-heads-local)9d\n" % data) fm.plain(b" also local heads: %(nb-common-heads-local)9d\n" % data)

mercurial/formatter.py

@staticmethod @staticmethod
def formatlist(data, name, fmt, sep): def formatlist(data, name, fmt, sep):
'''convert iterable to appropriate list format''' '''convert iterable to appropriate list format'''
return list(data) return list(data)
class baseformatter(object): class baseformatter(object):
# set to True if the formater output a strict format that does not support
# arbitrary output in the stream.
strict_format = False
def __init__(self, ui, topic, opts, converter): def __init__(self, ui, topic, opts, converter):
self._ui = ui self._ui = ui
self._topic = topic self._topic = topic
self._opts = opts self._opts = opts
self._converter = converter self._converter = converter
self._item = None self._item = None
# function to convert node to string suitable for this output # function to convert node to string suitable for this output
self.hexfunc = hex self.hexfunc = hex
self._out.write(b''.join(cborutil.streamencode(self._item))) self._out.write(b''.join(cborutil.streamencode(self._item)))
def end(self): def end(self):
baseformatter.end(self) baseformatter.end(self)
self._out.write(cborutil.BREAK) self._out.write(cborutil.BREAK)
class jsonformatter(baseformatter): class jsonformatter(baseformatter):
strict_format = True
def __init__(self, ui, out, topic, opts): def __init__(self, ui, out, topic, opts):
baseformatter.__init__(self, ui, topic, opts, _nullconverter) baseformatter.__init__(self, ui, topic, opts, _nullconverter)
self._out = out self._out = out
self._out.write(b"[") self._out.write(b"[")
self._first = True self._first = True
def _showitem(self): def _showitem(self):
if self._first: if self._first:

tests/test-setdiscovery.t

------------------- -------------------
$ hg -R a debugdiscovery \ $ hg -R a debugdiscovery \
> -T json \ > -T json \
> --debug \ > --debug \
> --local-as-revs 'first(heads(all()), 25)' \ > --local-as-revs 'first(heads(all()), 25)' \
> --remote-as-revs 'last(heads(all()), 25)' \ > --remote-as-revs 'last(heads(all()), 25)' \
> --config devel.discovery.randomize=false > --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) "elapsed": *, (glob)
"nb-common-heads": 1, "nb-common-heads": 1,
"nb-common-heads-both": 0, "nb-common-heads-both": 0,
"nb-common-heads-local": 0, "nb-common-heads-local": 0,
"nb-common-heads-remote": 0, "nb-common-heads-remote": 0,
"nb-common-roots": 1, "nb-common-roots": 1,
"nb-head-local": 25, "nb-head-local": 25,
"nb-head-local-missing": 25, "nb-head-local-missing": 25,
"nb-head-remote": 25, "nb-head-remote": 25,
"nb-head-remote-unknown": 25, "nb-head-remote-unknown": 25,
"nb-ini_und": 400, "nb-ini_und": 400,
"nb-ini_und-common": 300, "nb-ini_und-common": 300,
"nb-ini_und-heads": 25, "nb-ini_und-heads": 25,
"nb-ini_und-missing": 100, "nb-ini_und-missing": 100,
"nb-ini_und-roots": 1, "nb-ini_und-roots": 1,
"nb-missing-heads": 25, "nb-missing-heads": 25,
"nb-missing-roots": 25, "nb-missing-roots": 25,
"nb-revs": 400, "nb-revs": 400,
"nb-revs-common": 300, "nb-revs-common": 300,
"nb-revs-missing": 100, "nb-revs-missing": 100,
"output": "query 1; heads\nsearching for changes\ntaking quick initial sample\nquery 2; still undecided: 375, sample size is: 81\nsampling from both directions\nquery 3; still undecided: 3, sample size is: 3\n3 total queries in *s\n", (glob)
"total-roundtrips": 3 "total-roundtrips": 3
} }
] ]