Mercurial > public > mercurial-scm > hg

diff mercurial/profiling.py @ 33195:5d8942dbe49e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/mercurial/profiling.py	Fri Jun 30 03:28:02 2017 +0200
+++ b/mercurial/profiling.py	Sat Jul 01 20:34:27 2017 -0700
@@ -141,6 +141,7 @@
             showmax = ui.configwith(fraction, 'profiling', 'showmax', 0.999)
             kwargs.update(minthreshold=showmin, maxthreshold=showmax)
         elif profformat == 'hotpath':
+            # inconsistent config: profiling.showmin
             limit = ui.configwith(fraction, 'profiling', 'showmin', 0.05)
             kwargs['limit'] = limit