Mercurial > hg > mercurial-source
changeset 34012:dd50a370c8cb
configitems: register the 'patch.eol' config
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 30 Jun 2017 03:43:35 +0200 |
parents | 35c233975b78 |
children | 5dcbd2045dcb |
files | mercurial/configitems.py mercurial/patch.py |
diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -110,6 +110,9 @@ coreconfigitem('hostsecurity', 'disabletls10warning', default=False, ) +coreconfigitem('patch', 'eol', + default='strict', +) coreconfigitem('patch', 'fuzz', default=2, )
--- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -2077,7 +2077,7 @@ if files is None: files = set() if eolmode is None: - eolmode = ui.config('patch', 'eol', 'strict') + eolmode = ui.config('patch', 'eol') if eolmode.lower() not in eolmodes: raise error.Abort(_('unsupported line endings type: %s') % eolmode) eolmode = eolmode.lower()