Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 4081:e6d26e71f049
merge with crew-stable
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 13 Feb 2007 10:25:45 -0200 |
parents | 5b1f663ef86d ff08cebcd116 |
children | 03e9c22a6489 |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Jan 02 21:40:20 2007 -0800 +++ b/mercurial/commands.py Tue Feb 13 10:25:45 2007 -0200 @@ -2298,11 +2298,12 @@ s = sshserver.sshserver(ui, repo) s.serve_forever() + parentui = ui.parentui or ui optlist = ("name templates style address port ipv6" " accesslog errorlog webdir_conf") for o in optlist.split(): if opts[o]: - ui.setconfig("web", o, str(opts[o])) + parentui.setconfig("web", o, str(opts[o])) if repo is None and not ui.config("web", "webdir_conf"): raise hg.RepoError(_("There is no Mercurial repository here" @@ -2318,7 +2319,7 @@ os.read(rfd, 1) os._exit(0) - httpd = hgweb.server.create_server(ui, repo) + httpd = hgweb.server.create_server(parentui, repo) if ui.verbose: if httpd.port != 80: