equal
deleted
inserted
replaced
2937 baseui.setconfig("web", o, val) |
2937 baseui.setconfig("web", o, val) |
2938 if repo and repo.ui != baseui: |
2938 if repo and repo.ui != baseui: |
2939 repo.ui.setconfig("web", o, val) |
2939 repo.ui.setconfig("web", o, val) |
2940 |
2940 |
2941 if opts.get('webdir_conf'): |
2941 if opts.get('webdir_conf'): |
2942 app = hgwebdir_mod.hgwebdir(opts['webdir_conf'], ui) |
2942 app = hgwebdir_mod.hgwebdir(opts['webdir_conf'], baseui=ui) |
2943 elif repo is not None: |
2943 elif repo is not None: |
2944 app = hgweb_mod.hgweb(hg.repository(repo.ui, repo.root)) |
2944 app = hgweb_mod.hgweb(hg.repository(repo.ui, repo.root)) |
2945 else: |
2945 else: |
2946 raise error.RepoError(_("There is no Mercurial repository" |
2946 raise error.RepoError(_("There is no Mercurial repository" |
2947 " here (.hg not found)")) |
2947 " here (.hg not found)")) |