Mercurial > hg
diff mercurial/commands.py @ 8190:9b8ac5fb7760
ui: kill most users of parentui name and arg, replace with .copy()
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 26 Apr 2009 16:50:43 -0500 |
parents | d2899a856f9f |
children | a1a5a57efe90 |
line wrap: on
line diff
--- a/mercurial/commands.py Sun Apr 26 16:50:43 2009 -0500 +++ b/mercurial/commands.py Sun Apr 26 16:50:43 2009 -0500 @@ -2677,13 +2677,13 @@ s = sshserver.sshserver(ui, repo) s.serve_forever() - parentui = repo and repo.baseui or ui + baseui = repo and repo.baseui or ui optlist = ("name templates style address port prefix ipv6" " accesslog errorlog webdir_conf certificate") for o in optlist.split(): if opts[o]: - parentui.setconfig("web", o, str(opts[o])) - if (repo is not None) and (repo.ui != parentui): + baseui.setconfig("web", o, str(opts[o])) + if (repo is not None) and (repo.ui != baseui): repo.ui.setconfig("web", o, str(opts[o])) if repo is None and not ui.config("web", "webdir_conf"): @@ -2693,7 +2693,7 @@ class service: def init(self): util.set_signal_handler() - self.httpd = hgweb.server.create_server(parentui, repo) + self.httpd = hgweb.server.create_server(baseui, repo) if not ui.verbose: return