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

annotate mercurial/wireproto.py @ 16535:39d1f83eb05d stable

branchmap: server should not advertise secret changeset in branchmap (Issue3303) Discovery now use an overlay above branchmap to prune invisible "secret" changeset from branchmap. To minimise impact on the code during the code freeze, this is achieve by recomputing non-secret heads on the fly when any secret changeset exists. This is a computation heavy approach similar to the one used for visible heads. But few sever should contains secret changeset anyway. See comment in code for more robust approach. On local repo the wrapper is applied explicitly while the wire-protocol take care of wrapping branchmap call in a transparent way. This could be unified by the Peter Arrenbrecht and Sune Foldager proposal of a `peer` object. An inappropriate `(+i heads)` may still appear when pushing new changes on a repository with secret changeset. (see Issue3394 for details)

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
date	Tue, 24 Apr 2012 16:32:44 +0200
parents	9eba72cdde34
children	525fdb738975

rev	line source
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	1 # wireproto.py - generic wire protocol support functions
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	2 #
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	3 # Copyright 2005-2010 Matt Mackall <mpm@selenic.com>
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	4 #
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	7
11879 4e804302d30c fix undefined variables, spotted by pylint Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11627 diff changeset	8 import urllib, tempfile, os, sys
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	9 from i18n import _
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	10 from node import bin, hex
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	11 import changegroup as changegroupmod
11627 04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	12 import repo, error, encoding, util, store
15713 cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15652 diff changeset	13 import phases
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	14
14621 84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	15 # abstract batching support
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	16
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	17 class future(object):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	18 '''placeholder for a value to be set later'''
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	19 def set(self, value):
14970 592e45b7d43e wireproto: use safehasattr or getattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14623 diff changeset	20 if util.safehasattr(self, 'value'):
14621 84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	21 raise error.RepoError("future is already set")
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	22 self.value = value
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	23
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	24 class batcher(object):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	25 '''base class for batches of commands submittable in a single request
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	26
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	27 All methods invoked on instances of this class are simply queued and return a
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	28 a future for the result. Once you call submit(), all the queued calls are
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	29 performed and the results set in their respective futures.
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	30 '''
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	31 def __init__(self):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	32 self.calls = []
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	33 def __getattr__(self, name):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	34 def call(args, *opts):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	35 resref = future()
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	36 self.calls.append((name, args, opts, resref,))
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	37 return resref
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	38 return call
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	39 def submit(self):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	40 pass
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	41
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	42 class localbatch(batcher):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	43 '''performs the queued calls directly'''
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	44 def __init__(self, local):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	45 batcher.__init__(self)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	46 self.local = local
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	47 def submit(self):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	48 for name, args, opts, resref in self.calls:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	49 resref.set(getattr(self.local, name)(args, *opts))
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	50
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	51 class remotebatch(batcher):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	52 '''batches the queued calls; uses as few roundtrips as possible'''
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	53 def __init__(self, remote):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	54 '''remote must support _submitbatch(encbatch) and _submitone(op, encargs)'''
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	55 batcher.__init__(self)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	56 self.remote = remote
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	57 def submit(self):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	58 req, rsp = [], []
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	59 for name, args, opts, resref in self.calls:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	60 mtd = getattr(self.remote, name)
14970 592e45b7d43e wireproto: use safehasattr or getattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14623 diff changeset	61 batchablefn = getattr(mtd, 'batchable', None)
592e45b7d43e wireproto: use safehasattr or getattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14623 diff changeset	62 if batchablefn is not None:
592e45b7d43e wireproto: use safehasattr or getattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14623 diff changeset	63 batchable = batchablefn(mtd.im_self, args, *opts)
14621 84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	64 encargsorres, encresref = batchable.next()
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	65 if encresref:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	66 req.append((name, encargsorres,))
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	67 rsp.append((batchable, encresref, resref,))
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	68 else:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	69 resref.set(encargsorres)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	70 else:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	71 if req:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	72 self._submitreq(req, rsp)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	73 req, rsp = [], []
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	74 resref.set(mtd(args, *opts))
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	75 if req:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	76 self._submitreq(req, rsp)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	77 def _submitreq(self, req, rsp):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	78 encresults = self.remote._submitbatch(req)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	79 for encres, r in zip(encresults, rsp):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	80 batchable, encresref, resref = r
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	81 encresref.set(encres)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	82 resref.set(batchable.next())
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	83
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	84 def batchable(f):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	85 '''annotation for batchable methods
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	86
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	87 Such methods must implement a coroutine as follows:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	88
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	89 @batchable
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	90 def sample(self, one, two=None):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	91 # Handle locally computable results first:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	92 if not one:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	93 yield "a local result", None
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	94 # Build list of encoded arguments suitable for your wire protocol:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	95 encargs = [('one', encode(one),), ('two', encode(two),)]
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	96 # Create future for injection of encoded result:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	97 encresref = future()
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	98 # Return encoded arguments and future:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	99 yield encargs, encresref
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	100 # Assuming the future to be filled with the result from the batched request
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	101 # now. Decode it:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	102 yield decode(encresref.value)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	103
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	104 The decorator returns a function which wraps this coroutine as a plain method,
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	105 but adds the original method as an attribute called "batchable", which is
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	106 used by remotebatch to split the call into separate encoding and decoding
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	107 phases.
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	108 '''
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	109 def plain(args, *opts):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	110 batchable = f(args, *opts)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	111 encargsorres, encresref = batchable.next()
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	112 if not encresref:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	113 return encargsorres # a local result in this case
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	114 self = args[0]
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	115 encresref.set(self._submitone(f.func_name, encargsorres))
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	116 return batchable.next()
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	117 setattr(plain, 'batchable', f)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	118 return plain
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	119
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	120 # list of nodes encoding / decoding
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	121
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	122 def decodelist(l, sep=' '):
13722 f4a85acef50c wireproto: fix decodelist to properly return empty list Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13721 diff changeset	123 if l:
f4a85acef50c wireproto: fix decodelist to properly return empty list Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13721 diff changeset	124 return map(bin, l.split(sep))
f4a85acef50c wireproto: fix decodelist to properly return empty list Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13721 diff changeset	125 return []
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	126
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	127 def encodelist(l, sep=' '):
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	128 return sep.join(map(hex, l))
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	129
14622 bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	130 # batched call argument encoding
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	131
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	132 def escapearg(plain):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	133 return (plain
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	134 .replace(':', '::')
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	135 .replace(',', ':,')
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	136 .replace(';', ':;')
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	137 .replace('=', ':='))
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	138
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	139 def unescapearg(escaped):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	140 return (escaped
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	141 .replace(':=', '=')
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	142 .replace(':;', ';')
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	143 .replace(':,', ',')
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	144 .replace('::', ':'))
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	145
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	146 # client side
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	147
14622 bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	148 def todict(**args):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	149 return args
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	150
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	151 class wirerepository(repo.repository):
14622 bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	152
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	153 def batch(self):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	154 return remotebatch(self)
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	155 def _submitbatch(self, req):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	156 cmds = []
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	157 for op, argsdict in req:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	158 args = ','.join('%s=%s' % p for p in argsdict.iteritems())
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	159 cmds.append('%s %s' % (op, args))
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	160 rsp = self._call("batch", cmds=';'.join(cmds))
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	161 return rsp.split(';')
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	162 def _submitone(self, op, args):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	163 return self._call(op, **args)
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	164
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	165 @batchable
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	166 def lookup(self, key):
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	167 self.requirecap('lookup', _('look up remote revision'))
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	168 f = future()
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	169 yield todict(key=encoding.fromlocal(key)), f
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	170 d = f.value
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	171 success, data = d[:-1].split(" ", 1)
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	172 if int(success):
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	173 yield bin(data)
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	174 self._abort(error.RepoError(data))
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	175
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	176 @batchable
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	177 def heads(self):
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	178 f = future()
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	179 yield {}, f
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	180 d = f.value
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	181 try:
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	182 yield decodelist(d[:-1])
13726 378522bdc059 wireproto: avoid naked excepts Matt Mackall <mpm@selenic.com> parents: 13723 diff changeset	183 except ValueError:
11879 4e804302d30c fix undefined variables, spotted by pylint Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11627 diff changeset	184 self._abort(error.ResponseError(_("unexpected response:"), d))
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	185
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	186 @batchable
13723 e615765fdcc7 wireproto: add known([id]) function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13722 diff changeset	187 def known(self, nodes):
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	188 f = future()
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	189 yield todict(nodes=encodelist(nodes)), f
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	190 d = f.value
13723 e615765fdcc7 wireproto: add known([id]) function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13722 diff changeset	191 try:
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	192 yield [bool(int(f)) for f in d]
13726 378522bdc059 wireproto: avoid naked excepts Matt Mackall <mpm@selenic.com> parents: 13723 diff changeset	193 except ValueError:
13723 e615765fdcc7 wireproto: add known([id]) function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13722 diff changeset	194 self._abort(error.ResponseError(_("unexpected response:"), d))
e615765fdcc7 wireproto: add known([id]) function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13722 diff changeset	195
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	196 @batchable
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	197 def branchmap(self):
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	198 f = future()
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	199 yield {}, f
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	200 d = f.value
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	201 try:
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	202 branchmap = {}
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	203 for branchpart in d.splitlines():
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	204 branchname, branchheads = branchpart.split(' ', 1)
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 12703 diff changeset	205 branchname = encoding.tolocal(urllib.unquote(branchname))
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	206 branchheads = decodelist(branchheads)
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	207 branchmap[branchname] = branchheads
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	208 yield branchmap
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	209 except TypeError:
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	210 self._abort(error.ResponseError(_("unexpected response:"), d))
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	211
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	212 def branches(self, nodes):
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	213 n = encodelist(nodes)
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	214 d = self._call("branches", nodes=n)
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	215 try:
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	216 br = [tuple(decodelist(b)) for b in d.splitlines()]
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	217 return br
13726 378522bdc059 wireproto: avoid naked excepts Matt Mackall <mpm@selenic.com> parents: 13723 diff changeset	218 except ValueError:
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	219 self._abort(error.ResponseError(_("unexpected response:"), d))
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	220
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	221 def between(self, pairs):
11587 a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11586 diff changeset	222 batch = 8 # avoid giant requests
a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11586 diff changeset	223 r = []
a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11586 diff changeset	224 for i in xrange(0, len(pairs), batch):
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	225 n = " ".join([encodelist(p, '-') for p in pairs[i:i + batch]])
11587 a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11586 diff changeset	226 d = self._call("between", pairs=n)
a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11586 diff changeset	227 try:
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	228 r.extend(l and decodelist(l) or [] for l in d.splitlines())
13726 378522bdc059 wireproto: avoid naked excepts Matt Mackall <mpm@selenic.com> parents: 13723 diff changeset	229 except ValueError:
11587 a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11586 diff changeset	230 self._abort(error.ResponseError(_("unexpected response:"), d))
a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11586 diff changeset	231 return r
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	232
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	233 @batchable
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	234 def pushkey(self, namespace, key, old, new):
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	235 if not self.capable('pushkey'):
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	236 yield False, None
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	237 f = future()
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	238 yield todict(namespace=encoding.fromlocal(namespace),
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	239 key=encoding.fromlocal(key),
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	240 old=encoding.fromlocal(old),
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	241 new=encoding.fromlocal(new)), f
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	242 d = f.value
15652 ca6accdad79c wireproto: handle other server output in pushkey Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15585 diff changeset	243 d, output = d.split('\n', 1)
13450 b3f9af7c22c5 wireproto: catch possible cast error in pushkey David Soria Parra <dsp@php.net> parents: 13050 diff changeset	244 try:
b3f9af7c22c5 wireproto: catch possible cast error in pushkey David Soria Parra <dsp@php.net> parents: 13050 diff changeset	245 d = bool(int(d))
b3f9af7c22c5 wireproto: catch possible cast error in pushkey David Soria Parra <dsp@php.net> parents: 13050 diff changeset	246 except ValueError:
b3f9af7c22c5 wireproto: catch possible cast error in pushkey David Soria Parra <dsp@php.net> parents: 13050 diff changeset	247 raise error.ResponseError(
b3f9af7c22c5 wireproto: catch possible cast error in pushkey David Soria Parra <dsp@php.net> parents: 13050 diff changeset	248 _('push failed (unexpected response):'), d)
15652 ca6accdad79c wireproto: handle other server output in pushkey Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15585 diff changeset	249 for l in output.splitlines(True):
ca6accdad79c wireproto: handle other server output in pushkey Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15585 diff changeset	250 self.ui.status(_('remote: '), l)
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	251 yield d
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	252
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	253 @batchable
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	254 def listkeys(self, namespace):
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	255 if not self.capable('pushkey'):
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	256 yield {}, None
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	257 f = future()
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	258 yield todict(namespace=encoding.fromlocal(namespace)), f
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	259 d = f.value
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	260 r = {}
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	261 for l in d.splitlines():
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	262 k, v = l.split('\t')
13050 3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	263 r[encoding.tolocal(k)] = encoding.tolocal(v)
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	264 yield r
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	265
11588 8a1f625e971d protocol: unify stream_out client code Matt Mackall <mpm@selenic.com> parents: 11587 diff changeset	266 def stream_out(self):
8a1f625e971d protocol: unify stream_out client code Matt Mackall <mpm@selenic.com> parents: 11587 diff changeset	267 return self._callstream('stream_out')
8a1f625e971d protocol: unify stream_out client code Matt Mackall <mpm@selenic.com> parents: 11587 diff changeset	268
11591 0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	269 def changegroup(self, nodes, kind):
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	270 n = encodelist(nodes)
11591 0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	271 f = self._callstream("changegroup", roots=n)
12337 6a6149487817 bundle: encapsulate all bundle streams in unbundle class Matt Mackall <mpm@selenic.com> parents: 12296 diff changeset	272 return changegroupmod.unbundle10(self._decompress(f), 'UN')
11591 0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	273
0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	274 def changegroupsubset(self, bases, heads, kind):
0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	275 self.requirecap('changegroupsubset', _('look up remote changes'))
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	276 bases = encodelist(bases)
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	277 heads = encodelist(heads)
12337 6a6149487817 bundle: encapsulate all bundle streams in unbundle class Matt Mackall <mpm@selenic.com> parents: 12296 diff changeset	278 f = self._callstream("changegroupsubset",
6a6149487817 bundle: encapsulate all bundle streams in unbundle class Matt Mackall <mpm@selenic.com> parents: 12296 diff changeset	279 bases=bases, heads=heads)
6a6149487817 bundle: encapsulate all bundle streams in unbundle class Matt Mackall <mpm@selenic.com> parents: 12296 diff changeset	280 return changegroupmod.unbundle10(self._decompress(f), 'UN')
11591 0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	281
13741 b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	282 def getbundle(self, source, heads=None, common=None):
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	283 self.requirecap('getbundle', _('look up remote changes'))
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	284 opts = {}
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	285 if heads is not None:
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	286 opts['heads'] = encodelist(heads)
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	287 if common is not None:
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	288 opts['common'] = encodelist(common)
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	289 f = self._callstream("getbundle", **opts)
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	290 return changegroupmod.unbundle10(self._decompress(f), 'UN')
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	291
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	292 def unbundle(self, cg, heads, source):
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	293 '''Send cg (a readable file-like object representing the
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	294 changegroup to push, typically a chunkbuffer object) to the
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	295 remote server as a bundle. Return an integer indicating the
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	296 result of the push (see localrepository.addchangegroup()).'''
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	297
14419 ede7cea1550f wireproto: do not hash when heads == ['force'] Martin Geisler <mg@aragost.com> parents: 14093 diff changeset	298 if heads != ['force'] and self.capable('unbundlehash'):
13942 88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	299 heads = encodelist(['hashed',
88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	300 util.sha1(''.join(sorted(heads))).digest()])
88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	301 else:
88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	302 heads = encodelist(heads)
88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	303
88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	304 ret, output = self._callpush("unbundle", cg, heads=heads)
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	305 if ret == "":
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	306 raise error.ResponseError(
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	307 _('push failed:'), output)
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	308 try:
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	309 ret = int(ret)
12063 516b000fbb7e cleanup: remove unused variables Brodie Rao <brodie@bitheap.org> parents: 12042 diff changeset	310 except ValueError:
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	311 raise error.ResponseError(
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	312 _('push failed (unexpected response):'), ret)
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	313
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	314 for l in output.splitlines(True):
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	315 self.ui.status(_('remote: '), l)
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	316 return ret
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	317
14048 58e58406ed19 wireproto: add test for new optional arg missing on server Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13942 diff changeset	318 def debugwireargs(self, one, two, three=None, four=None, five=None):
13720 9c4e04fe267e debug: add debugwireargs to test argument passing over the wire Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13450 diff changeset	319 # don't pass optional arguments left at their default value
9c4e04fe267e debug: add debugwireargs to test argument passing over the wire Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13450 diff changeset	320 opts = {}
9c4e04fe267e debug: add debugwireargs to test argument passing over the wire Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13450 diff changeset	321 if three is not None:
9c4e04fe267e debug: add debugwireargs to test argument passing over the wire Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13450 diff changeset	322 opts['three'] = three
9c4e04fe267e debug: add debugwireargs to test argument passing over the wire Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13450 diff changeset	323 if four is not None:
9c4e04fe267e debug: add debugwireargs to test argument passing over the wire Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13450 diff changeset	324 opts['four'] = four
9c4e04fe267e debug: add debugwireargs to test argument passing over the wire Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13450 diff changeset	325 return self._call('debugwireargs', one=one, two=two, **opts)
9c4e04fe267e debug: add debugwireargs to test argument passing over the wire Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13450 diff changeset	326
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	327 # server side
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	328
11625 cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	329 class streamres(object):
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	330 def __init__(self, gen):
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	331 self.gen = gen
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	332
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	333 class pushres(object):
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	334 def __init__(self, res):
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	335 self.res = res
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	336
12703 40bb5853fc4b wireproto: introduce pusherr() to deal with "unsynced changes" error Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12702 diff changeset	337 class pusherr(object):
40bb5853fc4b wireproto: introduce pusherr() to deal with "unsynced changes" error Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12702 diff changeset	338 def __init__(self, res):
40bb5853fc4b wireproto: introduce pusherr() to deal with "unsynced changes" error Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12702 diff changeset	339 self.res = res
40bb5853fc4b wireproto: introduce pusherr() to deal with "unsynced changes" error Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12702 diff changeset	340
15017 f4522df38c65 wireproto: add out-of-band error class to allow remote repo to report errors Andrew Pritchard <andrewp@fogcreek.com> parents: 14970 diff changeset	341 class ooberror(object):
f4522df38c65 wireproto: add out-of-band error class to allow remote repo to report errors Andrew Pritchard <andrewp@fogcreek.com> parents: 14970 diff changeset	342 def __init__(self, message):
f4522df38c65 wireproto: add out-of-band error class to allow remote repo to report errors Andrew Pritchard <andrewp@fogcreek.com> parents: 14970 diff changeset	343 self.message = message
f4522df38c65 wireproto: add out-of-band error class to allow remote repo to report errors Andrew Pritchard <andrewp@fogcreek.com> parents: 14970 diff changeset	344
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	345 def dispatch(repo, proto, command):
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	346 func, spec = commands[command]
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	347 args = proto.getargs(spec)
11625 cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	348 return func(repo, proto, *args)
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	349
13721 3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	350 def options(cmd, keys, others):
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	351 opts = {}
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	352 for k in keys:
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	353 if k in others:
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	354 opts[k] = others[k]
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	355 del others[k]
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	356 if others:
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	357 sys.stderr.write("abort: %s got unexpected arguments %s\n"
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	358 % (cmd, ",".join(others)))
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	359 return opts
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	360
14622 bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	361 def batch(repo, proto, cmds, others):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	362 res = []
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	363 for pair in cmds.split(';'):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	364 op, args = pair.split(' ', 1)
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	365 vals = {}
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	366 for a in args.split(','):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	367 if a:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	368 n, v = a.split('=')
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	369 vals[n] = unescapearg(v)
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	370 func, spec = commands[op]
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	371 if spec:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	372 keys = spec.split()
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	373 data = {}
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	374 for k in keys:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	375 if k == '*':
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	376 star = {}
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	377 for key in vals.keys():
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	378 if key not in keys:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	379 star[key] = vals[key]
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	380 data['*'] = star
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	381 else:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	382 data[k] = vals[k]
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	383 result = func(repo, proto, *[data[k] for k in keys])
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	384 else:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	385 result = func(repo, proto)
15017 f4522df38c65 wireproto: add out-of-band error class to allow remote repo to report errors Andrew Pritchard <andrewp@fogcreek.com> parents: 14970 diff changeset	386 if isinstance(result, ooberror):
f4522df38c65 wireproto: add out-of-band error class to allow remote repo to report errors Andrew Pritchard <andrewp@fogcreek.com> parents: 14970 diff changeset	387 return result
14622 bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	388 res.append(escapearg(result))
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	389 return ';'.join(res)
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	390
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	391 def between(repo, proto, pairs):
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	392 pairs = [decodelist(p, '-') for p in pairs.split(" ")]
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	393 r = []
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	394 for b in repo.between(pairs):
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	395 r.append(encodelist(b) + "\n")
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	396 return "".join(r)
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	397
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	398 def branchmap(repo, proto):
16535 39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16532 diff changeset	399 branchmap = phases.visiblebranchmap(repo)
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	400 heads = []
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	401 for branch, nodes in branchmap.iteritems():
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 12703 diff changeset	402 branchname = urllib.quote(encoding.fromlocal(branch))
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	403 branchnodes = encodelist(nodes)
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	404 heads.append('%s %s' % (branchname, branchnodes))
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	405 return '\n'.join(heads)
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	406
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	407 def branches(repo, proto, nodes):
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	408 nodes = decodelist(nodes)
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	409 r = []
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	410 for b in repo.branches(nodes):
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	411 r.append(encodelist(b) + "\n")
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	412 return "".join(r)
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	413
11594 67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	414 def capabilities(repo, proto):
13942 88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	415 caps = ('lookup changegroupsubset branchmap pushkey known getbundle '
14622 bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	416 'unbundlehash batch').split()
11627 04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	417 if _allowstream(repo.ui):
16361 6097ede2be4d protocol: Add the stream-preferred capability Benoit Allard <benoit@aeteurope.nl> parents: 15925 diff changeset	418 if repo.ui.configbool('server', 'preferuncompressed', False):
6097ede2be4d protocol: Add the stream-preferred capability Benoit Allard <benoit@aeteurope.nl> parents: 15925 diff changeset	419 caps.append('stream-preferred')
12296 d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12085 diff changeset	420 requiredformats = repo.requirements & repo.supportedformats
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12085 diff changeset	421 # if our local revlogs are just revlogv1, add 'stream' cap
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12085 diff changeset	422 if not requiredformats - set(('revlogv1',)):
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12085 diff changeset	423 caps.append('stream')
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12085 diff changeset	424 # otherwise, add 'streamreqs' detailing our local revlog format
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12085 diff changeset	425 else:
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12085 diff changeset	426 caps.append('streamreqs=%s' % ','.join(requiredformats))
11594 67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	427 caps.append('unbundle=%s' % ','.join(changegroupmod.bundlepriority))
14093 ce99d887585f httprepo: long arguments support (issue2126) Steven Brown <StevenGBrown@gmail.com> parents: 14064 diff changeset	428 caps.append('httpheader=1024')
11594 67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	429 return ' '.join(caps)
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	430
11584 1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	431 def changegroup(repo, proto, roots):
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	432 nodes = decodelist(roots)
11584 1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	433 cg = repo.changegroup(nodes, 'serve')
11625 cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	434 return streamres(proto.groupchunks(cg))
11584 1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	435
1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	436 def changegroupsubset(repo, proto, bases, heads):
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	437 bases = decodelist(bases)
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	438 heads = decodelist(heads)
11584 1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	439 cg = repo.changegroupsubset(bases, heads, 'serve')
11625 cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	440 return streamres(proto.groupchunks(cg))
11584 1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	441
13721 3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	442 def debugwireargs(repo, proto, one, two, others):
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	443 # only accept optional args from the known set
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	444 opts = options('debugwireargs', ['three', 'four'], others)
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	445 return repo.debugwireargs(one, two, **opts)
13720 9c4e04fe267e debug: add debugwireargs to test argument passing over the wire Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13450 diff changeset	446
13741 b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	447 def getbundle(repo, proto, others):
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	448 opts = options('getbundle', ['heads', 'common'], others)
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	449 for k, v in opts.iteritems():
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	450 opts[k] = decodelist(v)
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	451 cg = repo.getbundle('serve', **opts)
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	452 return streamres(proto.groupchunks(cg))
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	453
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	454 def heads(repo, proto):
15713 cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15652 diff changeset	455 h = phases.visibleheads(repo)
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	456 return encodelist(h) + "\n"
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	457
11594 67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	458 def hello(repo, proto):
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	459 '''the hello command returns a set of lines describing various
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	460 interesting things about the server, in an RFC822-like format.
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	461 Currently the only one defined is "capabilities", which
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	462 consists of a line in the form:
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	463
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	464 capabilities: space separated list of tokens
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	465 '''
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	466 return "capabilities: %s\n" % (capabilities(repo, proto))
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	467
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	468 def listkeys(repo, proto, namespace):
15217 42d0d4f63bf0 wireproto: do not call pushkey module directly (issue3041) Andreas Freimuth <andreas.freimuth@united-bits.de> parents: 15017 diff changeset	469 d = repo.listkeys(encoding.tolocal(namespace)).items()
13050 3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	470 t = '\n'.join(['%s\t%s' % (encoding.fromlocal(k), encoding.fromlocal(v))
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	471 for k, v in d])
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	472 return t
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	473
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	474 def lookup(repo, proto, key):
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	475 try:
15925 f9fc46698352 wireproto: refuse to lookup secret csets Matt Mackall <mpm@selenic.com> parents: 15713 diff changeset	476 k = encoding.tolocal(key)
f9fc46698352 wireproto: refuse to lookup secret csets Matt Mackall <mpm@selenic.com> parents: 15713 diff changeset	477 c = repo[k]
f9fc46698352 wireproto: refuse to lookup secret csets Matt Mackall <mpm@selenic.com> parents: 15713 diff changeset	478 if c.phase() == phases.secret:
f9fc46698352 wireproto: refuse to lookup secret csets Matt Mackall <mpm@selenic.com> parents: 15713 diff changeset	479 raise error.RepoLookupError(_("unknown revision '%s'") % k)
f9fc46698352 wireproto: refuse to lookup secret csets Matt Mackall <mpm@selenic.com> parents: 15713 diff changeset	480 r = c.hex()
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	481 success = 1
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	482 except Exception, inst:
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	483 r = str(inst)
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	484 success = 0
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	485 return "%s %s\n" % (success, r)
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	486
14436 5adb52524779 wireproto: enable optional args for known() for future extensibility Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14419 diff changeset	487 def known(repo, proto, nodes, others):
13723 e615765fdcc7 wireproto: add known([id]) function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13722 diff changeset	488 return ''.join(b and "1" or "0" for b in repo.known(decodelist(nodes)))
e615765fdcc7 wireproto: add known([id]) function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13722 diff changeset	489
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	490 def pushkey(repo, proto, namespace, key, old, new):
13050 3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	491 # compatibility with pre-1.8 clients which were accidentally
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	492 # sending raw binary nodes rather than utf-8-encoded hex
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	493 if len(new) == 20 and new.encode('string-escape') != new:
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	494 # looks like it could be a binary node
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	495 try:
14064 e4bfb9c337f3 remove unused imports and variables Alexander Solovyov <alexander@solovyov.net> parents: 14048 diff changeset	496 new.decode('utf-8')
13050 3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	497 new = encoding.tolocal(new) # but cleanly decodes as UTF-8
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	498 except UnicodeDecodeError:
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	499 pass # binary, leave unmodified
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	500 else:
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	501 new = encoding.tolocal(new) # normal path
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	502
15217 42d0d4f63bf0 wireproto: do not call pushkey module directly (issue3041) Andreas Freimuth <andreas.freimuth@united-bits.de> parents: 15017 diff changeset	503 r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key),
42d0d4f63bf0 wireproto: do not call pushkey module directly (issue3041) Andreas Freimuth <andreas.freimuth@united-bits.de> parents: 15017 diff changeset	504 encoding.tolocal(old), new)
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	505 return '%s\n' % int(r)
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	506
11627 04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	507 def _allowstream(ui):
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	508 return ui.configbool('server', 'uncompressed', True, untrusted=True)
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	509
11585 5d907fbb9703 protocol: unify stream_out command Matt Mackall <mpm@selenic.com> parents: 11584 diff changeset	510 def stream(repo, proto):
11627 04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	511 '''If the server supports streaming clone, it advertises the "stream"
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	512 capability with a value representing the version and flags of the repo
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	513 it is serving. Client checks to see if it understands the format.
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	514
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	515 The format is simple: the server writes out a line with the amount
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	516 of files, then the total amount of bytes to be transfered (separated
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	517 by a space). Then, for each file, the server first writes the filename
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	518 and filesize (separated by the null character), then the file contents.
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	519 '''
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	520
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	521 if not _allowstream(repo.ui):
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	522 return '1\n'
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	523
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	524 entries = []
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	525 total_bytes = 0
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	526 try:
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	527 # get consistent snapshot of repo, lock during scan
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	528 lock = repo.lock()
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	529 try:
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	530 repo.ui.debug('scanning\n')
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	531 for name, ename, size in repo.store.walk():
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	532 entries.append((name, size))
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	533 total_bytes += size
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	534 finally:
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	535 lock.release()
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	536 except error.LockError:
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	537 return '2\n' # error: 2
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	538
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	539 def streamer(repo, entries, total):
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	540 '''stream out all metadata files in repository.'''
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	541 yield '0\n' # success
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	542 repo.ui.debug('%d files, %d bytes to transfer\n' %
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	543 (len(entries), total_bytes))
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	544 yield '%d %d\n' % (len(entries), total_bytes)
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	545 for name, size in entries:
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	546 repo.ui.debug('sending %s (%d bytes)\n' % (name, size))
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	547 # partially encode name over the wire for backwards compat
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	548 yield '%s\0%d\n' % (store.encodedir(name), size)
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	549 for chunk in util.filechunkiter(repo.sopener(name), limit=size):
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	550 yield chunk
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	551
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	552 return streamres(streamer(repo, entries, total_bytes))
11585 5d907fbb9703 protocol: unify stream_out command Matt Mackall <mpm@selenic.com> parents: 11584 diff changeset	553
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	554 def unbundle(repo, proto, heads):
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	555 their_heads = decodelist(heads)
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	556
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	557 def check_heads():
16532 9eba72cdde34 wireprotocol: use visibleheads as reference while unbundling (issue 3303) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16361 diff changeset	558 heads = phases.visibleheads(repo)
13942 88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	559 heads_hash = util.sha1(''.join(sorted(heads))).digest()
88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	560 return (their_heads == ['force'] or their_heads == heads or
88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	561 their_heads == ['hashed', heads_hash])
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	562
12702 f747c085b789 wireproto: redirect the output earlier Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12701 diff changeset	563 proto.redirect()
f747c085b789 wireproto: redirect the output earlier Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12701 diff changeset	564
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	565 # fail early if possible
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	566 if not check_heads():
12703 40bb5853fc4b wireproto: introduce pusherr() to deal with "unsynced changes" error Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12702 diff changeset	567 return pusherr('unsynced changes')
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	568
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	569 # write bundle data to temporary file because it can be big
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	570 fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	571 fp = os.fdopen(fd, 'wb+')
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	572 r = 0
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	573 try:
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	574 proto.getfile(fp)
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	575 lock = repo.lock()
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	576 try:
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	577 if not check_heads():
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	578 # someone else committed/pushed/unbundled while we
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	579 # were transferring data
12703 40bb5853fc4b wireproto: introduce pusherr() to deal with "unsynced changes" error Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12702 diff changeset	580 return pusherr('unsynced changes')
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	581
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	582 # push can proceed
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	583 fp.seek(0)
12042 210049a8d16e bundle: unify/refactor unbundle/readbundle Matt Mackall <mpm@selenic.com> parents: 11879 diff changeset	584 gen = changegroupmod.readbundle(fp, None)
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	585
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	586 try:
15585 a348739da8f0 addchangegroup: remove the lock argument on the addchangegroup methods Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15217 diff changeset	587 r = repo.addchangegroup(gen, 'serve', proto._client())
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	588 except util.Abort, inst:
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	589 sys.stderr.write("abort: %s\n" % inst)
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	590 finally:
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	591 lock.release()
12701 cb9e1d1c34ea wireproto: return in finally was messing with the return inside the block Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12337 diff changeset	592 return pushres(r)
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	593
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	594 finally:
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	595 fp.close()
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	596 os.unlink(tempname)
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	597
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	598 commands = {
14622 bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	599 'batch': (batch, 'cmds *'),
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	600 'between': (between, 'pairs'),
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	601 'branchmap': (branchmap, ''),
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	602 'branches': (branches, 'nodes'),
11594 67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	603 'capabilities': (capabilities, ''),
11584 1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	604 'changegroup': (changegroup, 'roots'),
1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	605 'changegroupsubset': (changegroupsubset, 'bases heads'),
13721 3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	606 'debugwireargs': (debugwireargs, 'one two *'),
13741 b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	607 'getbundle': (getbundle, '*'),
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	608 'heads': (heads, ''),
11594 67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	609 'hello': (hello, ''),
14436 5adb52524779 wireproto: enable optional args for known() for future extensibility Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14419 diff changeset	610 'known': (known, 'nodes *'),
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	611 'listkeys': (listkeys, 'namespace'),
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	612 'lookup': (lookup, 'key'),
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	613 'pushkey': (pushkey, 'namespace key old new'),
11585 5d907fbb9703 protocol: unify stream_out command Matt Mackall <mpm@selenic.com> parents: 11584 diff changeset	614 'stream_out': (stream, ''),
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	615 'unbundle': (unbundle, 'heads'),
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	616 }

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/wireproto.py @ 16535:39d1f83eb05d stable