Move more into hg-ssh
authorPaul Crowley <paul@lshift.net>
Fri, 06 Mar 2009 12:32:25 +0000
changeset 71 1120f78f81da
parent 70 abb9ed8972e0
child 72 582808b47653
Move more into hg-ssh
src/hg-ssh
src/init/conf/hg-ssh-wrapper
--- a/src/hg-ssh	Fri Mar 06 12:27:16 2009 +0000
+++ b/src/hg-ssh	Fri Mar 06 12:32:25 2009 +0000
@@ -73,6 +73,12 @@
 remote_user = sys.argv[1]
 os.environ['REMOTE_USER'] = remote_user
 
+# Use a different hgrc for remote pulls - this way you can set
+# up access.py for everything at once without affecting local operations
+
+os.environ['HGRCPATH'] = paths.getEtcPath() + "/remote-hgrc"
+
+
 os.environ['HG_ACCESS_RULES_PATH'] = (
     paths.getEtcPath() + "/access.conf" + ":" + 
     os.getcwd() + "/hgadmin/access.conf")
--- a/src/init/conf/hg-ssh-wrapper	Fri Mar 06 12:27:16 2009 +0000
+++ b/src/init/conf/hg-ssh-wrapper	Fri Mar 06 12:32:25 2009 +0000
@@ -14,11 +14,5 @@
 
 set -e
 
-# Use a different hgrc for remote pulls - this way you can set
-# up access.py for everything at once without affecting local operations
-
-HGRCPATH=/etc/mercurial-server/remote-hgrc
-export HGRCPATH
-
 cd repos
 exec /usr/local/lib/mercurial-server/hg-ssh $1