# HG changeset patch # User Pierre-Yves David # Date 1498787015 -7200 # Node ID dd50a370c8cb1e9c829b51a023e2f97159e80fa4 # Parent 35c233975b7830ba5cc2b248e26c0eb60f690246 configitems: register the 'patch.eol' config diff -r 35c233975b78 -r dd50a370c8cb mercurial/configitems.py --- a/mercurial/configitems.py Fri Jun 30 03:44:16 2017 +0200 +++ b/mercurial/configitems.py Fri Jun 30 03:43:35 2017 +0200 @@ -110,6 +110,9 @@ coreconfigitem('hostsecurity', 'disabletls10warning', default=False, ) +coreconfigitem('patch', 'eol', + default='strict', +) coreconfigitem('patch', 'fuzz', default=2, ) diff -r 35c233975b78 -r dd50a370c8cb mercurial/patch.py --- a/mercurial/patch.py Fri Jun 30 03:44:16 2017 +0200 +++ b/mercurial/patch.py Fri Jun 30 03:43:35 2017 +0200 @@ -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()