diff -r 31e862df1884 -r 0cd59649772c src/hg-ssh --- a/src/hg-ssh Thu Nov 12 11:19:36 2009 +0000 +++ b/src/hg-ssh Fri Nov 13 12:26:08 2009 +0000 @@ -35,7 +35,7 @@ import sys, os, os.path import base64 -from mercurialserver import ruleset, paths +from mercurialserver import config, ruleset def fail(message): sys.stderr.write("mercurial-server: %s\n" % message) @@ -71,7 +71,7 @@ checkParents(repo) return repo -paths.setExePath() +config.setExePath() if len(sys.argv) == 3 and sys.argv[1] == "--base64": ruleset.rules.set(user = base64.b64decode(sys.argv[2])) @@ -84,11 +84,11 @@ # 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.getHgrcPaths() +os.environ['HGRCPATH'] = config.getHgrcPaths() -os.chdir(paths.getReposPath()) +os.chdir(config.getReposPath()) -for f in paths.getAccessPaths(): +for f in config.getAccessPaths(): if os.path.isfile(f): ruleset.rules.readfile(f)