This is an archive of the discontinued Mercurial Phabricator instance.

Differential D336

sshpeer: use peer interface
ClosedPublic

Authored by indygreg on Aug 11 2017, 12:20 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG1f8460b55986: sshpeer: use peer interface
Summary

We need the same @property conversion of ui like we did for localpeer.
We renamed _capabilities() to capabilities() to satisfy the new
naming requirement.

However, since we're inheriting from wireproto.wirepeer which inherits
from peer.peerrepository and provides its own code accessing
_capabilities(), we need to keep the old alias around. This wonkiness
will disappear once wirepeer is cleaned up in subsequent commits.

We also implement methods for basepeer that are identical to the
defaults in peer.peerrepository in preparation for the removal of
peerrepository.

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.Aug 11 2017, 12:20 AM
durin42 accepted this revision.Aug 11 2017, 2:28 PM
This revision is now accepted and ready to land.Aug 11 2017, 2:28 PM
Closed by commit rHG1f8460b55986: sshpeer: use peer interface (authored by indygreg). · Explain WhyAug 15 2017, 1:51 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/sshpeer.py (38 lines)

Diff 935

mercurial/sshpeer.py

# sshpeer.py - ssh repository proxy class for mercurial # sshpeer.py - ssh repository proxy class for mercurial
# #
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import re import re
from .i18n import _ from .i18n import _
from . import ( from . import (
error, error,
pycompat, pycompat,
repository,
util, util,
wireproto, wireproto,
) )
def _serverquote(s): def _serverquote(s):
if not s: if not s:
return s return s
'''quote a string for the remote shell ... which we assume is sh''' '''quote a string for the remote shell ... which we assume is sh'''
return meth(data) return meth(data)
def close(self): def close(self):
return self._main.close() return self._main.close()
def flush(self): def flush(self):
return self._main.flush() return self._main.flush()
class sshpeer(wireproto.wirepeer): class sshpeer(wireproto.wirepeer, repository.legacypeer):
def __init__(self, ui, path, create=False): def __init__(self, ui, path, create=False):
self._url = path self._url = path
self.ui = ui self._ui = ui
self._pipeo = self._pipei = self._pipee = None self._pipeo = self._pipei = self._pipee = None
u = util.url(path, parsequery=False, parsefragment=False) u = util.url(path, parsequery=False, parsefragment=False)
if u.scheme != 'ssh' or not u.host or u.path is None: if u.scheme != 'ssh' or not u.host or u.path is None:
self._abort(error.RepoError(_("couldn't parse location %s") % path)) self._abort(error.RepoError(_("couldn't parse location %s") % path))
util.checksafessh(path) util.checksafessh(path)
(_serverquote(remotecmd), _serverquote(self._path)))) (_serverquote(remotecmd), _serverquote(self._path))))
ui.debug('running %s\n' % cmd) ui.debug('running %s\n' % cmd)
res = ui.system(cmd, blockedtag='sshpeer') res = ui.system(cmd, blockedtag='sshpeer')
if res != 0: if res != 0:
self._abort(error.RepoError(_("could not create remote repo"))) self._abort(error.RepoError(_("could not create remote repo")))
self._validaterepo(sshcmd, args, remotecmd) self._validaterepo(sshcmd, args, remotecmd)
# TODO remove this alias once peerrepository inheritance is removed.
self._capabilities = self.capabilities
# Begin of _basepeer interface.
@util.propertycache
def ui(self):
return self._ui
def url(self): def url(self):
return self._url return self._url
def local(self):
return None
def peer(self):
return self
def canpush(self):
return True
def close(self):
pass
# End of _basepeer interface.
# Begin of _basewirecommands interface.
def capabilities(self):
return self._caps
# End of _basewirecommands interface.
def _validaterepo(self, sshcmd, args, remotecmd): def _validaterepo(self, sshcmd, args, remotecmd):
# cleanup up previous run # cleanup up previous run
self._cleanup() self._cleanup()
cmd = '%s %s %s' % (sshcmd, args, cmd = '%s %s %s' % (sshcmd, args,
util.shellquote("%s -R %s serve --stdio" % util.shellquote("%s -R %s serve --stdio" %
(_serverquote(remotecmd), _serverquote(self._path)))) (_serverquote(remotecmd), _serverquote(self._path))))
self.ui.debug('running %s\n' % cmd) self.ui.debug('running %s\n' % cmd)
'remote hg'))) 'remote hg')))
self._caps = set() self._caps = set()
for l in reversed(lines): for l in reversed(lines):
if l.startswith("capabilities:"): if l.startswith("capabilities:"):
self._caps.update(l[:-1].split(":")[1].split()) self._caps.update(l[:-1].split(":")[1].split())
break break
def _capabilities(self):
return self._caps
def _readerr(self): def _readerr(self):
_forwardoutput(self.ui, self._pipee) _forwardoutput(self.ui, self._pipee)
def _abort(self, exception): def _abort(self, exception):
self._cleanup() self._cleanup()
raise exception raise exception
def _cleanup(self): def _cleanup(self):