This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9524

debugdiscovery: move various computation earlier
ClosedPublic

Authored by marmoute on Dec 5 2020, 9:31 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG44a52048c6d6: debugdiscovery: move various computation earlier
Summary

We are about to add more data to debug discovery (eg: data bout the initial
undecided set, number of roundtrip, etc). So we start by cleaning up the code by
spliting some computation and some display related preparation.

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.Dec 5 2020, 9:31 AM

initial sent before test run (refresh post test run imminent)

baymax updated this revision to Diff 24045.Dec 5 2020, 10:59 AM
pulkit accepted this revision.Dec 6 2020, 6:49 AM
This revision is now accepted and ready to land.Dec 6 2020, 6:49 AM
baymax updated this revision to Diff 24077.Dec 7 2020, 9:11 AM
marmoute added a commit: rHG44a52048c6d6: debugdiscovery: move various computation earlier.Dec 7 2020, 1:20 PM
Closed by commit rHG44a52048c6d6: debugdiscovery: move various computation earlier (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (45 lines)

Diff 24089

mercurial/debugcommands.py

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']
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
common = set(common) heads_common = set(common)
rheads = set(hds) heads_remote = set(hds)
lheads = set(repo.heads()) heads_local = set(repo.heads())
# note: they cannot be a local or remote head that is in common and not
# itself a head of common.
heads_common_local = heads_common & heads_local
heads_common_remote = heads_common & heads_remote
heads_common_both = heads_common & heads_remote & heads_local
all = repo.revs(b'all()')
common = repo.revs(b'::%ln', common)
missing = repo.revs(b'not ::%ld', common)
assert len(common) + len(missing) == len(all)
data = {} data = {}
data[b'elapsed'] = t.elapsed data[b'elapsed'] = t.elapsed
data[b'nb-common-heads'] = len(common) data[b'nb-common-heads'] = len(heads_common)
data[b'nb-common-heads-local'] = len(common & lheads) data[b'nb-common-heads-local'] = len(heads_common_local)
data[b'nb-common-heads-remote'] = len(common & rheads) data[b'nb-common-heads-remote'] = len(heads_common_remote)
data[b'nb-common-heads-both'] = len(common & rheads & lheads) data[b'nb-common-heads-both'] = len(heads_common_both)
data[b'nb-head-local'] = len(lheads) data[b'nb-head-local'] = len(heads_local)
data[b'nb-head-local-missing'] = ( data[b'nb-head-local-missing'] = len(heads_local) - len(heads_common_local)
data[b'nb-head-local'] - data[b'nb-common-heads-local'] data[b'nb-head-remote'] = len(heads_remote)
) data[b'nb-head-remote-unknown'] = len(heads_remote) - len(
data[b'nb-head-remote'] = len(rheads) heads_common_remote
data[b'nb-head-remote-unknown'] = ( )
data[b'nb-head-remote'] - data[b'nb-common-heads-remote'] data[b'nb-revs'] = len(all)
) data[b'nb-revs-common'] = len(common)
data[b'nb-revs'] = len(repo.revs(b'all()')) data[b'nb-revs-missing'] = len(missing)
data[b'nb-revs-common'] = len(repo.revs(b'::%ln', common))
data[b'nb-revs-missing'] = data[b'nb-revs'] - data[b'nb-revs-common']
# display discovery summary # display discovery summary
ui.writenoi18n(b"elapsed time: %(elapsed)f seconds\n" % data) ui.writenoi18n(b"elapsed time: %(elapsed)f seconds\n" % data)
ui.writenoi18n(b"heads summary:\n") ui.writenoi18n(b"heads summary:\n")
ui.writenoi18n(b" total common heads: %(nb-common-heads)9d\n" % data) ui.writenoi18n(b" total common heads: %(nb-common-heads)9d\n" % data)
ui.writenoi18n( ui.writenoi18n(
b" also local heads: %(nb-common-heads-local)9d\n" % data b" also local heads: %(nb-common-heads-local)9d\n" % data
) )
b" unknown: %(nb-head-remote-unknown)9d\n" % data b" unknown: %(nb-head-remote-unknown)9d\n" % data
) )
ui.writenoi18n(b"local changesets: %(nb-revs)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" common: %(nb-revs-common)9d\n" % data)
ui.writenoi18n(b" missing: %(nb-revs-missing)9d\n" % data) ui.writenoi18n(b" missing: %(nb-revs-missing)9d\n" % data)
if ui.verbose: if ui.verbose:
ui.writenoi18n( ui.writenoi18n(
b"common heads: %s\n" % b" ".join(sorted(short(n) for n in common)) b"common heads: %s\n"
% b" ".join(sorted(short(n) for n in heads_common))
) )
_chunksize = 4 << 10 _chunksize = 4 << 10
@command( @command(
b'debugdownload', b'debugdownload',