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

annotate mercurial/wireproto.py @ 15063:c20688b7c061 stable

setdiscovery: fix hang when #heads>200 (issue2971) When setting up the next sample, we always add all of the heads, regardless of the desired max sample size. But if the number of heads exceeds this size, then we don't add any more nodes from the still undecided set. (This is debatable per se, and I'll investigate it, but it's how we designed it at the moment.) The bug was that we always added the overall heads, not the heads of the remaining undecided set. Thus, if #heads>200 (desired sample size), we did not make progress any longer.

author	Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date	Thu, 25 Aug 2011 21:25:14 +0200
parents	e7c9fdbbb902
children	592e45b7d43e

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
12085 6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing Martin Geisler <mg@aragost.com> parents: 12063 diff changeset	13 import pushkey as pushkeymod
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):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	20 if hasattr(self, 'value'):
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)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	61 if hasattr(mtd, 'batchable'):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	62 batchable = getattr(mtd, 'batchable')(mtd.im_self, args, *opts)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	63 encargsorres, encresref = batchable.next()
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	64 if encresref:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	65 req.append((name, encargsorres,))
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	66 rsp.append((batchable, encresref, resref,))
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	67 else:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	68 resref.set(encargsorres)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	69 else:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	70 if req:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	71 self._submitreq(req, rsp)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	72 req, rsp = [], []
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	73 resref.set(mtd(args, *opts))
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	74 if req:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	75 self._submitreq(req, rsp)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	76 def _submitreq(self, req, rsp):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	77 encresults = self.remote._submitbatch(req)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	78 for encres, r in zip(encresults, rsp):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	79 batchable, encresref, resref = r
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	80 encresref.set(encres)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	81 resref.set(batchable.next())
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	82
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	83 def batchable(f):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	84 '''annotation for batchable methods
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	85
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	86 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	87
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	88 @batchable
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	89 def sample(self, one, two=None):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	90 # Handle locally computable results first:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	91 if not one:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	92 yield "a local result", None
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	93 # 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	94 encargs = [('one', encode(one),), ('two', encode(two),)]
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	95 # Create future for injection of encoded result:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	96 encresref = future()
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	97 # Return encoded arguments and future:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	98 yield encargs, encresref
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	99 # 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	100 # now. Decode it:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	101 yield decode(encresref.value)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	102
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	103 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	104 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	105 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	106 phases.
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	107 '''
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	108 def plain(args, *opts):
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	109 batchable = f(args, *opts)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	110 encargsorres, encresref = batchable.next()
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	111 if not encresref:
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	112 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	113 self = args[0]
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	114 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	115 return batchable.next()
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	116 setattr(plain, 'batchable', f)
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	117 return plain
84094c0d2724 wireproto: add basic command batching infrastructure Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14436 diff changeset	118
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	119 # list of nodes encoding / decoding
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	120
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	121 def decodelist(l, sep=' '):
13722 f4a85acef50c wireproto: fix decodelist to properly return empty list Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13721 diff changeset	122 if l:
f4a85acef50c wireproto: fix decodelist to properly return empty list Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13721 diff changeset	123 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	124 return []
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	125
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	126 def encodelist(l, sep=' '):
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	127 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	128
14622 bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	129 # batched call argument encoding
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	130
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	131 def escapearg(plain):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	132 return (plain
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	133 .replace(':', '::')
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
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	138 def unescapearg(escaped):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	139 return (escaped
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	140 .replace(':=', '=')
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
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	145 # client side
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	146
14622 bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	147 def todict(**args):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	148 return args
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	149
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	150 class wirerepository(repo.repository):
14622 bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	151
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	152 def batch(self):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	153 return remotebatch(self)
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	154 def _submitbatch(self, req):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	155 cmds = []
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	156 for op, argsdict in req:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	157 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	158 cmds.append('%s %s' % (op, args))
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	159 rsp = self._call("batch", cmds=';'.join(cmds))
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	160 return rsp.split(';')
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	161 def _submitone(self, op, args):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	162 return self._call(op, **args)
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	163
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	164 @batchable
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	165 def lookup(self, key):
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	166 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	167 f = future()
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	168 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	169 d = f.value
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	170 success, data = d[:-1].split(" ", 1)
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	171 if int(success):
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	172 yield bin(data)
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	173 self._abort(error.RepoError(data))
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	174
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	175 @batchable
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	176 def heads(self):
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	177 f = future()
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	178 yield {}, f
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	179 d = f.value
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	180 try:
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	181 yield decodelist(d[:-1])
13726 378522bdc059 wireproto: avoid naked excepts Matt Mackall <mpm@selenic.com> parents: 13723 diff changeset	182 except ValueError:
11879 4e804302d30c fix undefined variables, spotted by pylint Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11627 diff changeset	183 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	184
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	185 @batchable
13723 e615765fdcc7 wireproto: add known([id]) function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13722 diff changeset	186 def known(self, nodes):
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	187 f = future()
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	188 yield todict(nodes=encodelist(nodes)), f
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	189 d = f.value
13723 e615765fdcc7 wireproto: add known([id]) function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13722 diff changeset	190 try:
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	191 yield [bool(int(f)) for f in d]
13726 378522bdc059 wireproto: avoid naked excepts Matt Mackall <mpm@selenic.com> parents: 13723 diff changeset	192 except ValueError:
13723 e615765fdcc7 wireproto: add known([id]) function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13722 diff changeset	193 self._abort(error.ResponseError(_("unexpected response:"), d))
e615765fdcc7 wireproto: add known([id]) function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13722 diff changeset	194
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	195 @batchable
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	196 def branchmap(self):
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	197 f = future()
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	198 yield {}, f
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	199 d = f.value
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	200 try:
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	201 branchmap = {}
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	202 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	203 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	204 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	205 branchheads = decodelist(branchheads)
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	206 branchmap[branchname] = branchheads
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	207 yield branchmap
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	208 except TypeError:
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	209 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	210
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	211 def branches(self, nodes):
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	212 n = encodelist(nodes)
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	213 d = self._call("branches", nodes=n)
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	214 try:
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	215 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	216 return br
13726 378522bdc059 wireproto: avoid naked excepts Matt Mackall <mpm@selenic.com> parents: 13723 diff changeset	217 except ValueError:
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	218 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	219
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	220 def between(self, pairs):
11587 a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11586 diff changeset	221 batch = 8 # avoid giant requests
a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11586 diff changeset	222 r = []
a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11586 diff changeset	223 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	224 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	225 d = self._call("between", pairs=n)
a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11586 diff changeset	226 try:
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	227 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	228 except ValueError:
11587 a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11586 diff changeset	229 self._abort(error.ResponseError(_("unexpected response:"), d))
a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11586 diff changeset	230 return r
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	231
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	232 @batchable
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	233 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	234 if not self.capable('pushkey'):
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	235 yield False, None
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	236 f = future()
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	237 yield todict(namespace=encoding.fromlocal(namespace),
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	238 key=encoding.fromlocal(key),
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	239 old=encoding.fromlocal(old),
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	240 new=encoding.fromlocal(new)), f
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	241 d = f.value
13450 b3f9af7c22c5 wireproto: catch possible cast error in pushkey David Soria Parra <dsp@php.net> parents: 13050 diff changeset	242 try:
b3f9af7c22c5 wireproto: catch possible cast error in pushkey David Soria Parra <dsp@php.net> parents: 13050 diff changeset	243 d = bool(int(d))
b3f9af7c22c5 wireproto: catch possible cast error in pushkey David Soria Parra <dsp@php.net> parents: 13050 diff changeset	244 except ValueError:
b3f9af7c22c5 wireproto: catch possible cast error in pushkey David Soria Parra <dsp@php.net> parents: 13050 diff changeset	245 raise error.ResponseError(
b3f9af7c22c5 wireproto: catch possible cast error in pushkey David Soria Parra <dsp@php.net> parents: 13050 diff changeset	246 _('push failed (unexpected response):'), d)
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	247 yield d
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	248
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	249 @batchable
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	250 def listkeys(self, namespace):
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	251 if not self.capable('pushkey'):
14623 e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	252 yield {}, None
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	253 f = future()
e7c9fdbbb902 wireproto: make a number of commands batchable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14622 diff changeset	254 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	255 d = f.value
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	256 r = {}
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	257 for l in d.splitlines():
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	258 k, v = l.split('\t')
13050 3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	259 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	260 yield r
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	261
11588 8a1f625e971d protocol: unify stream_out client code Matt Mackall <mpm@selenic.com> parents: 11587 diff changeset	262 def stream_out(self):
8a1f625e971d protocol: unify stream_out client code Matt Mackall <mpm@selenic.com> parents: 11587 diff changeset	263 return self._callstream('stream_out')
8a1f625e971d protocol: unify stream_out client code Matt Mackall <mpm@selenic.com> parents: 11587 diff changeset	264
11591 0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	265 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	266 n = encodelist(nodes)
11591 0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	267 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	268 return changegroupmod.unbundle10(self._decompress(f), 'UN')
11591 0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	269
0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	270 def changegroupsubset(self, bases, heads, kind):
0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	271 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	272 bases = encodelist(bases)
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	273 heads = encodelist(heads)
12337 6a6149487817 bundle: encapsulate all bundle streams in unbundle class Matt Mackall <mpm@selenic.com> parents: 12296 diff changeset	274 f = self._callstream("changegroupsubset",
6a6149487817 bundle: encapsulate all bundle streams in unbundle class Matt Mackall <mpm@selenic.com> parents: 12296 diff changeset	275 bases=bases, heads=heads)
6a6149487817 bundle: encapsulate all bundle streams in unbundle class Matt Mackall <mpm@selenic.com> parents: 12296 diff changeset	276 return changegroupmod.unbundle10(self._decompress(f), 'UN')
11591 0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	277
13741 b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	278 def getbundle(self, source, heads=None, common=None):
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	279 self.requirecap('getbundle', _('look up remote changes'))
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	280 opts = {}
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	281 if heads is not None:
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	282 opts['heads'] = encodelist(heads)
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	283 if common is not None:
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	284 opts['common'] = encodelist(common)
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	285 f = self._callstream("getbundle", **opts)
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	286 return changegroupmod.unbundle10(self._decompress(f), 'UN')
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	287
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	288 def unbundle(self, cg, heads, source):
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	289 '''Send cg (a readable file-like object representing the
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	290 changegroup to push, typically a chunkbuffer object) to the
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	291 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	292 result of the push (see localrepository.addchangegroup()).'''
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	293
14419 ede7cea1550f wireproto: do not hash when heads == ['force'] Martin Geisler <mg@aragost.com> parents: 14093 diff changeset	294 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	295 heads = encodelist(['hashed',
88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	296 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	297 else:
88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	298 heads = encodelist(heads)
88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	299
88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	300 ret, output = self._callpush("unbundle", cg, heads=heads)
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	301 if ret == "":
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	302 raise error.ResponseError(
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	303 _('push failed:'), output)
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	304 try:
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	305 ret = int(ret)
12063 516b000fbb7e cleanup: remove unused variables Brodie Rao <brodie@bitheap.org> parents: 12042 diff changeset	306 except ValueError:
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	307 raise error.ResponseError(
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	308 _('push failed (unexpected response):'), ret)
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	309
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	310 for l in output.splitlines(True):
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	311 self.ui.status(_('remote: '), l)
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	312 return ret
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	313
14048 58e58406ed19 wireproto: add test for new optional arg missing on server Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13942 diff changeset	314 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	315 # 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	316 opts = {}
9c4e04fe267e debug: add debugwireargs to test argument passing over the wire Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13450 diff changeset	317 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	318 opts['three'] = three
9c4e04fe267e debug: add debugwireargs to test argument passing over the wire Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13450 diff changeset	319 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	320 opts['four'] = four
9c4e04fe267e debug: add debugwireargs to test argument passing over the wire Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13450 diff changeset	321 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	322
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	323 # server side
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11585 diff changeset	324
11625 cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	325 class streamres(object):
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	326 def __init__(self, gen):
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	327 self.gen = gen
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	328
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	329 class pushres(object):
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	330 def __init__(self, res):
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	331 self.res = res
cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	332
12703 40bb5853fc4b wireproto: introduce pusherr() to deal with "unsynced changes" error Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12702 diff changeset	333 class pusherr(object):
40bb5853fc4b wireproto: introduce pusherr() to deal with "unsynced changes" error Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12702 diff changeset	334 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	335 self.res = res
40bb5853fc4b wireproto: introduce pusherr() to deal with "unsynced changes" error Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12702 diff changeset	336
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	337 def dispatch(repo, proto, command):
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	338 func, spec = commands[command]
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	339 args = proto.getargs(spec)
11625 cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	340 return func(repo, proto, *args)
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	341
13721 3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	342 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	343 opts = {}
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	344 for k in keys:
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	345 if k in others:
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	346 opts[k] = others[k]
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	347 del others[k]
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	348 if others:
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	349 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	350 % (cmd, ",".join(others)))
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	351 return opts
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	352
14622 bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	353 def batch(repo, proto, cmds, others):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	354 res = []
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	355 for pair in cmds.split(';'):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	356 op, args = pair.split(' ', 1)
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	357 vals = {}
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	358 for a in args.split(','):
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	359 if a:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	360 n, v = a.split('=')
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	361 vals[n] = unescapearg(v)
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	362 func, spec = commands[op]
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	363 if spec:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	364 keys = spec.split()
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	365 data = {}
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	366 for k in keys:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	367 if k == '*':
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	368 star = {}
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	369 for key in vals.keys():
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	370 if key not in keys:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	371 star[key] = vals[key]
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	372 data['*'] = star
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	373 else:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	374 data[k] = vals[k]
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	375 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	376 else:
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	377 result = func(repo, proto)
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	378 res.append(escapearg(result))
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	379 return ';'.join(res)
bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	380
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	381 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	382 pairs = [decodelist(p, '-') for p in pairs.split(" ")]
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	383 r = []
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	384 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	385 r.append(encodelist(b) + "\n")
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	386 return "".join(r)
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	387
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	388 def branchmap(repo, proto):
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	389 branchmap = repo.branchmap()
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	390 heads = []
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	391 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	392 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	393 branchnodes = encodelist(nodes)
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	394 heads.append('%s %s' % (branchname, branchnodes))
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	395 return '\n'.join(heads)
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	396
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	397 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	398 nodes = decodelist(nodes)
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	399 r = []
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	400 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	401 r.append(encodelist(b) + "\n")
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	402 return "".join(r)
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	403
11594 67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	404 def capabilities(repo, proto):
13942 88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	405 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	406 'unbundlehash batch').split()
11627 04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	407 if _allowstream(repo.ui):
12296 d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12085 diff changeset	408 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	409 # 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	410 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	411 caps.append('stream')
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12085 diff changeset	412 # 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	413 else:
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12085 diff changeset	414 caps.append('streamreqs=%s' % ','.join(requiredformats))
11594 67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	415 caps.append('unbundle=%s' % ','.join(changegroupmod.bundlepriority))
14093 ce99d887585f httprepo: long arguments support (issue2126) Steven Brown <StevenGBrown@gmail.com> parents: 14064 diff changeset	416 caps.append('httpheader=1024')
11594 67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	417 return ' '.join(caps)
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	418
11584 1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	419 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	420 nodes = decodelist(roots)
11584 1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	421 cg = repo.changegroup(nodes, 'serve')
11625 cdeb861335d5 protocol: wrap non-string protocol responses in classes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11623 diff changeset	422 return streamres(proto.groupchunks(cg))
11584 1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	423
1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	424 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	425 bases = decodelist(bases)
9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	426 heads = decodelist(heads)
11584 1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	427 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	428 return streamres(proto.groupchunks(cg))
11584 1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	429
13721 3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13720 diff changeset	430 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	431 # 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	432 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	433 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	434
13741 b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	435 def getbundle(repo, proto, others):
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	436 opts = options('getbundle', ['heads', 'common'], others)
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	437 for k, v in opts.iteritems():
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	438 opts[k] = decodelist(v)
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	439 cg = repo.getbundle('serve', **opts)
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	440 return streamres(proto.groupchunks(cg))
b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	441
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	442 def heads(repo, proto):
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	443 h = repo.heads()
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	444 return encodelist(h) + "\n"
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	445
11594 67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	446 def hello(repo, proto):
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	447 '''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	448 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	449 Currently the only one defined is "capabilities", which
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	450 consists of a line in the form:
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	451
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	452 capabilities: space separated list of tokens
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	453 '''
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	454 return "capabilities: %s\n" % (capabilities(repo, proto))
67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	455
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	456 def listkeys(repo, proto, namespace):
13050 3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	457 d = pushkeymod.list(repo, encoding.tolocal(namespace)).items()
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	458 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	459 for k, v in d])
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	460 return t
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	461
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	462 def lookup(repo, proto, key):
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	463 try:
13049 d588326f6321 wireproto: use proper UTF-8 handling for key lookup Matt Mackall <mpm@selenic.com> parents: 13047 diff changeset	464 r = hex(repo.lookup(encoding.tolocal(key)))
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	465 success = 1
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	466 except Exception, inst:
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	467 r = str(inst)
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	468 success = 0
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	469 return "%s %s\n" % (success, r)
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	470
14436 5adb52524779 wireproto: enable optional args for known() for future extensibility Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14419 diff changeset	471 def known(repo, proto, nodes, others):
13723 e615765fdcc7 wireproto: add known([id]) function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13722 diff changeset	472 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	473
11583 944c23762c3c protocol: add proto to method prototypes Matt Mackall <mpm@selenic.com> parents: 11581 diff changeset	474 def pushkey(repo, proto, namespace, key, old, new):
13050 3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	475 # compatibility with pre-1.8 clients which were accidentally
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	476 # sending raw binary nodes rather than utf-8-encoded hex
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	477 if len(new) == 20 and new.encode('string-escape') != new:
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	478 # looks like it could be a binary node
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	479 try:
14064 e4bfb9c337f3 remove unused imports and variables Alexander Solovyov <alexander@solovyov.net> parents: 14048 diff changeset	480 new.decode('utf-8')
13050 3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	481 new = encoding.tolocal(new) # but cleanly decodes as UTF-8
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	482 except UnicodeDecodeError:
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	483 pass # binary, leave unmodified
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	484 else:
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	485 new = encoding.tolocal(new) # normal path
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	486
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	487 r = pushkeymod.push(repo,
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	488 encoding.tolocal(namespace), encoding.tolocal(key),
3790452d499b pushkey: use UTF-8 Matt Mackall <mpm@selenic.com> parents: 13049 diff changeset	489 encoding.tolocal(old), new)
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	490 return '%s\n' % int(r)
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	491
11627 04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	492 def _allowstream(ui):
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	493 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	494
11585 5d907fbb9703 protocol: unify stream_out command Matt Mackall <mpm@selenic.com> parents: 11584 diff changeset	495 def stream(repo, proto):
11627 04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	496 '''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	497 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	498 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	499
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	500 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	501 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	502 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	503 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	504 '''
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	505
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	506 if not _allowstream(repo.ui):
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	507 return '1\n'
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	508
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	509 entries = []
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	510 total_bytes = 0
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	511 try:
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	512 # 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	513 lock = repo.lock()
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	514 try:
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	515 repo.ui.debug('scanning\n')
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	516 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	517 entries.append((name, size))
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	518 total_bytes += size
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	519 finally:
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	520 lock.release()
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	521 except error.LockError:
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	522 return '2\n' # error: 2
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 def streamer(repo, entries, total):
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	525 '''stream out all metadata files in repository.'''
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	526 yield '0\n' # success
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	527 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	528 (len(entries), total_bytes))
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	529 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	530 for name, size in entries:
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	531 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	532 # 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	533 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	534 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	535 yield chunk
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	536
04f76a954842 protocol: move the streamclone implementation into wireproto Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11625 diff changeset	537 return streamres(streamer(repo, entries, total_bytes))
11585 5d907fbb9703 protocol: unify stream_out command Matt Mackall <mpm@selenic.com> parents: 11584 diff changeset	538
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	539 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	540 their_heads = decodelist(heads)
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	541
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	542 def check_heads():
11597 9141d2c9e5a5 wireproto: refactor list of nodeid encoding / decoding Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11594 diff changeset	543 heads = repo.heads()
13942 88f0e41d8802 wireproto: allow unbundle with hashed heads parameter (issue2126) Shuhei Takahashi <takahashi.shuhei@gmail.com> parents: 13741 diff changeset	544 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	545 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	546 their_heads == ['hashed', heads_hash])
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	547
12702 f747c085b789 wireproto: redirect the output earlier Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12701 diff changeset	548 proto.redirect()
f747c085b789 wireproto: redirect the output earlier Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12701 diff changeset	549
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	550 # fail early if possible
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	551 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	552 return pusherr('unsynced changes')
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	553
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	554 # 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	555 fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	556 fp = os.fdopen(fd, 'wb+')
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	557 r = 0
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	558 try:
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	559 proto.getfile(fp)
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	560 lock = repo.lock()
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	561 try:
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	562 if not check_heads():
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	563 # someone else committed/pushed/unbundled while we
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	564 # 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	565 return pusherr('unsynced changes')
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	566
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	567 # push can proceed
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	568 fp.seek(0)
12042 210049a8d16e bundle: unify/refactor unbundle/readbundle Matt Mackall <mpm@selenic.com> parents: 11879 diff changeset	569 gen = changegroupmod.readbundle(fp, None)
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	570
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	571 try:
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	572 r = repo.addchangegroup(gen, 'serve', proto._client(),
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	573 lock=lock)
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	574 except util.Abort, inst:
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	575 sys.stderr.write("abort: %s\n" % inst)
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	576 finally:
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	577 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	578 return pushres(r)
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	579
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	580 finally:
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	581 fp.close()
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	582 os.unlink(tempname)
d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	583
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	584 commands = {
14622 bd88561afb4b wireproto: add batching support to wirerepository Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14621 diff changeset	585 'batch': (batch, 'cmds *'),
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	586 'between': (between, 'pairs'),
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	587 'branchmap': (branchmap, ''),
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	588 'branches': (branches, 'nodes'),
11594 67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	589 'capabilities': (capabilities, ''),
11584 1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	590 'changegroup': (changegroup, 'roots'),
1af96b090116 protocol: unify changegroup commands Matt Mackall <mpm@selenic.com> parents: 11583 diff changeset	591 '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	592 'debugwireargs': (debugwireargs, 'one two *'),
13741 b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13726 diff changeset	593 'getbundle': (getbundle, '*'),
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	594 'heads': (heads, ''),
11594 67863f9d805f protocol: unify server-side capabilities functions Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	595 'hello': (hello, ''),
14436 5adb52524779 wireproto: enable optional args for known() for future extensibility Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14419 diff changeset	596 'known': (known, 'nodes *'),
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	597 'listkeys': (listkeys, 'namespace'),
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	598 'lookup': (lookup, 'key'),
4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	599 'pushkey': (pushkey, 'namespace key old new'),
11585 5d907fbb9703 protocol: unify stream_out command Matt Mackall <mpm@selenic.com> parents: 11584 diff changeset	600 'stream_out': (stream, ''),
11593 d054cc5c7737 protocol: unify unbundle on the server side Matt Mackall <mpm@selenic.com> parents: 11592 diff changeset	601 'unbundle': (unbundle, 'heads'),
11581 4530b3307fb9 protocol: introduce wireproto.py Matt Mackall <mpm@selenic.com> parents: diff changeset	602 }

Mercurial > public > mercurial-scm > hg

annotate mercurial/wireproto.py @ 15063:c20688b7c061 stable