equal
deleted
inserted
replaced
80 for k in ('debug', 'fallbackencoding', 'quiet', 'slash', |
80 for k in ('debug', 'fallbackencoding', 'quiet', 'slash', |
81 'logtemplate', 'style', |
81 'logtemplate', 'style', |
82 'traceback', 'verbose'): |
82 'traceback', 'verbose'): |
83 if k in cfg['ui']: |
83 if k in cfg['ui']: |
84 del cfg['ui'][k] |
84 del cfg['ui'][k] |
|
85 for k, v in cfg.items('defaults'): |
|
86 del cfg['defaults'][k] |
|
87 # Don't remove aliases from the configuration if in the exceptionlist |
|
88 if self.plain('alias'): |
85 for k, v in cfg.items('alias'): |
89 for k, v in cfg.items('alias'): |
86 del cfg['alias'][k] |
90 del cfg['alias'][k] |
87 for k, v in cfg.items('defaults'): |
|
88 del cfg['defaults'][k] |
|
89 |
91 |
90 if trusted: |
92 if trusted: |
91 self._tcfg.update(cfg) |
93 self._tcfg.update(cfg) |
92 self._tcfg.update(self._ocfg) |
94 self._tcfg.update(self._ocfg) |
93 self._ucfg.update(cfg) |
95 self._ucfg.update(cfg) |