Mercurial > kallithea

comparison rhodecode/lib/utils.py @ 3133:95b4242a275e beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
logging: make 'settings ui from db' look more like Mercurial ini file notation
author Mads Kiilerich <madski@unity3d.com>
date Wed, 02 Jan 2013 13:54:20 +0100
parents ebd76deee70d
children ff315659d289
comparison
equal deleted inserted replaced
3132:5ba6249a7afe 3133:95b4242a275e
307 log.debug('reading hgrc from %s' % path) 307 log.debug('reading hgrc from %s' % path)
308 cfg = config.config() 308 cfg = config.config()
309 cfg.read(path) 309 cfg.read(path)
310 for section in ui_sections: 310 for section in ui_sections:
311 for k, v in cfg.items(section): 311 for k, v in cfg.items(section):
312 log.debug('settings ui from file[%s]%s:%s' % (section, k, v)) 312 log.debug('settings ui from file: [%s] %s=%s' % (section, k, v))
313 baseui.setconfig(safe_str(section), safe_str(k), safe_str(v)) 313 baseui.setconfig(safe_str(section), safe_str(k), safe_str(v))
314 314
315 elif read_from == 'db': 315 elif read_from == 'db':
316 sa = meta.Session() 316 sa = meta.Session()
317 ret = sa.query(RhodeCodeUi)\ 317 ret = sa.query(RhodeCodeUi)\
319 .all() 319 .all()
320 320
321 hg_ui = ret 321 hg_ui = ret
322 for ui_ in hg_ui: 322 for ui_ in hg_ui:
323 if ui_.ui_active: 323 if ui_.ui_active:
324 log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, 324 log.debug('settings ui from db: [%s] %s=%s', ui_.ui_section,
325 ui_.ui_key, ui_.ui_value) 325 ui_.ui_key, ui_.ui_value)
326 baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key), 326 baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key),
327 safe_str(ui_.ui_value)) 327 safe_str(ui_.ui_value))
328 if ui_.ui_key == 'push_ssl': 328 if ui_.ui_key == 'push_ssl':
329 # force set push_ssl requirement to False, rhodecode 329 # force set push_ssl requirement to False, rhodecode