This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3291

hg: use command executor for wire protocol commands
ClosedPublic

Authored by indygreg on Apr 12 2018, 3:59 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGce8828217369: hg: use command executor for wire protocol commands
Summary

As part of this, I realized that some uses of lookup in a loop
could be converted to use a batch request. But I didn't change
behavior and left in a todo to track potentially changing this.

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 12 2018, 3:59 PM
indygreg edited the summary of this revision. (Show Details)Apr 13 2018, 3:14 PM
indygreg updated this revision to Diff 8130.
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 rHGce8828217369: hg: use command executor for wire protocol commands (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/hg.py (37 lines)

Diff 8176

mercurial/hg.py

else: else:
revs = [] revs = []
if not peer.capable('branchmap'): if not peer.capable('branchmap'):
if branches: if branches:
raise error.Abort(_("remote branch lookup not supported")) raise error.Abort(_("remote branch lookup not supported"))
revs.append(hashbranch) revs.append(hashbranch)
return revs, revs[0] return revs, revs[0]
branchmap = peer.branchmap()
with peer.commandexecutor() as e:
branchmap = e.callcommand('branchmap', {}).result()
def primary(branch): def primary(branch):
if branch == '.': if branch == '.':
if not lrepo: if not lrepo:
raise error.Abort(_("dirstate branch not accessible")) raise error.Abort(_("dirstate branch not accessible"))
branch = lrepo.dirstate.branch() branch = lrepo.dirstate.branch()
if branch in branchmap: if branch in branchmap:
revs.extend(node.hex(r) for r in reversed(branchmap[branch])) revs.extend(node.hex(r) for r in reversed(branchmap[branch]))
True. True.
""" """
revs = None revs = None
if rev: if rev:
if not srcpeer.capable('lookup'): if not srcpeer.capable('lookup'):
raise error.Abort(_("src repository does not support " raise error.Abort(_("src repository does not support "
"revision lookup and so doesn't " "revision lookup and so doesn't "
"support clone by revision")) "support clone by revision"))
revs = [srcpeer.lookup(r) for r in rev]
# TODO this is batchable.
remoterevs = []
for r in rev:
with srcpeer.commandexecutor() as e:
remoterevs.append(e.callcommand('lookup', {
'key': r,
}).result())
revs = remoterevs
# Obtain a lock before checking for or cloning the pooled repo otherwise # Obtain a lock before checking for or cloning the pooled repo otherwise
# 2 clients may race creating or populating it. # 2 clients may race creating or populating it.
pooldir = os.path.dirname(sharepath) pooldir = os.path.dirname(sharepath)
# lock class requires the directory to exist. # lock class requires the directory to exist.
try: try:
util.makedir(pooldir, False) util.makedir(pooldir, False)
except OSError as e: except OSError as e:
if sharepool and islocal(dest): if sharepool and islocal(dest):
sharepath = None sharepath = None
if sharenamemode == 'identity': if sharenamemode == 'identity':
# Resolve the name from the initial changeset in the remote # Resolve the name from the initial changeset in the remote
# repository. This returns nullid when the remote is empty. It # repository. This returns nullid when the remote is empty. It
# raises RepoLookupError if revision 0 is filtered or otherwise # raises RepoLookupError if revision 0 is filtered or otherwise
# not available. If we fail to resolve, sharing is not enabled. # not available. If we fail to resolve, sharing is not enabled.
try: try:
rootnode = srcpeer.lookup('0') with srcpeer.commandexecutor() as e:
rootnode = e.callcommand('lookup', {
'key': '0',
}).result()
if rootnode != node.nullid: if rootnode != node.nullid:
sharepath = os.path.join(sharepool, node.hex(rootnode)) sharepath = os.path.join(sharepool, node.hex(rootnode))
else: else:
ui.status(_('(not using pooled storage: ' ui.status(_('(not using pooled storage: '
'remote appears to be empty)\n')) 'remote appears to be empty)\n'))
except error.RepoLookupError: except error.RepoLookupError:
ui.status(_('(not using pooled storage: ' ui.status(_('(not using pooled storage: '
'unable to resolve identity of remote)\n')) 'unable to resolve identity of remote)\n'))
% dest) % dest)
raise raise
if revs: if revs:
if not srcpeer.capable('lookup'): if not srcpeer.capable('lookup'):
raise error.Abort(_("src repository does not support " raise error.Abort(_("src repository does not support "
"revision lookup and so doesn't " "revision lookup and so doesn't "
"support clone by revision")) "support clone by revision"))
revs = [srcpeer.lookup(r) for r in revs]
# TODO this is batchable.
remoterevs = []
for rev in revs:
with srcpeer.commandexecutor() as e:
remoterevs.append(e.callcommand('lookup', {
'key': rev,
}).result())
revs = remoterevs
checkout = revs[0] checkout = revs[0]
else: else:
revs = None revs = None
local = destpeer.local() local = destpeer.local()
if local: if local:
u = util.url(abspath) u = util.url(abspath)
defaulturl = bytes(u) defaulturl = bytes(u)
local.ui.setconfig('paths', 'default', defaulturl, 'clone') local.ui.setconfig('paths', 'default', defaulturl, 'clone')
destrepo.vfs.write('hgrc', util.tonativeeol(template % defaulturl)) destrepo.vfs.write('hgrc', util.tonativeeol(template % defaulturl))
destrepo.ui.setconfig('paths', 'default', defaulturl, 'clone') destrepo.ui.setconfig('paths', 'default', defaulturl, 'clone')
if ui.configbool('experimental', 'remotenames'): if ui.configbool('experimental', 'remotenames'):
logexchange.pullremotenames(destrepo, srcpeer) logexchange.pullremotenames(destrepo, srcpeer)
if update: if update:
if update is not True: if update is not True:
checkout = srcpeer.lookup(update) with srcpeer.commandexecutor() as e:
checkout = e.callcommand('lookup', {
'key': update,
}).result()
uprev = None uprev = None
status = None status = None
if checkout is not None: if checkout is not None:
if checkout in destrepo: if checkout in destrepo:
uprev = checkout uprev = checkout
else: else:
if update is not True: if update is not True:
try: try: