| durin42 |
| hg-reviewers |
With the introduction of version 2 of the SSH wire protocol,
we will need a new peer class to speak that protocol because
it will be too difficult to shoehorn a single class to speak
two protocols. We rename sshpeer.sshpeer to sshpeer.sshv1peer
to reflect the fact that there will be multiple versions of
the peer depending on the negotiated protocol.
.. api::
sshpeer.sshpeer renamed to sshpeer.sshv1peer.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/largefiles/uisetup.py (4 lines) | |||
| M | mercurial/sshpeer.py (4 lines) | |||
| M | tests/test-check-interfaces.py (4 lines) |
| hgweb_mod.perms['statlfile'] = 'pull' | hgweb_mod.perms['statlfile'] = 'pull' | ||||
| extensions.wrapfunction(webcommands, 'decodepath', overrides.decodepath) | extensions.wrapfunction(webcommands, 'decodepath', overrides.decodepath) | ||||
| extensions.wrapfunction(wireproto, '_capabilities', proto._capabilities) | extensions.wrapfunction(wireproto, '_capabilities', proto._capabilities) | ||||
| # can't do this in reposetup because it needs to have happened before | # can't do this in reposetup because it needs to have happened before | ||||
| # wirerepo.__init__ is called | # wirerepo.__init__ is called | ||||
| proto.ssholdcallstream = sshpeer.sshpeer._callstream | proto.ssholdcallstream = sshpeer.sshv1peer._callstream | ||||
| proto.httpoldcallstream = httppeer.httppeer._callstream | proto.httpoldcallstream = httppeer.httppeer._callstream | ||||
| sshpeer.sshpeer._callstream = proto.sshrepocallstream | sshpeer.sshv1peer._callstream = proto.sshrepocallstream | ||||
| httppeer.httppeer._callstream = proto.httprepocallstream | httppeer.httppeer._callstream = proto.httprepocallstream | ||||
| # override some extensions' stuff as well | # override some extensions' stuff as well | ||||
| for name, module in extensions.extensions(): | for name, module in extensions.extensions(): | ||||
| if name == 'purge': | if name == 'purge': | ||||
| extensions.wrapcommand(getattr(module, 'cmdtable'), 'purge', | extensions.wrapcommand(getattr(module, 'cmdtable'), 'purge', | ||||
| overrides.overridepurge) | overrides.overridepurge) | ||||
| if name == 'rebase': | if name == 'rebase': | ||||
| extensions.wrapcommand(getattr(module, 'cmdtable'), 'rebase', | extensions.wrapcommand(getattr(module, 'cmdtable'), 'rebase', | ||||
| overrides.overriderebase) | overrides.overriderebase) | ||||
| extensions.wrapfunction(module, 'rebase', | extensions.wrapfunction(module, 'rebase', | ||||
| overrides.overriderebase) | overrides.overriderebase) | ||||
| if name == 'transplant': | if name == 'transplant': | ||||
| extensions.wrapcommand(getattr(module, 'cmdtable'), 'transplant', | extensions.wrapcommand(getattr(module, 'cmdtable'), 'transplant', | ||||
| overrides.overridetransplant) | overrides.overridetransplant) | ||||
| # 2. Remote is a <0.9.1 Mercurial server | # 2. Remote is a <0.9.1 Mercurial server | ||||
| # 3. Remote is a future Mercurial server that dropped ``hello`` | # 3. Remote is a future Mercurial server that dropped ``hello`` | ||||
| # and other attempted handshake mechanisms. | # and other attempted handshake mechanisms. | ||||
| if not caps: | if not caps: | ||||
| badresponse() | badresponse() | ||||
| return caps | return caps | ||||
| class sshpeer(wireproto.wirepeer): | class sshv1peer(wireproto.wirepeer): | ||||
| def __init__(self, ui, url, proc, stdin, stdout, stderr, caps): | def __init__(self, ui, url, proc, stdin, stdout, stderr, caps): | ||||
| """Create a peer from an existing SSH connection. | """Create a peer from an existing SSH connection. | ||||
| ``proc`` is a handle on the underlying SSH process. | ``proc`` is a handle on the underlying SSH process. | ||||
| ``stdin``, ``stdout``, and ``stderr`` are handles on the stdio | ``stdin``, ``stdout``, and ``stderr`` are handles on the stdio | ||||
| pipes for that process. | pipes for that process. | ||||
| ``caps`` is a set of capabilities supported by the remote. | ``caps`` is a set of capabilities supported by the remote. | ||||
| """ | """ | ||||
| remotepath, sshenv) | remotepath, sshenv) | ||||
| try: | try: | ||||
| caps = _performhandshake(ui, stdin, stdout, stderr) | caps = _performhandshake(ui, stdin, stdout, stderr) | ||||
| except Exception: | except Exception: | ||||
| _cleanuppipes(ui, stdout, stdin, stderr) | _cleanuppipes(ui, stdout, stdin, stderr) | ||||
| raise | raise | ||||
| return sshpeer(ui, path, proc, stdin, stdout, stderr, caps) | return sshv1peer(ui, path, proc, stdin, stdout, stderr, caps) | ||||
| 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(sshpeer.sshpeer(ui, 'ssh://localhost/foo', None, None, None, | checkobject(sshpeer.sshv1peer(ui, 'ssh://localhost/foo', 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() | ||||