From 40e88b2e2b293858c2325fce87f4bdddd2aa7344 Mon Sep 17 00:00:00 2001 From: Boris Feld Date: Sun, 8 Oct 2017 21:48:40 +0200 Subject: [PATCH] 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 | 6 ++++++ mercurial/merge.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mercurial/configitems.py b/mercurial/configitems.py index 8a943158cd..90b83debbb 100644 --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -344,6 +344,12 @@ coreconfigitem('http_proxy', 'passwd', coreconfigitem('http_proxy', 'user', default=None, ) +coreconfigitem('merge', 'checkunknown', + default='abort', +) +coreconfigitem('merge', 'checkignored', + default='abort', +) coreconfigitem('merge', 'followcopies', default=True, ) diff --git a/mercurial/merge.py b/mercurial/merge.py index bc4aecfc10..2064e3fb54 100644 --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -603,7 +603,7 @@ class mergestate(object): 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])