Mercurial > public > mercurial-scm > hg
comparison mercurial/profiling.py @ 33195:5d8942dbe49e
check-config: syntax to allow inconsistent config values
The ignore regular expression has been updated to detect
"inconsistent config." If present, we track which configs have
that set and we suppress the conflicting defaults error for those
options.
I also added named groups to the regexp to aid readability.
A comment was added to profiling.py to make a desired inconsistent
value error go away.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 01 Jul 2017 20:34:27 -0700 |
| parents | 41b081ac2145 |
| children | 0407a51b9d8c |
comparison
equal
deleted
inserted
replaced
| 33194:c077eac329e2 | 33195:5d8942dbe49e |
|---|---|
| 139 if profformat == 'chrome': | 139 if profformat == 'chrome': |
| 140 showmin = ui.configwith(fraction, 'profiling', 'showmin', 0.005) | 140 showmin = ui.configwith(fraction, 'profiling', 'showmin', 0.005) |
| 141 showmax = ui.configwith(fraction, 'profiling', 'showmax', 0.999) | 141 showmax = ui.configwith(fraction, 'profiling', 'showmax', 0.999) |
| 142 kwargs.update(minthreshold=showmin, maxthreshold=showmax) | 142 kwargs.update(minthreshold=showmin, maxthreshold=showmax) |
| 143 elif profformat == 'hotpath': | 143 elif profformat == 'hotpath': |
| 144 # inconsistent config: profiling.showmin | |
| 144 limit = ui.configwith(fraction, 'profiling', 'showmin', 0.05) | 145 limit = ui.configwith(fraction, 'profiling', 'showmin', 0.05) |
| 145 kwargs['limit'] = limit | 146 kwargs['limit'] = limit |
| 146 | 147 |
| 147 statprof.display(fp, data=data, format=displayformat, **kwargs) | 148 statprof.display(fp, data=data, format=displayformat, **kwargs) |
| 148 | 149 |