diff mercurial/patch.py @ 2908:3848488244fc

Move ui.diffopts to patch.diffopts where it belongs
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 11:34:08 -0500
parents eab07a7b7491
children ef8ee4477019 addb58e3b41c
line wrap: on
line diff
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -251,6 +251,18 @@ def patch(strip, patchname, ui, cwd=None
 
     return files
 
+def diffopts(ui, opts={}):
+    return mdiff.diffopts(
+        text=opts.get('text'),
+        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