equal
deleted
inserted
replaced
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)")) |