# HG changeset patch # User Marcin Kuzminski # Date 2012-11-04 14:54:30 # Node ID 78227b65a358cbe0db8c13491efb878693d0cf1c # Parent 6cd0f8f8aef18801f8e955d007e21f36bac949cc remove duplicated code for generating UI objects diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -778,30 +778,8 @@ class Repository(Base, BaseModel): """ Creates an db based ui object for this repository """ - from mercurial import ui - from mercurial import config - baseui = ui.ui() - - #clean the baseui object - baseui._ocfg = config.config() - baseui._ucfg = config.config() - baseui._tcfg = config.config() - - ret = RhodeCodeUi.query()\ - .options(FromCache("sql_cache_short", "repository_repo_ui")).all() - - hg_ui = ret - for ui_ in hg_ui: - if ui_.ui_active: - log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, - ui_.ui_key, ui_.ui_value) - baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value) - if ui_.ui_key == 'push_ssl': - # force set push_ssl requirement to False, rhodecode - # handles that - baseui.setconfig(ui_.ui_section, ui_.ui_key, False) - - return baseui + from rhodecode.lib.utils import make_ui + return make_ui('db', clear_session=False) @classmethod def inject_ui(cls, repo, extras={}):