facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

configitems: register 'merge.checkunknown' and 'merge.checkignored'

Browse Source 
They both use the same function defining a default, so we need to update them at
the same time.
This commit is contained in:
Boris Feld 2017-10-08 21:48:40 +02:00
parent 2063677b32
commit 40e88b2e2b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mercurial/configitems.py
View File

@ -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,
)

2
mercurial/merge.py
View File

@ -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])