Mercurial > hg
changeset 10507:79dd96774187 stable
ui: unset ui.slash when HGPLAIN is set
| author | Brodie Rao <me+hg@dackz.net> |
|---|---|
| date | Thu, 18 Feb 2010 16:51:39 -0500 |
| parents | 42afde35e9f7 |
| children | cc35ad583e66 |
| files | mercurial/ui.py tests/test-hgrc tests/test-hgrc.out |
| diffstat | 3 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/ui.py Thu Feb 18 16:50:49 2010 -0500 +++ b/mercurial/ui.py Thu Feb 18 16:51:39 2010 -0500 @@ -80,8 +80,8 @@ self.warn(_("Ignored: %s\n") % str(inst)) if self.plain(): - for k in ('debug', 'fallbackencoding', 'quiet', 'traceback', - 'verbose'): + for k in ('debug', 'fallbackencoding', 'quiet', 'slash', + 'traceback', 'verbose'): if k in cfg['ui']: del cfg['ui'][k] for k, v in cfg.items('alias'):
--- a/tests/test-hgrc Thu Feb 18 16:50:49 2010 -0500 +++ b/tests/test-hgrc Thu Feb 18 16:51:39 2010 -0500 @@ -33,6 +33,7 @@ echo "debug=true" >> $HGRCPATH echo "fallbackencoding=ASCII" >> $HGRCPATH echo "quiet=true" >> $HGRCPATH +echo "slash=true" >> $HGRCPATH echo "traceback=true" >> $HGRCPATH echo "verbose=true" >> $HGRCPATH echo "[defaults]" >> $HGRCPATH
--- a/tests/test-hgrc.out Thu Feb 18 16:50:49 2010 -0500 +++ b/tests/test-hgrc.out Thu Feb 18 16:51:39 2010 -0500 @@ -11,13 +11,14 @@ foo.baz=bif cb hg: config error at $HGRCPATH:1: cannot include /no-such-file (No such file or directory) % customized hgrc -.../.hgrc:10: alias.log=log -g -.../.hgrc:8: defaults.identify=-n +.../.hgrc:11: alias.log=log -g +.../.hgrc:9: defaults.identify=-n .../.hgrc:2: ui.debug=true .../.hgrc:3: ui.fallbackencoding=ASCII .../.hgrc:4: ui.quiet=true -.../.hgrc:5: ui.traceback=true -.../.hgrc:6: ui.verbose=true +.../.hgrc:5: ui.slash=true +.../.hgrc:6: ui.traceback=true +.../.hgrc:7: ui.verbose=true % plain hgrc none: ui.traceback=True none: ui.verbose=False