Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: register the 'devel.strip-obsmarkers' config
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 28 Jun 2017 13:32:36 +0200
changeset 33166 5c9ad50fd62f
parent 33165 1a6f28439135
child 33171 6d678ab1b10d
config: register the 'devel.strip-obsmarkers' config The single explicit default that existed so far is converted to registered config value.
mercurial/configitems.py file | annotate | diff | comparison | revisions
mercurial/repair.py file | annotate | diff | comparison | revisions 
--- a/mercurial/configitems.py	Wed Jun 28 13:32:28 2017 +0200
+++ b/mercurial/configitems.py	Wed Jun 28 13:32:36 2017 +0200
@@ -80,6 +80,9 @@
 coreconfigitem('devel', 'serverrequirecert',
     default=None,
 )
+coreconfigitem('devel', 'strip-obsmarkers',
+    default=True,
+)
 coreconfigitem('patch', 'fuzz',
     default=2,
 )
--- a/mercurial/repair.py	Wed Jun 28 13:32:28 2017 +0200
+++ b/mercurial/repair.py	Wed Jun 28 13:32:36 2017 +0200
@@ -132,7 +132,7 @@
     stripbases = [cl.node(r) for r in tostrip]
 
     stripobsidx = obsmarkers = ()
-    if repo.ui.configbool('devel', 'strip-obsmarkers', True):
+    if repo.ui.configbool('devel', 'strip-obsmarkers'):
         obsmarkers = obsutil.exclusivemarkers(repo, stripbases)
     if obsmarkers:
         stripobsidx = [i for i, m in enumerate(repo.obsstore)
mercurial