mercurial-scm/hg-stable: mercurial/sshpeer.py annotate

annotate mercurial/sshpeer.py @ 25421:3dd3ccf7b807

sshpeer: introduce a "doublepipe" class This class is responsible for ensuring we still process the server output streamed through the ssh's 'stderr' pipe during the initial wait for other protocol streams. It currently only works on posix system because of its use of 'select.select'.

author	Pierre-Yves David <pierre-yves.david@fb.com>
date	Fri, 22 May 2015 10:48:11 -0500
parents	c88975a4d264
children	8dc5ee5b7b09

rev	line source
17192 1ac628cd7113 peer: introduce real peer classes Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 16688 diff changeset	1 # sshpeer.py - ssh repository proxy class for mercurial
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	2 #
2859 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2740 diff changeset	3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8210 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9878 diff changeset	6 # GNU General Public License version 2 or any later version.
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7
15622 86fc364ca5f8 sshrepo: don't quote obviously safe strings (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15581 diff changeset	8 import re
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	9 from i18n import _
14076 924c82157d46 url: move URL parsing functions into util to improve startup time Brodie Rao <brodie@bitheap.org> parents: 14004 diff changeset	10 import util, error, wireproto
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	11
6313 c5580db9c3aa remoterepo: no longer needed Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	12 class remotelock(object):
c5580db9c3aa remoterepo: no longer needed Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	13 def __init__(self, repo):
c5580db9c3aa remoterepo: no longer needed Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	14 self.repo = repo
c5580db9c3aa remoterepo: no longer needed Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	15 def release(self):
c5580db9c3aa remoterepo: no longer needed Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	16 self.repo.unlock()
c5580db9c3aa remoterepo: no longer needed Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	17 self.repo = None
c5580db9c3aa remoterepo: no longer needed Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	18 def __del__(self):
c5580db9c3aa remoterepo: no longer needed Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	19 if self.repo:
c5580db9c3aa remoterepo: no longer needed Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	20 self.release()
c5580db9c3aa remoterepo: no longer needed Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	21
15581 d8fa35c28335 ssh: quote remote paths (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15017 diff changeset	22 def _serverquote(s):
23671 e3f30068d2eb sshpeer: more thorough shell quoting Matt Mackall <mpm@selenic.com> parents: 22935 diff changeset	23 if not s:
e3f30068d2eb sshpeer: more thorough shell quoting Matt Mackall <mpm@selenic.com> parents: 22935 diff changeset	24 return s
15581 d8fa35c28335 ssh: quote remote paths (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15017 diff changeset	25 '''quote a string for the remote shell ... which we assume is sh'''
15624 be43234a6d60 sshrepo: add more safe characters (issue2983) Thomas Arendsen Hein <thomas@intevation.de> parents: 15622 diff changeset	26 if re.match('[a-zA-Z0-9@%_+=:,./-]*$', s):
15622 86fc364ca5f8 sshrepo: don't quote obviously safe strings (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15581 diff changeset	27 return s
15581 d8fa35c28335 ssh: quote remote paths (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15017 diff changeset	28 return "'%s'" % s.replace("'", "'\\''")
d8fa35c28335 ssh: quote remote paths (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15017 diff changeset	29
25244 cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	30 def _forwardoutput(ui, pipe):
cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	31 """display all data currently available on pipe as remote output.
cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	32
cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	33 This is non blocking."""
cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	34 s = util.readpipe(pipe)
cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	35 if s:
cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	36 for l in s.splitlines():
cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	37 ui.status(_("remote: "), l, '\n')
cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	38
25421 3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	39 class doublepipe(object):
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	40 """Operate a side-channel pipe in addition of a main one
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	41
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	42 The side-channel pipe contains server output to be forwarded to the user
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	43 input. The double pipe will behave as the "main" pipe, but will ensure the
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	44 content of the "side" pipe is properly processed while we wait for blocking
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	45 call on the "main" pipe.
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	46
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	47 If large amounts of data are read from "main", the forward will cease after
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	48 the first bytes start to appear. This simplifies the implementation
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	49 without affecting actual output of sshpeer too much as we rarely issue
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	50 large read for data not yet emitted by the server.
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	51
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	52 The main pipe is expected to be a 'bufferedinputpipe' from the util module
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	53 that handle all the os specific bites. This class lives in this module
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	54 because it focus on behavior specifig to the ssh protocol."""
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	55
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	56 def __init__(self, ui, main, side):
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	57 self._ui = ui
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	58 self._main = main
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	59 self._side = side
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	60
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	61 def _wait(self):
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	62 """wait until some data are available on main or side
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	63
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	64 return a pair of boolean (ismainready, issideready)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	65
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	66 (This will only wait for data if the setup is supported by `util.poll`)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	67 """
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	68 if self._main.hasbuffer:
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	69 return (True, True) # main has data, assume side is worth poking at.
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	70 fds = [self._main.fileno(), self._side.fileno()]
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	71 try:
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	72 act = util.poll(fds)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	73 except NotImplementedError:
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	74 # non supported yet case, assume all have data.
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	75 act = fds
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	76 return (self._main.fileno() in act, self._side.fileno() in act)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	77
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	78 def read(self, size):
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	79 return self._call('read', size)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	80
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	81 def readline(self):
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	82 return self._call('readline')
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	83
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	84 def _call(self, methname, size=None):
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	85 """call <methname> on "main", forward output of "side" while blocking
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	86 """
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	87 if size == 0 or self._main.closed:
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	88 _forwardoutput(self._ui, self._side)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	89 return ''
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	90 while True:
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	91 mainready, sideready = self._wait()
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	92 if sideready:
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	93 _forwardoutput(self._ui, self._side)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	94 if mainready:
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	95 meth = getattr(self._main, methname)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	96 if size is None:
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	97 return meth()
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	98 else:
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	99 return meth(size)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	100
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	101 def close(self):
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	102 return self._main.close()
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	103
17192 1ac628cd7113 peer: introduce real peer classes Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 16688 diff changeset	104 class sshpeer(wireproto.wirepeer):
14363 82f3b0f3f0a5 localrepo, sshrepo: use Boolean create argument in __init__ Martin Geisler <mg@lazybytes.net> parents: 14076 diff changeset	105 def __init__(self, ui, path, create=False):
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	106 self._url = path
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	107 self.ui = ui
16688 cfb6682961b8 cleanup: replace naked excepts with more specific ones Brodie Rao <brodie@sf.io> parents: 16683 diff changeset	108 self.pipeo = self.pipei = self.pipee = None
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	109
14076 924c82157d46 url: move URL parsing functions into util to improve startup time Brodie Rao <brodie@bitheap.org> parents: 14004 diff changeset	110 u = util.url(path, parsequery=False, parsefragment=False)
13819 d16894e29f91 httprepo/sshrepo: use url.url Brodie Rao <brodie@bitheap.org> parents: 13721 diff changeset	111 if u.scheme != 'ssh' or not u.host or u.path is None:
11590 0b15aee0a306 protocol: convert some ssh abort calls Matt Mackall <mpm@selenic.com> parents: 11589 diff changeset	112 self._abort(error.RepoError(_("couldn't parse location %s") % path))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	113
13819 d16894e29f91 httprepo/sshrepo: use url.url Brodie Rao <brodie@bitheap.org> parents: 13721 diff changeset	114 self.user = u.user
d16894e29f91 httprepo/sshrepo: use url.url Brodie Rao <brodie@bitheap.org> parents: 13721 diff changeset	115 if u.passwd is not None:
13464 da0ddd62b9d8 sshrepo: catch passwords in ssh urls Adrian Buehlmann <adrian@cadifra.com> parents: 13084 diff changeset	116 self._abort(error.RepoError(_("password in URL not supported")))
13819 d16894e29f91 httprepo/sshrepo: use url.url Brodie Rao <brodie@bitheap.org> parents: 13721 diff changeset	117 self.host = u.host
d16894e29f91 httprepo/sshrepo: use url.url Brodie Rao <brodie@bitheap.org> parents: 13721 diff changeset	118 self.port = u.port
d16894e29f91 httprepo/sshrepo: use url.url Brodie Rao <brodie@bitheap.org> parents: 13721 diff changeset	119 self.path = u.path or "."
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	120
961 3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 934 diff changeset	121 sshcmd = self.ui.config("ui", "ssh", "ssh")
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 934 diff changeset	122 remotecmd = self.ui.config("ui", "remotecmd", "hg")
2549 e1831f06eef1 Added ability to clone from a local repository to a (new) remote one. Sean Meiners <sean.meiners@linspire.com> parents: 2484 diff changeset	123
23671 e3f30068d2eb sshpeer: more thorough shell quoting Matt Mackall <mpm@selenic.com> parents: 22935 diff changeset	124 args = util.sshargs(sshcmd,
e3f30068d2eb sshpeer: more thorough shell quoting Matt Mackall <mpm@selenic.com> parents: 22935 diff changeset	125 _serverquote(self.host),
e3f30068d2eb sshpeer: more thorough shell quoting Matt Mackall <mpm@selenic.com> parents: 22935 diff changeset	126 _serverquote(self.user),
e3f30068d2eb sshpeer: more thorough shell quoting Matt Mackall <mpm@selenic.com> parents: 22935 diff changeset	127 _serverquote(self.port))
5644 e2e8e977a6cb win32: fix ssh://host:port when using Plink Steve Borho <steve@borho.org> parents: 5293 diff changeset	128
2549 e1831f06eef1 Added ability to clone from a local repository to a (new) remote one. Sean Meiners <sean.meiners@linspire.com> parents: 2484 diff changeset	129 if create:
15581 d8fa35c28335 ssh: quote remote paths (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15017 diff changeset	130 cmd = '%s %s %s' % (sshcmd, args,
d8fa35c28335 ssh: quote remote paths (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15017 diff changeset	131 util.shellquote("%s init %s" %
d8fa35c28335 ssh: quote remote paths (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15017 diff changeset	132 (_serverquote(remotecmd), _serverquote(self.path))))
20794 8b0e3a8982ea sshpeer: only print out 'running ssh' messages in debug mode (BC) Siddharth Agarwal <sid0@fb.com> parents: 19405 diff changeset	133 ui.debug('running %s\n' % cmd)
23270 41c03b7592ed util.system: use ui.system() in place of optional ui.fout parameter Yuya Nishihara <yuya@tcha.org> parents: 22935 diff changeset	134 res = ui.system(cmd)
2549 e1831f06eef1 Added ability to clone from a local repository to a (new) remote one. Sean Meiners <sean.meiners@linspire.com> parents: 2484 diff changeset	135 if res != 0:
11590 0b15aee0a306 protocol: convert some ssh abort calls Matt Mackall <mpm@selenic.com> parents: 11589 diff changeset	136 self._abort(error.RepoError(_("could not create remote repo")))
2549 e1831f06eef1 Added ability to clone from a local repository to a (new) remote one. Sean Meiners <sean.meiners@linspire.com> parents: 2484 diff changeset	137
19405 447332970d7b sshpeer: mark _validrepo internal Matt Mackall <mpm@selenic.com> parents: 18759 diff changeset	138 self._validaterepo(sshcmd, args, remotecmd)
2549 e1831f06eef1 Added ability to clone from a local repository to a (new) remote one. Sean Meiners <sean.meiners@linspire.com> parents: 2484 diff changeset	139
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	140 def url(self):
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	141 return self._url
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	142
19405 447332970d7b sshpeer: mark _validrepo internal Matt Mackall <mpm@selenic.com> parents: 18759 diff changeset	143 def _validaterepo(self, sshcmd, args, remotecmd):
3034 2b0bc36a48d8 sshrepo: flush stderr before connecting to the hg server Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2859 diff changeset	144 # cleanup up previous run
2b0bc36a48d8 sshrepo: flush stderr before connecting to the hg server Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2859 diff changeset	145 self.cleanup()
2b0bc36a48d8 sshrepo: flush stderr before connecting to the hg server Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2859 diff changeset	146
15581 d8fa35c28335 ssh: quote remote paths (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15017 diff changeset	147 cmd = '%s %s %s' % (sshcmd, args,
d8fa35c28335 ssh: quote remote paths (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15017 diff changeset	148 util.shellquote("%s -R %s serve --stdio" %
d8fa35c28335 ssh: quote remote paths (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15017 diff changeset	149 (_serverquote(remotecmd), _serverquote(self.path))))
20794 8b0e3a8982ea sshpeer: only print out 'running ssh' messages in debug mode (BC) Siddharth Agarwal <sid0@fb.com> parents: 19405 diff changeset	150 self.ui.debug('running %s\n' % cmd)
5292 5a65d870871d sshrepo: fix Windows command quoting Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5190 diff changeset	151 cmd = util.quotecommand(cmd)
18759 9baf4330d88f sshpeer: store subprocess so it cleans up correctly Durham Goode <durham@fb.com> parents: 17192 diff changeset	152
9baf4330d88f sshpeer: store subprocess so it cleans up correctly Durham Goode <durham@fb.com> parents: 17192 diff changeset	153 # while self.subprocess isn't used, having it allows the subprocess to
9baf4330d88f sshpeer: store subprocess so it cleans up correctly Durham Goode <durham@fb.com> parents: 17192 diff changeset	154 # to clean up correctly later
25408 c88975a4d264 sshpeer: run the ssh command unbuffered Pierre-Yves David <pierre-yves.david@fb.com> parents: 25407 diff changeset	155 #
c88975a4d264 sshpeer: run the ssh command unbuffered Pierre-Yves David <pierre-yves.david@fb.com> parents: 25407 diff changeset	156 # no buffer allow the use of 'select'
c88975a4d264 sshpeer: run the ssh command unbuffered Pierre-Yves David <pierre-yves.david@fb.com> parents: 25407 diff changeset	157 # feel free to remove buffering and select usage when we ultimately
c88975a4d264 sshpeer: run the ssh command unbuffered Pierre-Yves David <pierre-yves.david@fb.com> parents: 25407 diff changeset	158 # move to threading.
c88975a4d264 sshpeer: run the ssh command unbuffered Pierre-Yves David <pierre-yves.david@fb.com> parents: 25407 diff changeset	159 sub = util.popen4(cmd, bufsize=0)
c88975a4d264 sshpeer: run the ssh command unbuffered Pierre-Yves David <pierre-yves.david@fb.com> parents: 25407 diff changeset	160 self.pipeo, self.pipei, self.pipee, self.subprocess = sub
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	161
25407 e461230cc95b sshpeer: use a 'bufferedinputpipe' for standard output of the ssh process Pierre-Yves David <pierre-yves.david@fb.com> parents: 25244 diff changeset	162 self.pipei = util.bufferedinputpipe(self.pipei)
e461230cc95b sshpeer: use a 'bufferedinputpipe' for standard output of the ssh process Pierre-Yves David <pierre-yves.david@fb.com> parents: 25244 diff changeset	163
2028 1f1fc418a96c ssh: skip noise generated by remote shell Matt Mackall <mpm@selenic.com> parents: 2019 diff changeset	164 # skip any noise generated by remote shell
11589 e8d22fe2ddab protocol: clean up call-like functions in http and ssh clients Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	165 self._callstream("hello")
e8d22fe2ddab protocol: clean up call-like functions in http and ssh clients Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	166 r = self._callstream("between", pairs=("%s-%s" % ("0"40, "0"40)))
2420 144280f1578f ssh: gather initial output so we can do capability detection Matt Mackall <mpm@selenic.com> parents: 2230 diff changeset	167 lines = ["", "dummy"]
2046 d14497cbd668 Show remote ssh noise only with --debug and increase the limit to 500 lines. Thomas Arendsen Hein <thomas@intevation.de> parents: 2040 diff changeset	168 max_noise = 500
2420 144280f1578f ssh: gather initial output so we can do capability detection Matt Mackall <mpm@selenic.com> parents: 2230 diff changeset	169 while lines[-1] and max_noise:
144280f1578f ssh: gather initial output so we can do capability detection Matt Mackall <mpm@selenic.com> parents: 2230 diff changeset	170 l = r.readline()
2028 1f1fc418a96c ssh: skip noise generated by remote shell Matt Mackall <mpm@selenic.com> parents: 2019 diff changeset	171 self.readerr()
2420 144280f1578f ssh: gather initial output so we can do capability detection Matt Mackall <mpm@selenic.com> parents: 2230 diff changeset	172 if lines[-1] == "1\n" and l == "\n":
2028 1f1fc418a96c ssh: skip noise generated by remote shell Matt Mackall <mpm@selenic.com> parents: 2019 diff changeset	173 break
2420 144280f1578f ssh: gather initial output so we can do capability detection Matt Mackall <mpm@selenic.com> parents: 2230 diff changeset	174 if l:
19405 447332970d7b sshpeer: mark _validrepo internal Matt Mackall <mpm@selenic.com> parents: 18759 diff changeset	175 self.ui.debug("remote: ", l)
2420 144280f1578f ssh: gather initial output so we can do capability detection Matt Mackall <mpm@selenic.com> parents: 2230 diff changeset	176 lines.append(l)
2040 cd7711268774 Don't enter an endless loop if remote hg doesn't answer, show remote noise. Thomas Arendsen Hein <thomas@intevation.de> parents: 2028 diff changeset	177 max_noise -= 1
cd7711268774 Don't enter an endless loop if remote hg doesn't answer, show remote noise. Thomas Arendsen Hein <thomas@intevation.de> parents: 2028 diff changeset	178 else:
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 15624 diff changeset	179 self._abort(error.RepoError(_('no suitable response from '
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 15624 diff changeset	180 'remote hg')))
2028 1f1fc418a96c ssh: skip noise generated by remote shell Matt Mackall <mpm@selenic.com> parents: 2019 diff changeset	181
17192 1ac628cd7113 peer: introduce real peer classes Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 16688 diff changeset	182 self._caps = set()
8210 344751cd8cb8 replace various uses of list.reverse() Matt Mackall <mpm@selenic.com> parents: 8150 diff changeset	183 for l in reversed(lines):
2421 a1cfe679192c ssh: add capability detection at startup Matt Mackall <mpm@selenic.com> parents: 2420 diff changeset	184 if l.startswith("capabilities:"):
17192 1ac628cd7113 peer: introduce real peer classes Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 16688 diff changeset	185 self._caps.update(l[:-1].split(":")[1].split())
2421 a1cfe679192c ssh: add capability detection at startup Matt Mackall <mpm@selenic.com> parents: 2420 diff changeset	186 break
a1cfe679192c ssh: add capability detection at startup Matt Mackall <mpm@selenic.com> parents: 2420 diff changeset	187
17192 1ac628cd7113 peer: introduce real peer classes Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 16688 diff changeset	188 def _capabilities(self):
1ac628cd7113 peer: introduce real peer classes Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 16688 diff changeset	189 return self._caps
1ac628cd7113 peer: introduce real peer classes Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 16688 diff changeset	190
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	191 def readerr(self):
25244 cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	192 _forwardoutput(self.ui, self.pipee)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	193
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11369 diff changeset	194 def _abort(self, exception):
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11369 diff changeset	195 self.cleanup()
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11369 diff changeset	196 raise exception
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11369 diff changeset	197
3034 2b0bc36a48d8 sshrepo: flush stderr before connecting to the hg server Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2859 diff changeset	198 def cleanup(self):
16688 cfb6682961b8 cleanup: replace naked excepts with more specific ones Brodie Rao <brodie@sf.io> parents: 16683 diff changeset	199 if self.pipeo is None:
cfb6682961b8 cleanup: replace naked excepts with more specific ones Brodie Rao <brodie@sf.io> parents: 16683 diff changeset	200 return
cfb6682961b8 cleanup: replace naked excepts with more specific ones Brodie Rao <brodie@sf.io> parents: 16683 diff changeset	201 self.pipeo.close()
cfb6682961b8 cleanup: replace naked excepts with more specific ones Brodie Rao <brodie@sf.io> parents: 16683 diff changeset	202 self.pipei.close()
817 cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	203 try:
1358 20abfd48e21c Partially revert ssh change so we read all of remote ssh stream Matt Mackall <mpm@selenic.com> parents: 1357 diff changeset	204 # read the error descriptor until EOF
20abfd48e21c Partially revert ssh change so we read all of remote ssh stream Matt Mackall <mpm@selenic.com> parents: 1357 diff changeset	205 for l in self.pipee:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	206 self.ui.status(_("remote: "), l)
16688 cfb6682961b8 cleanup: replace naked excepts with more specific ones Brodie Rao <brodie@sf.io> parents: 16683 diff changeset	207 except (IOError, ValueError):
817 cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	208 pass
16688 cfb6682961b8 cleanup: replace naked excepts with more specific ones Brodie Rao <brodie@sf.io> parents: 16683 diff changeset	209 self.pipee.close()
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	210
3034 2b0bc36a48d8 sshrepo: flush stderr before connecting to the hg server Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2859 diff changeset	211 __del__ = cleanup
2b0bc36a48d8 sshrepo: flush stderr before connecting to the hg server Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2859 diff changeset	212
11589 e8d22fe2ddab protocol: clean up call-like functions in http and ssh clients Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	213 def _callstream(self, cmd, **args):
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 8563 diff changeset	214 self.ui.debug("sending %s command\n" % cmd)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	215 self.pipeo.write("%s\n" % cmd)
13721 3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	216 _func, names = wireproto.commands[cmd]
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	217 keys = names.split()
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	218 wireargs = {}
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	219 for k in keys:
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	220 if k == '*':
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	221 wireargs['*'] = args
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	222 break
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	223 else:
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	224 wireargs[k] = args[k]
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	225 del args[k]
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	226 for k, v in sorted(wireargs.iteritems()):
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	227 self.pipeo.write("%s %d\n" % (k, len(v)))
13721 3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	228 if isinstance(v, dict):
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	229 for dk, dv in v.iteritems():
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	230 self.pipeo.write("%s %d\n" % (dk, len(dv)))
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	231 self.pipeo.write(dv)
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	232 else:
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	233 self.pipeo.write(v)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	234 self.pipeo.flush()
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	235
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	236 return self.pipei
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	237
20905 167047ba3cfa wireproto: drop the _decompress method in favor a new call type Pierre-Yves David <pierre-yves.david@fb.com> parents: 20794 diff changeset	238 def _callcompressable(self, cmd, **args):
167047ba3cfa wireproto: drop the _decompress method in favor a new call type Pierre-Yves David <pierre-yves.david@fb.com> parents: 20794 diff changeset	239 return self._callstream(cmd, **args)
167047ba3cfa wireproto: drop the _decompress method in favor a new call type Pierre-Yves David <pierre-yves.david@fb.com> parents: 20794 diff changeset	240
11589 e8d22fe2ddab protocol: clean up call-like functions in http and ssh clients Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	241 def _call(self, cmd, **args):
e8d22fe2ddab protocol: clean up call-like functions in http and ssh clients Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	242 self._callstream(cmd, **args)
5978 7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	243 return self._recv()
7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	244
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	245 def _callpush(self, cmd, fp, **args):
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	246 r = self._call(cmd, **args)
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	247 if r:
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	248 return '', r
14494 1ffeeb91c55d check-code: flag 0/1 used as constant Boolean expression Martin Geisler <mg@lazybytes.net> parents: 14363 diff changeset	249 while True:
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	250 d = fp.read(4096)
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	251 if not d:
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	252 break
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	253 self._send(d)
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	254 self._send("", flush=True)
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	255 r = self._recv()
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	256 if r:
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	257 return '', r
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	258 return self._recv(), ''
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	259
21073 83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	260 def _calltwowaystream(self, cmd, fp, **args):
83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	261 r = self._call(cmd, **args)
83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	262 if r:
83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	263 # XXX needs to be made better
83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	264 raise util.Abort('unexpected remote reply: %s' % r)
83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	265 while True:
83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	266 d = fp.read(4096)
83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	267 if not d:
83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	268 break
83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	269 self._send(d)
83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	270 self._send("", flush=True)
83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	271 return self.pipei
11591 0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11590 diff changeset	272
5978 7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	273 def _recv(self):
7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	274 l = self.pipei.readline()
15017 f4522df38c65 wireproto: add out-of-band error class to allow remote repo to report errors Andrew Pritchard <andrewp@fogcreek.com> parents: 14537 diff changeset	275 if l == '\n':
25243 d65243d28749 sshpeer: break "OutOfBandError" feature for ssh (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23684 diff changeset	276 self.readerr()
d65243d28749 sshpeer: break "OutOfBandError" feature for ssh (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23684 diff changeset	277 msg = _('check previous remote output')
d65243d28749 sshpeer: break "OutOfBandError" feature for ssh (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23684 diff changeset	278 self._abort(error.OutOfBandError(hint=msg))
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	279 self.readerr()
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	280 try:
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	281 l = int(l)
14004 97ed99d1f419 eliminate various naked except clauses Idan Kamara <idankk86@gmail.com> parents: 13827 diff changeset	282 except ValueError:
11590 0b15aee0a306 protocol: convert some ssh abort calls Matt Mackall <mpm@selenic.com> parents: 11589 diff changeset	283 self._abort(error.ResponseError(_("unexpected response:"), l))
5978 7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	284 return self.pipei.read(l)
7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	285
7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	286 def _send(self, data, flush=False):
7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	287 self.pipeo.write("%d\n" % len(data))
7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	288 if data:
7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	289 self.pipeo.write(data)
7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	290 if flush:
7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	291 self.pipeo.flush()
7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	292 self.readerr()
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	293
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	294 def lock(self):
11589 e8d22fe2ddab protocol: clean up call-like functions in http and ssh clients Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	295 self._call("lock")
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	296 return remotelock(self)
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	297
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	298 def unlock(self):
11589 e8d22fe2ddab protocol: clean up call-like functions in http and ssh clients Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	299 self._call("unlock")
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	300
14537 3c7907dc95ca sshrepo: fix addchangegroup's signature Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14494 diff changeset	301 def addchangegroup(self, cg, source, url, lock=None):
11153 9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 10282 diff changeset	302 '''Send a changegroup to the remote server. Return an integer
9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 10282 diff changeset	303 similar to unbundle(). DEPRECATED, since it requires locking the
9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 10282 diff changeset	304 remote.'''
11589 e8d22fe2ddab protocol: clean up call-like functions in http and ssh clients Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	305 d = self._call("addchangegroup")
639 31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	306 if d:
11590 0b15aee0a306 protocol: convert some ssh abort calls Matt Mackall <mpm@selenic.com> parents: 11589 diff changeset	307 self._abort(error.RepoError(_("push refused: %s") % d))
14494 1ffeeb91c55d check-code: flag 0/1 used as constant Boolean expression Martin Geisler <mg@lazybytes.net> parents: 14363 diff changeset	308 while True:
639 31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	309 d = cg.read(4096)
5978 7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	310 if not d:
7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	311 break
639 31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	312 self.pipeo.write(d)
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	313 self.readerr()
639 31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	314
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	315 self.pipeo.flush()
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	316
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	317 self.readerr()
5978 7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	318 r = self._recv()
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	319 if not r:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	320 return 1
5978 7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	321 try:
7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	322 return int(r)
14004 97ed99d1f419 eliminate various naked except clauses Idan Kamara <idankk86@gmail.com> parents: 13827 diff changeset	323 except ValueError:
11590 0b15aee0a306 protocol: convert some ssh abort calls Matt Mackall <mpm@selenic.com> parents: 11589 diff changeset	324 self._abort(error.ResponseError(_("unexpected response:"), r))
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2549 diff changeset	325
17192 1ac628cd7113 peer: introduce real peer classes Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 16688 diff changeset	326 instance = sshpeer

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/sshpeer.py @ 25421:3dd3ccf7b807