This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3770

setdiscovery: use progress helper
ClosedPublic

Authored by martinvonz on Jun 17 2018, 12:42 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9e70690a21ac: setdiscovery: use progress helper
rHGdb8f6eaf4ee0: setdiscovery: use progress helper
Summary

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

martinvonz created this revision.Jun 17 2018, 12:42 PM
Closed by commit rHGdb8f6eaf4ee0: setdiscovery: use progress helper (authored by martinvonz). · Explain WhyJun 17 2018, 2:07 PM
This revision was automatically updated to reflect the committed changes.
martinvonz added inline comments.Jun 17 2018, 2:49 PM
mercurial/setdiscovery.py
230

Sorry, this should be progress.update(roundtrips) since progress starts at 1 (not 0). Feel free to fix in place, or let me know and I'll send a fixup

Revision Contents
Changeset List

PathPackages
Mmercurial/setdiscovery.py (5 lines)

Diff 9139

mercurial/setdiscovery.py

commoninsample = set(n for i, n in enumerate(sample) if yesno[i]) commoninsample = set(n for i, n in enumerate(sample) if yesno[i])
common.addbases(commoninsample) common.addbases(commoninsample)
# own nodes where I don't know if remote knows them # own nodes where I don't know if remote knows them
undecided = set(common.missingancestors(ownheads)) undecided = set(common.missingancestors(ownheads))
# own nodes I know remote lacks # own nodes I know remote lacks
missing = set() missing = set()
full = False full = False
progress = ui.makeprogress(_('searching'), unit=_('queries'))
while undecided: while undecided:
if sample: if sample:
missinginsample = [n for i, n in enumerate(sample) if not yesno[i]] missinginsample = [n for i, n in enumerate(sample) if not yesno[i]]
missing.update(dag.descendantset(missinginsample, missing)) missing.update(dag.descendantset(missinginsample, missing))
undecided.difference_update(missing) undecided.difference_update(missing)
samplefunc = _takequicksample samplefunc = _takequicksample
targetsize = initialsamplesize targetsize = initialsamplesize
if len(undecided) < targetsize: if len(undecided) < targetsize:
sample = list(undecided) sample = list(undecided)
else: else:
sample = samplefunc(dag, undecided, targetsize) sample = samplefunc(dag, undecided, targetsize)
roundtrips += 1 roundtrips += 1
ui.progress(_('searching'), roundtrips, unit=_('queries')) progress.increment()
martinvonzAuthorUnsubmitted
Not Done

Sorry, this should be progress.update(roundtrips) since progress starts at 1 (not 0). Feel free to fix in place, or let me know and I'll send a fixup

martinvonz: Sorry, this should be progress.update(roundtrips) since progress starts at 1 (not 0). Feel free…
ui.debug("query %i; still undecided: %i, sample size is: %i\n" ui.debug("query %i; still undecided: %i, sample size is: %i\n"
% (roundtrips, len(undecided), len(sample))) % (roundtrips, len(undecided), len(sample)))
# indices between sample and externalized version must match # indices between sample and externalized version must match
sample = list(sample) sample = list(sample)
with remote.commandexecutor() as e: with remote.commandexecutor() as e:
yesno = e.callcommand('known', { yesno = e.callcommand('known', {
'nodes': dag.externalizeall(sample), 'nodes': dag.externalizeall(sample),
}).result() }).result()
full = True full = True
if sample: if sample:
commoninsample = set(n for i, n in enumerate(sample) if yesno[i]) commoninsample = set(n for i, n in enumerate(sample) if yesno[i])
common.addbases(commoninsample) common.addbases(commoninsample)
common.removeancestorsfrom(undecided) common.removeancestorsfrom(undecided)
# heads(common) == heads(common.bases) since common represents common.bases # heads(common) == heads(common.bases) since common represents common.bases
# and all its ancestors # and all its ancestors
result = dag.headsetofconnecteds(common.bases) result = dag.headsetofconnecteds(common.bases)
# common.bases can include nullrev, but our contract requires us to not # common.bases can include nullrev, but our contract requires us to not
# return any heads in that case, so discard that # return any heads in that case, so discard that
result.discard(nullrev) result.discard(nullrev)
elapsed = util.timer() - start elapsed = util.timer() - start
ui.progress(_('searching'), None) progress.update(None)
ui.debug("%d total queries in %.4fs\n" % (roundtrips, elapsed)) ui.debug("%d total queries in %.4fs\n" % (roundtrips, elapsed))
msg = ('found %d common and %d unknown server heads,' msg = ('found %d common and %d unknown server heads,'
' %d roundtrips in %.4fs\n') ' %d roundtrips in %.4fs\n')
missing = set(result) - set(srvheads) missing = set(result) - set(srvheads)
ui.log('discovery', msg, len(result), len(missing), roundtrips, ui.log('discovery', msg, len(result), len(missing), roundtrips,
elapsed) elapsed)
if not result and srvheadhashes != [nullid]: if not result and srvheadhashes != [nullid]:
if abortwhenunrelated: if abortwhenunrelated:
raise error.Abort(_("repository is unrelated")) raise error.Abort(_("repository is unrelated"))
else: else:
ui.warn(_("warning: repository is unrelated\n")) ui.warn(_("warning: repository is unrelated\n"))
return ({nullid}, True, srvheadhashes,) return ({nullid}, True, srvheadhashes,)
anyincoming = (srvheadhashes != [nullid]) anyincoming = (srvheadhashes != [nullid])
return dag.externalizeall(result), anyincoming, srvheadhashes return dag.externalizeall(result), anyincoming, srvheadhashes