Mercurial > kallithea
changeset 2982:78227b65a358 beta
remove duplicated code for generating UI objects
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 04 Nov 2012 14:54:30 +0100 |
| parents | 6cd0f8f8aef1 |
| children | 6d7f88566127 |
| files | rhodecode/model/db.py |
| diffstat | 1 files changed, 2 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/model/db.py Sun Nov 04 14:34:34 2012 +0100 +++ b/rhodecode/model/db.py Sun Nov 04 14:54:30 2012 +0100 @@ -778,30 +778,8 @@ """ 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={}):