265 for gp in gitpatches: |
265 for gp in gitpatches: |
266 files[gp.path] = (gp.op, gp) |
266 files[gp.path] = (gp.op, gp) |
267 |
267 |
268 return (files, fuzz) |
268 return (files, fuzz) |
269 |
269 |
|
270 def diffopts(ui, opts={}): |
|
271 return mdiff.diffopts( |
|
272 text=opts.get('text'), |
|
273 git=(opts.get('git') or |
|
274 ui.configbool('diff', 'git', None)), |
|
275 showfunc=(opts.get('show_function') or |
|
276 ui.configbool('diff', 'showfunc', None)), |
|
277 ignorews=(opts.get('ignore_all_space') or |
|
278 ui.configbool('diff', 'ignorews', None)), |
|
279 ignorewsamount=(opts.get('ignore_space_change') or |
|
280 ui.configbool('diff', 'ignorewsamount', None)), |
|
281 ignoreblanklines=(opts.get('ignore_blank_lines') or |
|
282 ui.configbool('diff', 'ignoreblanklines', None))) |
|
283 |
270 def diff(repo, node1=None, node2=None, files=None, match=util.always, |
284 def diff(repo, node1=None, node2=None, files=None, match=util.always, |
271 fp=None, changes=None, opts=None): |
285 fp=None, changes=None, opts=None): |
272 '''print diff of changes to files between two nodes, or node and |
286 '''print diff of changes to files between two nodes, or node and |
273 working directory. |
287 working directory. |
274 |
288 |