| lothiraldan | |
| yuja |
| hg-reviewers |
Our refactoring left the state of sshpeer.init in a poor
state. "create" was no longer used. Process/pipe arguments were
passed poorly. "name" was really a URL.
This commit cleans all that up.
.. api::
sshpeer.sshpeer.__init__ now receives arguments describing an existing connection instead of creating a connection itself.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/sshpeer.py (19 lines) | |||
| M | tests/test-check-interfaces.py (4 lines) |
| stdin, stdout, stderr, proc = util.popen4(cmd, bufsize=0, env=sshenv) | stdin, stdout, stderr, proc = util.popen4(cmd, bufsize=0, env=sshenv) | ||||
| stdout = doublepipe(ui, util.bufferedinputpipe(stdout), stderr) | stdout = doublepipe(ui, util.bufferedinputpipe(stdout), stderr) | ||||
| stdin = doublepipe(ui, stdin, stderr) | stdin = doublepipe(ui, stdin, stderr) | ||||
| return proc, stdin, stdout, stderr | return proc, stdin, stdout, stderr | ||||
| class sshpeer(wireproto.wirepeer): | class sshpeer(wireproto.wirepeer): | ||||
| def __init__(self, ui, path, create=False, sshstate=None): | def __init__(self, ui, url, proc, stdin, stdout, stderr): | ||||
| self._url = path | """Create a peer from an existing SSH connection. | ||||
| ``proc`` is a handle on the underlying SSH process. | |||||
| ``stdin``, ``stdout``, and ``stderr`` are handles on the stdio | |||||
| pipes for that process. | |||||
| """ | |||||
| self._url = url | |||||
| self._ui = ui | self._ui = ui | ||||
| # self._subprocess is unused. Keeping a handle on the process | # self._subprocess is unused. Keeping a handle on the process | ||||
| # holds a reference and prevents it from being garbage collected. | # holds a reference and prevents it from being garbage collected. | ||||
| self._subprocess, self._pipei, self._pipeo, self._pipee = sshstate | self._subprocess = proc | ||||
| self._pipeo = stdin | |||||
| self._pipei = stdout | |||||
| self._pipee = stderr | |||||
| self._validaterepo() | self._validaterepo() | ||||
| # Begin of _basepeer interface. | # Begin of _basepeer interface. | ||||
| @util.propertycache | @util.propertycache | ||||
| def ui(self): | def ui(self): | ||||
| return self._ui | return self._ui | ||||
| ui.debug('running %s\n' % cmd) | ui.debug('running %s\n' % cmd) | ||||
| res = ui.system(cmd, blockedtag='sshpeer', environ=sshenv) | res = ui.system(cmd, blockedtag='sshpeer', environ=sshenv) | ||||
| if res != 0: | if res != 0: | ||||
| raise error.RepoError(_('could not create remote repo')) | raise error.RepoError(_('could not create remote repo')) | ||||
| proc, stdin, stdout, stderr = _makeconnection(ui, sshcmd, args, remotecmd, | proc, stdin, stdout, stderr = _makeconnection(ui, sshcmd, args, remotecmd, | ||||
| remotepath, sshenv) | remotepath, sshenv) | ||||
| sshstate = (proc, stdout, stdin, stderr) | return sshpeer(ui, path, proc, stdin, stdout, stderr) | ||||
| return sshpeer(ui, path, create=create, sshstate=sshstate) | |||||
| pass | pass | ||||
| def main(): | def main(): | ||||
| ui = uimod.ui() | ui = uimod.ui() | ||||
| checkobject(badpeer()) | checkobject(badpeer()) | ||||
| checkobject(httppeer.httppeer(ui, 'http://localhost')) | checkobject(httppeer.httppeer(ui, 'http://localhost')) | ||||
| checkobject(localrepo.localpeer(dummyrepo())) | checkobject(localrepo.localpeer(dummyrepo())) | ||||
| checkobject(testingsshpeer(ui, 'ssh://localhost/foo', False, | checkobject(testingsshpeer(ui, 'ssh://localhost/foo', None, None, None, | ||||
| (None, None, None, None))) | None)) | ||||
| checkobject(bundlerepo.bundlepeer(dummyrepo())) | checkobject(bundlerepo.bundlepeer(dummyrepo())) | ||||
| checkobject(statichttprepo.statichttppeer(dummyrepo())) | checkobject(statichttprepo.statichttppeer(dummyrepo())) | ||||
| checkobject(unionrepo.unionpeer(dummyrepo())) | checkobject(unionrepo.unionpeer(dummyrepo())) | ||||
| main() | main() | ||||