kallithea Changeset - 9ddb4bd52391

Changeset - 9ddb4bd52391

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 6 years ago 2020-03-06 18:02:12
mads@kiilerich.com

Grafted from: 678f98b43678

hg: set HGPLAIN globally to minimize potential impact from reading hgrc configuration when creating ui

See `hg help scripting` for HGPLAIN description ... but Kallithea will invoke
Mercurial internals directly, so HGPLAIN shouldn't really impact anything.

2 files changed with 5 insertions and 0 deletions:

kallithea/lib/utils.py

kallithea/lib/vcs/utils/hgcompat.py

0 comments (0 inline, 0 general)

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -350,48 +350,49 @@ def make_ui(repo_path=None): @@
     # force set push_ssl requirement to False, Kallithea handles that
     baseui.setconfig(b'web', b'push_ssl', False)
     baseui.setconfig(b'web', b'allow_push', b'*')
     # prevent interactive questions for ssh password / passphrase
     ssh = baseui.config(b'ui', b'ssh', default=b'ssh')
     baseui.setconfig(b'ui', b'ssh', b'%s -oBatchMode=yes -oIdentitiesOnly=yes' % ssh)
     # 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:
         hgrc_path = os.path.join(repo_path, '.hg', 'hgrc')
         if os.path.isfile(hgrc_path):
             log.debug('reading hgrc from %s', hgrc_path)
             cfg = mercurial.config.config()
             cfg.read(safe_bytes(hgrc_path))
             for section in ui_sections:
                 for k, v in cfg.items(section):
                     log.debug('config from file: [%s] %s=%s', section, k, v)
                     baseui.setconfig(ascii_bytes(section), ascii_bytes(k), safe_bytes(v))
         else:
             log.debug('hgrc file is not present at %s, skipping...', hgrc_path)
     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):
     """
     Updates app config with new settings from database
     :param config:
     """
     hgsettings = Setting.get_app_settings()
     for k, v in hgsettings.items():
         config[k] = v
 def set_vcs_config(config):
     """
     Patch VCS config with some Kallithea specific stuff
     :param config: kallithea.CONFIG
     """
     settings.BACKENDS = {
         'hg': 'kallithea.lib.vcs.backends.hg.MercurialRepository',
         'git': 'kallithea.lib.vcs.backends.git.GitRepository',
+    }

kallithea/lib/vcs/utils/hgcompat.py

➞

Show inline comments

 """
 Mercurial libs compatibility
 """
 import mercurial.encoding
 import mercurial.localrepo
 def monkey_do():
     """Apply some Mercurial monkey patching"""
     # workaround for 3.3 94ac64bcf6fe and not calling largefiles reposetup correctly, and test_archival failing
     mercurial.localrepo.localrepository._lfstatuswriters = [lambda *msg, **opts: None]
     # 3.5 7699d3212994 added the invariant that repo.lfstatus must exist before hitting overridearchive
     mercurial.localrepo.localrepository.lfstatus = False
     # Minimize potential impact from custom configuration
     mercurial.encoding.environ[b'HGPLAIN'] = b'1'

0 comments (0 inline, 0 general)