Mercurial > kallithea

changeset 4255:074f9dd32736

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix built-in python hook names read from database in brand compatibility mode
author Travis Burtrum <android@moparisthebest.com>
date Mon, 14 Jul 2014 21:12:23 +0200
parents 493ccf3e22e6
children e2ac4623c1c4
files kallithea/lib/utils.py
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/utils.py	Mon Jul 14 21:12:23 2014 +0200
+++ b/kallithea/lib/utils.py	Mon Jul 14 21:12:23 2014 +0200
@@ -44,6 +44,8 @@
 from webhelpers.text import collapse, remove_formatting, strip_tags
 from beaker.cache import _cache_decorate
 
+from kallithea import BRAND
+
 from kallithea.lib.vcs import get_backend
 from kallithea.lib.vcs.backends.base import BaseChangeset
 from kallithea.lib.vcs.utils.lazy import LazyProperty
@@ -382,10 +384,13 @@
         hg_ui = ret
         for ui_ in hg_ui:
             if ui_.ui_active:
+                ui_val = safe_str(ui_.ui_value)
+                if ui_.ui_section == 'hooks' and BRAND != 'kallithea' and ui_val.startswith('python:' + BRAND + '.lib.hooks.'):
+                    ui_val = ui_val.replace('python:' + BRAND + '.lib.hooks.', 'python:kallithea.lib.hooks.')
                 log.debug('settings ui from db: [%s] %s=%s', ui_.ui_section,
-                          ui_.ui_key, ui_.ui_value)
+                          ui_.ui_key, ui_val)
                 baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key),
-                                 safe_str(ui_.ui_value))
+                                 ui_val)
             if ui_.ui_key == 'push_ssl':
                 # force set push_ssl requirement to False, kallithea
                 # handles that