mercurial-crew-with-dirclash: mercurial/sshserver.py annotate

annotate mercurial/sshserver.py @ 3447:ef1032c223e7

sshrepo: add passing of lookup exceptions

author	Eric Hopper <hopper@omnifarious.org>
date	Sat, 09 Sep 2006 18:25:06 -0700
parents	0b450267cf47
children	abaee83ce0a6

rev	line source
2399 cc90dcbdf053 fix comment. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2397 diff changeset	1 # sshserver.py - ssh protocol server support for mercurial
2396 8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	2 #
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
2858 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	4 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
2396 8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	5 #
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	6 # This software may be used and distributed according to the terms
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	7 # of the GNU General Public License, incorporated herein by reference.
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	8
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	9 from demandload import demandload
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	10 from i18n import gettext as _
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	11 from node import *
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	12 demandload(globals(), "os streamclone sys tempfile util")
2396 8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	13
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	14 class sshserver(object):
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	15 def __init__(self, ui, repo):
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	16 self.ui = ui
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	17 self.repo = repo
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	18 self.lock = None
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	19 self.fin = sys.stdin
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	20 self.fout = sys.stdout
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	21
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	22 sys.stdout = sys.stderr
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	23
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	24 # Prevent insertion/deletion of CRs
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	25 util.set_binary(self.fin)
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	26 util.set_binary(self.fout)
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	27
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	28 def getarg(self):
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	29 argline = self.fin.readline()[:-1]
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	30 arg, l = argline.split()
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	31 val = self.fin.read(int(l))
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	32 return arg, val
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	33
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	34 def respond(self, v):
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	35 self.fout.write("%d\n" % len(v))
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	36 self.fout.write(v)
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	37 self.fout.flush()
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	38
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	39 def serve_forever(self):
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	40 while self.serve_one(): pass
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	41 sys.exit(0)
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	42
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	43 def serve_one(self):
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	44 cmd = self.fin.readline()[:-1]
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	45 if cmd:
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	46 impl = getattr(self, 'do_' + cmd, None)
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	47 if impl: impl()
2397 e9d402506514 merge change to ssh protocol. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2396 diff changeset	48 else: self.respond("")
2396 8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	49 return cmd != ''
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	50
3446 0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	51 def do_lookup(self):
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	52 arg, key = self.getarg()
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	53 assert arg == 'key'
3447 ef1032c223e7 sshrepo: add passing of lookup exceptions Eric Hopper <hopper@omnifarious.org> parents: 3446 diff changeset	54 try:
ef1032c223e7 sshrepo: add passing of lookup exceptions Eric Hopper <hopper@omnifarious.org> parents: 3446 diff changeset	55 r = hex(self.repo.lookup(key))
ef1032c223e7 sshrepo: add passing of lookup exceptions Eric Hopper <hopper@omnifarious.org> parents: 3446 diff changeset	56 success = 1
ef1032c223e7 sshrepo: add passing of lookup exceptions Eric Hopper <hopper@omnifarious.org> parents: 3446 diff changeset	57 except Exception,inst:
ef1032c223e7 sshrepo: add passing of lookup exceptions Eric Hopper <hopper@omnifarious.org> parents: 3446 diff changeset	58 r = str(inst)
ef1032c223e7 sshrepo: add passing of lookup exceptions Eric Hopper <hopper@omnifarious.org> parents: 3446 diff changeset	59 success = 0
ef1032c223e7 sshrepo: add passing of lookup exceptions Eric Hopper <hopper@omnifarious.org> parents: 3446 diff changeset	60 self.respond("%s %s\n" % (success, r))
3446 0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	61
2396 8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	62 def do_heads(self):
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	63 h = self.repo.heads()
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	64 self.respond(" ".join(map(hex, h)) + "\n")
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	65
2419 b17eebc911ae Initial implementation of hello command for ssh Matt Mackall <mpm@selenic.com> parents: 2399 diff changeset	66 def do_hello(self):
b17eebc911ae Initial implementation of hello command for ssh Matt Mackall <mpm@selenic.com> parents: 2399 diff changeset	67 '''the hello command returns a set of lines describing various
b17eebc911ae Initial implementation of hello command for ssh Matt Mackall <mpm@selenic.com> parents: 2399 diff changeset	68 interesting things about the server, in an RFC822-like format.
b17eebc911ae Initial implementation of hello command for ssh Matt Mackall <mpm@selenic.com> parents: 2399 diff changeset	69 Currently the only one defined is "capabilities", which
b17eebc911ae Initial implementation of hello command for ssh Matt Mackall <mpm@selenic.com> parents: 2399 diff changeset	70 consists of a line in the form:
b17eebc911ae Initial implementation of hello command for ssh Matt Mackall <mpm@selenic.com> parents: 2399 diff changeset	71
b17eebc911ae Initial implementation of hello command for ssh Matt Mackall <mpm@selenic.com> parents: 2399 diff changeset	72 capabilities: space separated list of tokens
b17eebc911ae Initial implementation of hello command for ssh Matt Mackall <mpm@selenic.com> parents: 2399 diff changeset	73 '''
b17eebc911ae Initial implementation of hello command for ssh Matt Mackall <mpm@selenic.com> parents: 2399 diff changeset	74
3446 0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	75 caps = ['unbundle', 'lookup', 'changegroupsubset']
2622 064aef9162cc rename stream hgrc option to compressed. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	76 if self.ui.configbool('server', 'uncompressed'):
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	77 caps.append('stream=%d' % self.repo.revlogversion)
5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	78 self.respond("capabilities: %s\n" % (' '.join(caps),))
2419 b17eebc911ae Initial implementation of hello command for ssh Matt Mackall <mpm@selenic.com> parents: 2399 diff changeset	79
2396 8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	80 def do_lock(self):
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	81 '''DEPRECATED - allowing remote client to lock repo is not safe'''
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	82
2396 8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	83 self.lock = self.repo.lock()
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	84 self.respond("")
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	85
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	86 def do_unlock(self):
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	87 '''DEPRECATED'''
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	88
2396 8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	89 if self.lock:
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	90 self.lock.release()
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	91 self.lock = None
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	92 self.respond("")
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	93
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	94 def do_branches(self):
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	95 arg, nodes = self.getarg()
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	96 nodes = map(bin, nodes.split(" "))
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	97 r = []
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	98 for b in self.repo.branches(nodes):
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	99 r.append(" ".join(map(hex, b)) + "\n")
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	100 self.respond("".join(r))
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	101
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	102 def do_between(self):
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	103 arg, pairs = self.getarg()
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	104 pairs = [map(bin, p.split("-")) for p in pairs.split(" ")]
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	105 r = []
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	106 for b in self.repo.between(pairs):
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	107 r.append(" ".join(map(hex, b)) + "\n")
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	108 self.respond("".join(r))
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	109
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	110 def do_changegroup(self):
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	111 nodes = []
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	112 arg, roots = self.getarg()
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	113 nodes = map(bin, roots.split(" "))
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	114
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	115 cg = self.repo.changegroup(nodes, 'serve')
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	116 while True:
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	117 d = cg.read(4096)
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	118 if not d:
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	119 break
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	120 self.fout.write(d)
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	121
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	122 self.fout.flush()
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	123
3446 0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	124 def do_changegroupsubset(self):
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	125 bases = []
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	126 heads = []
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	127 argmap = dict([self.getarg(), self.getarg()])
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	128 bases = [bin(n) for n in argmap['bases'].split(' ')]
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	129 heads = [bin(n) for n in argmap['heads'].split(' ')]
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	130
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	131 cg = self.repo.changegroupsubset(bases, heads, 'serve')
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	132 while True:
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	133 d = cg.read(4096)
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	134 if not d:
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	135 break
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	136 self.fout.write(d)
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	137
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	138 self.fout.flush()
0b450267cf47 Adding changegroupsubset and lookup to ssh protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3215 diff changeset	139
2396 8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	140 def do_addchangegroup(self):
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	141 '''DEPRECATED'''
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	142
2396 8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	143 if not self.lock:
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	144 self.respond("not locked")
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	145 return
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	146
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	147 self.respond("")
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2622 diff changeset	148 r = self.repo.addchangegroup(self.fin, 'serve', self.client_url())
2396 8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	149 self.respond(str(r))
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	150
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2622 diff changeset	151 def client_url(self):
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2622 diff changeset	152 client = os.environ.get('SSH_CLIENT', '').split(' ', 1)[0]
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2622 diff changeset	153 return 'remote:ssh:' + client
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 2858 diff changeset	154
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	155 def do_unbundle(self):
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	156 their_heads = self.getarg()[1].split()
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	157
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	158 def check_heads():
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	159 heads = map(hex, self.repo.heads())
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	160 return their_heads == [hex('force')] or their_heads == heads
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	161
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	162 # fail early if possible
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	163 if not check_heads():
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	164 self.respond(_('unsynced changes'))
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	165 return
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	166
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	167 self.respond('')
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	168
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	169 # write bundle data to temporary file because it can be big
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	170
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	171 try:
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	172 fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	173 fp = os.fdopen(fd, 'wb+')
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	174
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	175 count = int(self.fin.readline())
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	176 while count:
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	177 fp.write(self.fin.read(count))
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	178 count = int(self.fin.readline())
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	179
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	180 was_locked = self.lock is not None
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	181 if not was_locked:
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	182 self.lock = self.repo.lock()
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	183 try:
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	184 if not check_heads():
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	185 # someone else committed/pushed/unbundled while we
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	186 # were transferring data
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	187 self.respond(_('unsynced changes'))
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	188 return
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	189 self.respond('')
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	190
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	191 # push can proceed
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	192
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	193 fp.seek(0)
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2622 diff changeset	194 r = self.repo.addchangegroup(fp, 'serve', self.client_url())
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	195 self.respond(str(r))
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	196 finally:
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	197 if not was_locked:
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	198 self.lock.release()
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	199 self.lock = None
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	200 finally:
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	201 fp.close()
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	202 os.unlink(tempname)
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2419 diff changeset	203
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	204 def do_stream_out(self):
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	205 streamclone.stream_out(self.repo, self.fout)

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/sshserver.py @ 3447:ef1032c223e7