Show More
@@ -107,6 +107,18 b' class HgWeb(mercurial.hgweb.hgweb_mod.hg' | |||||
107 | return super()._runwsgi(req, res, repo) |
|
107 | return super()._runwsgi(req, res, repo) | |
108 |
|
108 | |||
109 |
|
109 | |||
|
110 | def sanitize_hg_ui(baseui): | |||
|
111 | # NOTE(marcink): since python3 hgsubversion is deprecated. | |||
|
112 | # From old installations we might still have this set enabled | |||
|
113 | # we explicitly remove this now here to make sure it wont propagate further | |||
|
114 | ||||
|
115 | if baseui.config(b'extensions', b'hgsubversion') is not None: | |||
|
116 | for cfg in (baseui._ocfg, baseui._tcfg, baseui._ucfg): | |||
|
117 | if b'extensions' in cfg: | |||
|
118 | if b'hgsubversion' in cfg[b'extensions']: | |||
|
119 | del cfg[b'extensions'][b'hgsubversion'] | |||
|
120 | ||||
|
121 | ||||
110 | def make_hg_ui_from_config(repo_config): |
|
122 | def make_hg_ui_from_config(repo_config): | |
111 | baseui = mercurial.ui.ui() |
|
123 | baseui = mercurial.ui.ui() | |
112 |
|
124 | |||
@@ -156,6 +168,7 b' def create_hg_wsgi_app(repo_path, repo_n' | |||||
156 |
|
168 | |||
157 | baseui = make_hg_ui_from_config(config) |
|
169 | baseui = make_hg_ui_from_config(config) | |
158 | update_hg_ui_from_hgrc(baseui, repo_path) |
|
170 | update_hg_ui_from_hgrc(baseui, repo_path) | |
|
171 | sanitize_hg_ui(baseui) | |||
159 |
|
172 | |||
160 | try: |
|
173 | try: | |
161 | return HgWeb(safe_bytes(repo_path), name=safe_bytes(repo_name), baseui=baseui) |
|
174 | return HgWeb(safe_bytes(repo_path), name=safe_bytes(repo_name), baseui=baseui) |
General Comments 0
You need to be logged in to leave comments.
Login now