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 the 'patch.eol' config
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 30 Jun 2017 03:43:35 +0200
changeset 33229 dd50a370c8cb
parent 33228 35c233975b78
child 33230 5dcbd2045dcb
configitems: register the 'patch.eol' config
mercurial/configitems.py file | annotate | diff | comparison | revisions
mercurial/patch.py file | annotate | diff | comparison | revisions 
--- 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,
 )
--- 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()
mercurial