Mercurial > public > mercurial-scm > hg

diff mercurial/configitems.py @ 40460:4fe63b573791

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Fri, 02 Nov 2018 14:24:29 -0400
parents 968dd7e02ac5 14b6afc6cb28
children 86dfae98a3a2
line wrap: on
line diff
--- a/mercurial/configitems.py	Sat Oct 13 01:55:40 2018 -0700
+++ b/mercurial/configitems.py	Fri Nov 02 14:24:29 2018 -0400
@@ -613,7 +613,7 @@
 coreconfigitem('experimental', 'server.manifestdata.recommended-batch-size',
     default=100000,
 )
-coreconfigitem('experimental.server', 'stream-narrow-clones',
+coreconfigitem('experimental', 'server.stream-narrow-clones',
     default=False,
 )
 coreconfigitem('experimental', 'single-head-per-branch',
@@ -934,7 +934,7 @@
     default='hotpath',
 )
 coreconfigitem('profiling', 'time-track',
-    default='real',
+    default=dynamicdefault,
 )
 coreconfigitem('profiling', 'type',
     default='stat',