Mercurial > hg > pyhgsh
changeset 1543:93a9298367e0
Merge with Thomas Waldmann
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 14 Nov 2005 15:09:34 +0100 |
parents | 5e47e42b14ba (diff) 8e80eefb3de6 (current diff) |
children | b3184bea3eb3 |
files | mercurial/commands.py |
diffstat | 3 files changed, 49 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/hg-ssh Mon Nov 14 15:09:34 2005 +0100 @@ -0,0 +1,45 @@ +#!/usr/bin/env python +# +# Copyright 2005 by Intevation GmbH <intevation@intevation.de> +# Author(s): +# Thomas Arendsen Hein <thomas@intevation.de> +# +# This software may be used and distributed according to the terms +# of the GNU General Public License, incorporated herein by reference. + +""" +hg-ssh - a wrapper for ssh access to a limited set of mercurial repos + +To be used in ~/.ssh/authorized_keys with the "command" option, see sshd(8): +command="hg-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4" ssh-dss ... +(probably together with these other useful options: + no-port-forwarding,no-X11-forwarding,no-agent-forwarding) + +This allows pull/push over ssh to to the repositories given as arguments. + +If all your repositories are subdirectories of a common directory, you can +allow shorter paths with: +command="cd path/to/my/repositories && hg-ssh repo1 subdir/repo2" +""" + +from mercurial import commands + +import sys, os + +cwd = os.getcwd() +allowed_paths = [os.path.normpath(os.path.join(cwd, os.path.expanduser(path))) + for path in sys.argv[1:]] +orig_cmd = os.getenv('SSH_ORIGINAL_COMMAND', '?') + +if orig_cmd.startswith('hg -R ') and orig_cmd.endswith(' serve --stdio'): + path = orig_cmd[6:-14] + repo = os.path.normpath(os.path.join(cwd, os.path.expanduser(path))) + if repo in allowed_paths: + commands.dispatch(['-R', repo, 'serve', '--stdio']) + else: + sys.stderr.write("Illegal repository %r\n" % repo) + sys.exit(-1) +else: + sys.stderr.write("Illegal command %r\n" % orig_cmd) + sys.exit(-1) +
--- a/mercurial/commands.py Mon Nov 14 04:58:28 2005 +0200 +++ b/mercurial/commands.py Mon Nov 14 15:09:34 2005 +0100 @@ -2633,6 +2633,9 @@ u.debug(inst, "\n") u.warn(_("%s: invalid arguments\n") % cmd) help_(u, cmd) + except AmbiguousCommand, inst: + u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0]) + help_(u, 'shortlist') except UnknownCommand, inst: u.warn(_("hg: unknown command '%s'\n") % inst.args[0]) help_(u, 'shortlist')
--- a/tests/test-grep Mon Nov 14 04:58:28 2005 +0200 +++ b/tests/test-grep Mon Nov 14 15:09:34 2005 +0100 @@ -14,7 +14,7 @@ hg commit -m 2 -u spam -d '2 0' echo 'import/export' >> port hg commit -m 3 -u eggs -d '3 0' -head -3 port > port1 +head -n 3 port > port1 mv port1 port hg commit -m 4 -u spam -d '4 0' hg grep port port