kallithea Changeset - c9834271cd06

Changeset - c9834271cd06

Parent rev.

Child rev.

[Not reviewed]

stable

0 1 0

Mads Kiilerich (mads) - 5 years ago 2021-04-21 14:50:09
mads@kiilerich.com

hg: restore make_ui reading of .hg/hgrc

This regressed with f83326e2e66c, released in 0.6.0 .

Fix problem reported by Felipe Cardoso Resende.

1 file changed with 1 insertions and 1 deletions:

kallithea/lib/utils.py

0 comments (0 inline, 0 general)

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -346,13 +346,13 @@ def make_ui(repo_path=None): @@
     # push / pull hooks
     baseui.setconfig(b'hooks', b'changegroup.kallithea_log_push_action', b'python:kallithea.lib.hooks.log_push_action')
     baseui.setconfig(b'hooks', b'outgoing.kallithea_log_pull_action', b'python:kallithea.lib.hooks.log_pull_action')
     if repo_path is not None:
         # Note: MercurialRepository / mercurial.localrepo.instance will do this too, so it will always be possible to override db settings or what is hardcoded above
         baseui.readconfig(repo_path)
+        baseui.readconfig(safe_bytes(os.path.join(repo_path, '.hg', 'hgrc')))
     assert baseui.plain()  # set by hgcompat.monkey_do (invoked from import of vcs.backends.hg) to minimize potential impact of loading config files
     return baseui
 def set_app_settings(config):

0 comments (0 inline, 0 general)