Patchwork [05,of,13] configitems: register the 'diff.*' config

login
register
mail settings
Submitter Boris Feld
Date Oct. 9, 2017, 8:21 a.m.
Message ID <fe09fec9dd8586ed9768.1507537312@FB>
Download mbox | patch
Permalink /patch/24648/
State Accepted
Headers show

Comments

Boris Feld - Oct. 9, 2017, 8:21 a.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1507492034 -7200
#      Sun Oct 08 21:47:14 2017 +0200
# Node ID fe09fec9dd8586ed9768feaa6f5cf6aadcc663c8
# Parent  9769711a3f453c53163200eb4a99107eb3a1433b
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r fe09fec9dd85
configitems: register the 'diff.*' config

All the config were already using a unified function with a forced default, so,
registering them all at once seems safe.

Patch

diff -r 9769711a3f45 -r fe09fec9dd85 mercurial/configitems.py
--- a/mercurial/configitems.py	Sun Oct 08 20:43:46 2017 +0200
+++ b/mercurial/configitems.py	Sun Oct 08 21:47:14 2017 +0200
@@ -146,6 +146,36 @@ 
 coreconfigitem('devel', 'strip-obsmarkers',
     default=True,
 )
+coreconfigitem('diff', 'nodates',
+    default=None,
+)
+coreconfigitem('diff', 'showfunc',
+    default=None,
+)
+coreconfigitem('diff', 'unified',
+    default=None,
+)
+coreconfigitem('diff', 'git',
+    default=None,
+)
+coreconfigitem('diff', 'ignorews',
+    default=None,
+)
+coreconfigitem('diff', 'ignorewsamount',
+    default=None,
+)
+coreconfigitem('diff', 'ignoreblanklines',
+    default=None,
+)
+coreconfigitem('diff', 'ignorewseol',
+    default=None,
+)
+coreconfigitem('diff', 'nobinary',
+    default=None,
+)
+coreconfigitem('diff', 'noprefix',
+    default=None,
+)
 coreconfigitem('email', 'charsets',
     default=list,
 )
diff -r 9769711a3f45 -r fe09fec9dd85 mercurial/patch.py
--- a/mercurial/patch.py	Sun Oct 08 20:43:46 2017 +0200
+++ b/mercurial/patch.py	Sun Oct 08 21:47:14 2017 +0200
@@ -2235,7 +2235,7 @@ 
                 return v
         if forceplain is not None and ui.plain():
             return forceplain
-        return getter(section, name or key, None, untrusted=untrusted)
+        return getter(section, name or key, untrusted=untrusted)
 
     # core options, expected to be understood by every diff parser
     buildopts = {