# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1415864845 28800
# Node ID 922fcfb02e77c751f67563dcebe71b2a026d220d
# Parent  ac072c79bd9d4005d793eb94a01d5cb961e7f7bc
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 -r ac072c79bd9d -r 922fcfb02e77 mercurial/patch.py
--- a/mercurial/patch.py	Wed Nov 12 23:44:17 2014 -0800
+++ b/mercurial/patch.py	Wed Nov 12 23:47:25 2014 -0800
@@ -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(