comparison mercurial/commands.py @ 5083:f94dbc6c7eaf

Fix hgwebdir after 9858477ed74cce9dc8f4069f9453a1bda0e13ba1 broke it.
author Eric Hopper <hopper@omnifarious.org>
date Wed, 08 Aug 2007 22:47:30 +0200
parents 73fdc8bd3ed8
children 64888ff907f4 06154aff2b1a
comparison
equal deleted inserted replaced
5082:dc2e512cb89a 5083:f94dbc6c7eaf
2469 optlist = ("name templates style address port ipv6" 2469 optlist = ("name templates style address port ipv6"
2470 " accesslog errorlog webdir_conf") 2470 " accesslog errorlog webdir_conf")
2471 for o in optlist.split(): 2471 for o in optlist.split():
2472 if opts[o]: 2472 if opts[o]:
2473 parentui.setconfig("web", o, str(opts[o])) 2473 parentui.setconfig("web", o, str(opts[o]))
2474 if repo.ui != parentui: 2474 if (repo is not None) and (repo.ui != parentui):
2475 repo.ui.setconfig("web", o, str(opts[o])) 2475 repo.ui.setconfig("web", o, str(opts[o]))
2476 2476
2477 if repo is None and not ui.config("web", "webdir_conf"): 2477 if repo is None and not ui.config("web", "webdir_conf"):
2478 raise hg.RepoError(_("There is no Mercurial repository here" 2478 raise hg.RepoError(_("There is no Mercurial repository here"
2479 " (.hg not found)")) 2479 " (.hg not found)"))