[PATCH RESEND] serve: add --cmdserver option to communicate with hg over a pipe
Idan Kamara
idankk86 at gmail.com
Thu Jun 16 13:56:03 CDT 2011
# HG changeset patch
# User Idan Kamara <idankk86 at gmail.com>
# Date 1307111261 -10800
# Node ID e60630792166e6fefea241de5ba5558416deca23
# Parent e4cfdff6d3f40d25eb5a4117112ba4a8e8d7dfb4
serve: add --cmdserver option to communicate with hg over a pipe
diff -r e4cfdff6d3f4 -r e60630792166 mercurial/commands.py
--- a/mercurial/commands.py Thu Jun 16 01:58:00 2011 +0200
+++ b/mercurial/commands.py Fri Jun 03 17:27:41 2011 +0300
@@ -11,7 +11,8 @@
import os, re, difflib, time, tempfile, errno
import hg, scmutil, util, revlog, extensions, copies, error, bookmarks
import patch, help, url, encoding, templatekw, discovery
-import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server
+import archival, changegroup, cmdutil, hbisect
+import sshserver, hgweb, hgweb.server, commandserver
import merge as mergemod
import minirst, revset, fileset
import dagparser, context, simplemerge
@@ -4418,6 +4419,7 @@
_('FILE')),
('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
('', 'stdio', None, _('for remote clients')),
+ ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
('', 'style', '', _('template style to use'), _('STYLE')),
('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
@@ -4448,13 +4450,24 @@
Returns 0 on success.
"""
- if opts["stdio"]:
+ if opts["stdio"] and opts["cmdserver"]:
+ raise util.Abort(_("cannot use --stdio with --cmdserver"))
+
+ def checkrepo():
if repo is None:
raise error.RepoError(_("There is no Mercurial repository here"
" (.hg not found)"))
+
+ if opts["stdio"]:
+ checkrepo()
s = sshserver.sshserver(ui, repo)
s.serve_forever()
+ if opts["cmdserver"]:
+ checkrepo()
+ s = commandserver.server(ui, repo, opts["cmdserver"])
+ return s.serve()
+
# this way we can check if something was given in the command-line
if opts.get('port'):
opts['port'] = util.getport(opts.get('port'))
diff -r e4cfdff6d3f4 -r e60630792166 mercurial/commandserver.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/commandserver.py Fri Jun 03 17:27:41 2011 +0300
@@ -0,0 +1,213 @@
+# commandserver.py - communicate with Mercurial's API over a pipe
+#
+# Copyright Matt Mackall <mpm at selenic.com>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
+from i18n import _
+import struct
+import sys
+import dispatch, encoding, util
+
+logfile = None
+
+def log(*args):
+ if not logfile:
+ return
+
+ for a in args:
+ logfile.write(str(a))
+
+ logfile.flush()
+
+class channeledoutput(object):
+ """
+ Write data from in_ to out in the following format:
+
+ data length (unsigned int),
+ data
+ """
+ def __init__(self, in_, out, channel):
+ self.in_ = in_
+ self.out = out
+ self.channel = channel
+
+ def write(self, data):
+ if not data:
+ return
+ self.out.write(struct.pack('>cI', self.channel, len(data)))
+ self.out.write(data)
+ self.out.flush()
+
+ def __getattr__(self, attr):
+ if attr in ('isatty', 'fileno'):
+ raise AttributeError, attr
+ return getattr(self.in_, attr)
+
+class channeledinput(object):
+ """
+ Read data from in_.
+
+ Requests for input are written to out in the following format:
+ channel identifier - 'I' for plain input, 'L' line based (1 byte)
+ how many bytes to send at most (unsigned int),
+
+ The client replies with:
+ data length (unsigned int), 0 meaning EOF
+ data
+ """
+
+ maxchucksize = 4 * 1024
+
+ def __init__(self, in_, out, channel):
+ self.in_ = in_
+ self.out = out
+ self.channel = channel
+
+ def read(self, size=-1):
+ if size < 0:
+ # if we need to consume all the clients input, ask for 4k chunks
+ # so the pipe doesn't fill up risking a deadlock
+ size = self.maxchucksize
+ s = self._read(size, self.channel)
+ buf = s
+ while s:
+ buf += s
+ s = self._read(size, self.channel)
+
+ return buf
+ else:
+ return self._read(size, self.channel)
+
+ def _read(self, size, channel):
+ if not size:
+ return ''
+ assert size > 0
+
+ # tell the client we need at most size bytes
+ self.out.write(struct.pack('>cI', channel, size))
+ self.out.flush()
+
+ length = self.in_.read(4)
+ length = struct.unpack('>I', length)[0]
+ if not length:
+ return ''
+ else:
+ return self.in_.read(length)
+
+ def readline(self, size=-1):
+ if size < 0:
+ size = self.maxchucksize
+ s = self._read(size, 'L')
+ buf = s
+ # keep asking for more until there's either no more or
+ # we got a full line
+ while s and s[-1] != '\n':
+ buf += s
+ s = self._read(size, 'L')
+
+ return buf
+ else:
+ return self._read(size, 'L')
+
+ def __iter__(self):
+ return self
+
+ def next(self):
+ l = self.readline()
+ if not l:
+ raise StopIteration
+ return l
+
+ def __getattr__(self, attr):
+ if attr in ('isatty', 'fileno'):
+ raise AttributeError, attr
+ return getattr(self.in_, attr)
+
+class server(object):
+ """
+ Listens for commands on stdin, runs them and writes the output on a channel
+ based stream to stdout.
+ """
+ def __init__(self, ui, repo, mode):
+ self.ui = ui
+
+ logpath = ui.config("cmdserver", "log", None)
+ if logpath:
+ global logfile
+ if logpath == '-':
+ # write log on a special 'd'ebug channel
+ logfile = channeledoutput(sys.stdout, sys.stdout, 'd')
+ else:
+ logfile = open(logpath, 'a')
+
+ self.repo = repo
+
+ if mode == 'pipe':
+ self.cerr = channeledoutput(sys.stderr, sys.stdout, 'e')
+ self.cout = channeledoutput(sys.stdout, sys.stdout, 'o')
+ self.cin = channeledinput(sys.stdin, sys.stdout, 'I')
+ self.cresult = channeledoutput(sys.stdout, sys.stdout, 'r')
+
+ self.client = sys.stdin
+ else:
+ raise util.Abort(_('unknown mode %s') % mode)
+
+ def _read(self, size):
+ data = self.client.read(size)
+
+ # is the other end closed?
+ if not data:
+ raise EOFError()
+
+ return data
+
+ def runcommand(self):
+ """ reads a list of \0 terminated arguments, executes
+ and writes the return code to the result channel """
+
+ length = struct.unpack('>I', self._read(4))[0]
+ args = self._read(length).split('\0')
+
+ # copy the ui so changes to it don't persist between requests
+ req = dispatch.request(args, self.ui.copy(), self.repo, self.cin,
+ self.cout, self.cerr)
+
+ ret = dispatch.dispatch(req) or 0 # might return None
+
+ self.cresult.write(struct.pack('>i', int(ret)))
+
+ def getencoding(self):
+ """ writes the current encoding to the result channel """
+ self.cresult.write(encoding.encoding)
+
+ def serveone(self):
+ cmd = self.client.readline()[:-1]
+ if cmd:
+ handler = self.capabilities.get(cmd)
+ if handler:
+ handler(self)
+ else:
+ # clients are expected to check what commands are supported by
+ # looking at the servers capabilities
+ raise util.Abort(_('unknown command %s') % cmd)
+
+ return cmd != ''
+
+ capabilities = {'runcommand' : runcommand,
+ 'getencoding' : getencoding}
+
+ def serve(self):
+ self.cout.write('capabilities: %s' % ' '.join(self.capabilities.keys()))
+ self.cout.write('encoding: %s' % encoding.encoding)
+
+ try:
+ while self.serveone():
+ pass
+ except EOFError:
+ # we'll get here if the client disconnected while we were reading
+ # its request
+ return 1
+
+ return 0
diff -r e4cfdff6d3f4 -r e60630792166 tests/test-debugcomplete.t
--- a/tests/test-debugcomplete.t Thu Jun 16 01:58:00 2011 +0200
+++ b/tests/test-debugcomplete.t Fri Jun 03 17:27:41 2011 +0300
@@ -137,6 +137,7 @@
--accesslog
--address
--certificate
+ --cmdserver
--config
--cwd
--daemon
@@ -199,7 +200,7 @@
pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure
push: force, rev, bookmark, branch, new-branch, ssh, remotecmd, insecure
remove: after, force, include, exclude
- serve: accesslog, daemon, daemon-pipefds, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, templates, style, ipv6, certificate
+ serve: accesslog, daemon, daemon-pipefds, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate
status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos
summary: remote
update: clean, check, date, rev
diff -r e4cfdff6d3f4 -r e60630792166 tests/test-http-branchmap.t
--- a/tests/test-http-branchmap.t Thu Jun 16 01:58:00 2011 +0200
+++ b/tests/test-http-branchmap.t Fri Jun 03 17:27:41 2011 +0300
@@ -79,7 +79,7 @@
>
> myui = ui.ui()
> repo = hg.repository(myui, 'a')
- > commands.serve(myui, repo, stdio=True)
+ > commands.serve(myui, repo, stdio=True, cmdserver=False)
> EOF
$ echo baz >> b/foo
$ hg -R b ci -m baz
More information about the Mercurial-devel
mailing list