Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dispatch.py @ 14748:1b8c70c9f47c stable
dispatch: make sure unspecified global ui options don't override old values
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Fri, 24 Jun 2011 12:16:14 +0300 |
parents | 23325c5ef6a7 |
children | 99ace3cb7352 |
line wrap: on
line diff
--- a/mercurial/dispatch.py Sat Jun 25 02:30:24 2011 +0200 +++ b/mercurial/dispatch.py Fri Jun 24 12:16:14 2011 +0300 @@ -592,14 +592,12 @@ (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3])) atexit.register(print_time) - if options['verbose'] or options['debug'] or options['quiet']: - for ui_ in (ui, lui): - ui_.setconfig('ui', 'verbose', str(bool(options['verbose']))) - ui_.setconfig('ui', 'debug', str(bool(options['debug']))) - ui_.setconfig('ui', 'quiet', str(bool(options['quiet']))) - if options['traceback']: - for ui_ in (ui, lui): - ui_.setconfig('ui', 'traceback', 'on') + for opt in ('verbose', 'debug', 'quiet', 'traceback'): + val = bool(options[opt]) + if val: + for ui_ in (ui, lui): + ui_.setconfig('ui', opt, str(val)) + if options['noninteractive']: for ui_ in (ui, lui): ui_.setconfig('ui', 'interactive', 'off')