diff -r 0519745e7a57 -r 84e9e33d866b src/hg-ssh --- a/src/hg-ssh Mon Oct 12 16:04:07 2009 +0100 +++ b/src/hg-ssh Mon Oct 12 16:25:02 2009 +0100 @@ -34,13 +34,14 @@ from mercurial import dispatch import sys, os, os.path +import base64 from mercurialserver import ruleset, paths def fail(message): sys.stderr.write("mercurial-server: %s\n" % message) sys.exit(-1) -def checkpath(path) +def checkpath(path): path = os.path.dirname(path) if path == "": return @@ -65,13 +66,16 @@ #logfile = open("/tmp/hg-ssh.%d.txt" % os.getpid(), "w") #logfile.write("Started: %s\n" % sys.argv) -if len(sys.argv) != 2: +paths.setExePath() + +if len(sys.argv) == 3 and sys.argv[1] == "--base64": + ruleset.rules.set(user = base64.b64decode(sys.argv[2])) +elif len(sys.argv) == 2: + ruleset.rules.set(user = sys.argv[1]) +else: fail("hg-ssh wrongly called, is authorized_keys corrupt? (%s)" % sys.argv) -paths.setExePath() -ruleset.rules.set(user = sys.argv[1]) - # Use a different hgrc for remote pulls - this way you can set # up access.py for everything at once without affecting local operations @@ -89,7 +93,7 @@ try: if cmd.startswith('hg -R ') and cmd.endswith(' serve --stdio'): repo = getrepo("read", cmd[6:-14]) - if not os.path.isdir(repo + "/.hg") + if not os.path.isdir(repo + "/.hg"): fail("no such repository %s" % repo) dispatch.dispatch(['-R', repo, 'serve', '--stdio']) elif cmd.startswith('hg init '):