All work now in hg-ssh
authorPaul Crowley <paul@lshift.net>
Fri, 06 Mar 2009 12:34:07 +0000
changeset 72 582808b47653
parent 71 1120f78f81da
child 73 5d81ec164e5d
All work now in hg-ssh
doc/PLAN
src/hg-ssh
src/init/conf/hg-ssh-wrapper
--- a/doc/PLAN	Fri Mar 06 12:32:25 2009 +0000
+++ b/doc/PLAN	Fri Mar 06 12:34:07 2009 +0000
@@ -4,10 +4,11 @@
 
 - move all modules into mercurial_server directory
 
+- make mercurial_server.paths module; a function sets a global based on sys.argv[0]
+- reduce hg-ssh-wrapper to nothing by moving all functionality into hg-ssh
+
 Todo:
 
-- make mercurial_server.paths module; a function sets a global based on sys.argv[0]
-- reduce hg-ssh-wrapper to nothing by moving all functionality into hg-ssh
 - same for refresh-auth
 - move most of do-refresh-auth into a module
 - give that module a hook, and call the hook instead of the exe
--- a/src/hg-ssh	Fri Mar 06 12:32:25 2009 +0000
+++ b/src/hg-ssh	Fri Mar 06 12:34:07 2009 +0000
@@ -78,6 +78,7 @@
 
 os.environ['HGRCPATH'] = paths.getEtcPath() + "/remote-hgrc"
 
+os.chdir('repos')
 
 os.environ['HG_ACCESS_RULES_PATH'] = (
     paths.getEtcPath() + "/access.conf" + ":" + 
--- a/src/init/conf/hg-ssh-wrapper	Fri Mar 06 12:32:25 2009 +0000
+++ b/src/init/conf/hg-ssh-wrapper	Fri Mar 06 12:34:07 2009 +0000
@@ -4,15 +4,7 @@
 # This file should live in /etc/mercurial-server.  It expects
 # to be specified as the target of the "command" section in the prefix
 # of a key in the authorized_keys file, and be passed a name associated
-# with an ssh key as its only argument.  It does some setting up before
-# calling hg-ssh, which does the real work of deciding whether to allow
-# the users action based on the type of the action, the key name, and
-# the contents of the specified rules file.
-
-# If your repository is laid out differently you may need to modify
-# this file.
+# with an ssh key as its only argument.
 
 set -e
-
-cd repos
 exec /usr/local/lib/mercurial-server/hg-ssh $1