Mercurial > kallithea

changeset 8522:c9834271cd06 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg: restore make_ui reading of .hg/hgrc This regressed with f83326e2e66c, released in 0.6.0 . Fix problem reported by Felipe Cardoso Resende.
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 21 Apr 2021 14:50:09 +0200
parents 7f3515800bd8
children 016b5022514d
files kallithea/lib/utils.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/utils.py	Mon Jan 04 22:45:53 2021 +0100
+++ b/kallithea/lib/utils.py	Wed Apr 21 14:50:09 2021 +0200
@@ -349,7 +349,7 @@
 
     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