This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3272

treediscovery: switch to command executor interface
ClosedPublic

Authored by indygreg on Apr 11 2018, 7:42 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG0ed11f9368fd: treediscovery: switch to command executor interface
Summary

We now have a new interface for requesting that commands run.
Switch to it.

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

indygreg created this revision.Apr 11 2018, 7:42 PM
indygreg updated this revision to Diff 8125.Apr 13 2018, 3:14 PM
durin42 accepted this revision.Apr 13 2018, 5:48 PM
This revision is now accepted and ready to land.Apr 13 2018, 5:48 PM
Closed by commit rHG0ed11f9368fd: treediscovery: switch to command executor interface (authored by indygreg). · Explain WhyApr 13 2018, 6:09 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/treediscovery.py (21 lines)

Diff 8170

mercurial/treediscovery.py

knownnode = repo.changelog.hasnode knownnode = repo.changelog.hasnode
search = [] search = []
fetch = set() fetch = set()
seen = set() seen = set()
seenbranch = set() seenbranch = set()
base = set() base = set()
if not heads: if not heads:
heads = remote.heads() with remote.commandexecutor() as e:
heads = e.callcommand('heads', {}).result()
if repo.changelog.tip() == nullid: if repo.changelog.tip() == nullid:
base.add(nullid) base.add(nullid)
if heads != [nullid]: if heads != [nullid]:
return [nullid], [nullid], list(heads) return [nullid], [nullid], list(heads)
return [nullid], [], heads return [nullid], [], heads
# assume we're closer to the tip than the root # assume we're closer to the tip than the root
req = set(unknown) req = set(unknown)
reqcnt = 0 reqcnt = 0
# search through remote branches # search through remote branches
# a 'branch' here is a linear segment of history, with four parts: # a 'branch' here is a linear segment of history, with four parts:
# head, root, first parent, second parent # head, root, first parent, second parent
# (a branch always has two parents (or none) by definition) # (a branch always has two parents (or none) by definition)
unknown = collections.deque(remote.branches(unknown)) with remote.commandexecutor() as e:
branches = e.callcommand('branches', {'nodes': unknown}).result()
unknown = collections.deque(branches)
while unknown: while unknown:
r = [] r = []
while unknown: while unknown:
n = unknown.popleft() n = unknown.popleft()
if n[0] in seen: if n[0] in seen:
continue continue
repo.ui.debug("examining %s:%s\n" repo.ui.debug("examining %s:%s\n"
seen.add(n[0]) seen.add(n[0])
if r: if r:
reqcnt += 1 reqcnt += 1
repo.ui.progress(_('searching'), reqcnt, unit=_('queries')) repo.ui.progress(_('searching'), reqcnt, unit=_('queries'))
repo.ui.debug("request %d: %s\n" % repo.ui.debug("request %d: %s\n" %
(reqcnt, " ".join(map(short, r)))) (reqcnt, " ".join(map(short, r))))
for p in xrange(0, len(r), 10): for p in xrange(0, len(r), 10):
for b in remote.branches(r[p:p + 10]): with remote.commandexecutor() as e:
branches = e.callcommand('branches', {
'nodes': r[p:p + 10],
}).result()
for b in branches:
repo.ui.debug("received %s:%s\n" % repo.ui.debug("received %s:%s\n" %
(short(b[0]), short(b[1]))) (short(b[0]), short(b[1])))
unknown.append(b) unknown.append(b)
# do binary search on the branches we found # do binary search on the branches we found
while search: while search:
newsearch = [] newsearch = []
reqcnt += 1 reqcnt += 1
repo.ui.progress(_('searching'), reqcnt, unit=_('queries')) repo.ui.progress(_('searching'), reqcnt, unit=_('queries'))
for n, l in zip(search, remote.between(search)):
with remote.commandexecutor() as e:
between = e.callcommand('between', {'pairs': search}).result()
for n, l in zip(search, between):
l.append(n[1]) l.append(n[1])
p = n[0] p = n[0]
f = 1 f = 1
for i in l: for i in l:
repo.ui.debug("narrowing %d:%d %s\n" % (f, len(l), short(i))) repo.ui.debug("narrowing %d:%d %s\n" % (f, len(l), short(i)))
if knownnode(i): if knownnode(i):
if f <= 2: if f <= 2:
repo.ui.debug("found new branch changeset %s\n" % repo.ui.debug("found new branch changeset %s\n" %