Show More
@@ -107,7 +107,7 b' class hgwebzc(hgweb_mod.hgweb):' | |||||
107 |
|
107 | |||
108 | class hgwebdirzc(hgwebdir_mod.hgwebdir): |
|
108 | class hgwebdirzc(hgwebdir_mod.hgwebdir): | |
109 | def __init__(self, conf, baseui=None): |
|
109 | def __init__(self, conf, baseui=None): | |
110 | super(hgwebdirzc, self).__init__(conf, baseui) |
|
110 | super(hgwebdirzc, self).__init__(conf, baseui=baseui) | |
111 | prefix = self.ui.config("web", "prefix", "").strip('/') + '/' |
|
111 | prefix = self.ui.config("web", "prefix", "").strip('/') + '/' | |
112 | for repo, path in self.repos: |
|
112 | for repo, path in self.repos: | |
113 | u = self.ui.copy() |
|
113 | u = self.ui.copy() |
@@ -2939,7 +2939,7 b' def serve(ui, repo, **opts):' | |||||
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: |
General Comments 0
You need to be logged in to leave comments.
Login now