--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -267,6 +267,20 @@ def patch(patchname, ui, strip=1, cwd=No
return (files, fuzz)
+def diffopts(ui, opts={}):
+ return mdiff.diffopts(
+ text=opts.get('text'),
+ git=(opts.get('git') or
+ ui.configbool('diff', 'git', None)),
+ showfunc=(opts.get('show_function') or
+ ui.configbool('diff', 'showfunc', None)),
+ ignorews=(opts.get('ignore_all_space') or
+ ui.configbool('diff', 'ignorews', None)),
+ ignorewsamount=(opts.get('ignore_space_change') or
+ ui.configbool('diff', 'ignorewsamount', None)),
+ ignoreblanklines=(opts.get('ignore_blank_lines') or
+ ui.configbool('diff', 'ignoreblanklines', None)))
+
def diff(repo, node1=None, node2=None, files=None, match=util.always,
fp=None, changes=None, opts=None):
'''print diff of changes to files between two nodes, or node and