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.
configitems: register 'merge.checkunknown' and 'merge.checkignored'
authorBoris Feld <boris.feld@octobus.net>
Sun, 08 Oct 2017 21:48:40 +0200
changeset 34522 bed1d2eaa108
parent 34521 aacb17cc0ee4
child 34523 486dbd6afa57
configitems: register 'merge.checkunknown' and 'merge.checkignored' They both use the same function defining a default, so we need to update them at the same time.
mercurial/configitems.py file | annotate | diff | comparison | revisions
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/configitems.py	Sun Oct 08 21:47:14 2017 +0200
+++ b/mercurial/configitems.py	Sun Oct 08 21:48:40 2017 +0200
@@ -344,6 +344,12 @@
 coreconfigitem('http_proxy', 'user',
     default=None,
 )
+coreconfigitem('merge', 'checkunknown',
+    default='abort',
+)
+coreconfigitem('merge', 'checkignored',
+    default='abort',
+)
 coreconfigitem('merge', 'followcopies',
     default=True,
 )
--- a/mercurial/merge.py	Sun Oct 08 21:47:14 2017 +0200
+++ b/mercurial/merge.py	Sun Oct 08 21:48:40 2017 +0200
@@ -603,7 +603,7 @@
         self._results[f] = 0, 'g'
 
 def _getcheckunknownconfig(repo, section, name):
-    config = repo.ui.config(section, name, default='abort')
+    config = repo.ui.config(section, name)
     valid = ['abort', 'ignore', 'warn']
     if config not in valid:
         validstr = ', '.join(["'" + v + "'" for v in valid])
mercurial