Mercurial > public > mercurial-scm > hg-stable
diff mercurial/patch.py @ 2888: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 Mon Aug 14 15:07:00 2006 -0500 +++ b/mercurial/patch.py Tue Aug 15 11:34:08 2006 -0500 @@ -251,6 +251,18 @@ 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