[PATCH 4 of 8 V2] patch.diffopts: allow a setting to be forced in plain mode

Siddharth Agarwal sid0 at fb.com
Thu Nov 13 17:08:49 CST 2014


# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1415864845 28800
#      Wed Nov 12 23:47:25 2014 -0800
# Node ID 6a40a01c1b5ce0a4edb972ca42bfcb2e791e48fe
# Parent  1b945e3178b5781a10121adc9d2687be4b0e86cd
patch.diffopts: allow a setting to be forced in plain mode

Upcoming patches will add an option that will almost certainly break diff
output parsers when enabled. Add support for forcing an option to something in
plain mode, as a fallback. Options passed in via the CLI are not affected,
though -- it is assumed that any script passing the option in explicitly knows
what it is doing.

diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -1564,6 +1564,8 @@
             v = opts.get(key)
             if v:
                 return v
+        if forceplain is not None and ui.plain():
+            return forceplain
         return getter(section, name or key, None, untrusted=untrusted)
 
     return mdiff.diffopts(


More information about the Mercurial-devel mailing list