This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4324

setdiscovery: use revset for resolving DAG heads in a subset
ClosedPublic

Authored by indygreg on Aug 17 2018, 5:31 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGfec01c69b0f0: setdiscovery: use revset for resolving DAG heads in a subset
Summary

This was the final use of dagutil in setdiscovery!

For reasons I didn't investigate, feeding a set with nullrev
into the heads() revset resulted in a bunch of tests failing.
Filtering out nullrev from the input set fixes things.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Aug 17 2018, 5:31 PM
yuja added a subscriber: yuja.Aug 18 2018, 4:05 AM
For reasons I didn't investigate, feeding a set with nullrev
into the heads() revset resulted in a bunch of tests failing.
Filtering out nullrev from the input set fixes things.

That's probably because heads() internally calls parents(), but
parents() doesn't handle null in a way heads() can exclude p1 of the
root revision.

Closed by commit rHGfec01c69b0f0: setdiscovery: use revset for resolving DAG heads in a subset (authored by indygreg). · Explain WhyAug 18 2018, 4:07 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/setdiscovery.py (9 lines)

Diff 10418

mercurial/setdiscovery.py

import random import random
from .i18n import _ from .i18n import _
from .node import ( from .node import (
nullid, nullid,
nullrev, nullrev,
) )
from . import ( from . import (
dagutil,
error, error,
util, util,
) )
def _updatesample(revs, heads, sample, parentfn, quicksamplesize=0): def _updatesample(revs, heads, sample, parentfn, quicksamplesize=0):
"""update an existing sample to match the expected size """update an existing sample to match the expected size
The sample is updated with revs exponentially distant from each head of the The sample is updated with revs exponentially distant from each head of the
clnode = cl.node clnode = cl.node
clrev = cl.rev clrev = cl.rev
if ancestorsof is not None: if ancestorsof is not None:
ownheads = [clrev(n) for n in ancestorsof] ownheads = [clrev(n) for n in ancestorsof]
else: else:
ownheads = [rev for rev in cl.headrevs() if rev != nullrev] ownheads = [rev for rev in cl.headrevs() if rev != nullrev]
dag = dagutil.revlogdag(cl)
# early exit if we know all the specified remote heads already # early exit if we know all the specified remote heads already
ui.debug("query 1; heads\n") ui.debug("query 1; heads\n")
roundtrips += 1 roundtrips += 1
sample = _limitsample(ownheads, initialsamplesize) sample = _limitsample(ownheads, initialsamplesize)
# 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:
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) # The presence of nullrev will confuse heads(). So filter it out.
# common.bases can include nullrev, but our contract requires us to not result = set(local.revs('heads(%ld)', common.bases - {nullrev}))
# return any heads in that case, so discard that
result.discard(nullrev)
elapsed = util.timer() - start elapsed = util.timer() - start
progress.complete() progress.complete()
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)