289 def diffopts(ui, opts={}): |
289 def diffopts(ui, opts={}): |
290 return mdiff.diffopts( |
290 return mdiff.diffopts( |
291 text=opts.get('text'), |
291 text=opts.get('text'), |
292 git=(opts.get('git') or |
292 git=(opts.get('git') or |
293 ui.configbool('diff', 'git', None)), |
293 ui.configbool('diff', 'git', None)), |
|
294 nodates=(opts.get('nodates') or |
|
295 ui.configbool('diff', 'nodates', None)), |
294 showfunc=(opts.get('show_function') or |
296 showfunc=(opts.get('show_function') or |
295 ui.configbool('diff', 'showfunc', None)), |
297 ui.configbool('diff', 'showfunc', None)), |
296 ignorews=(opts.get('ignore_all_space') or |
298 ignorews=(opts.get('ignore_all_space') or |
297 ui.configbool('diff', 'ignorews', None)), |
299 ui.configbool('diff', 'ignorews', None)), |
298 ignorewsamount=(opts.get('ignore_space_change') or |
300 ignorewsamount=(opts.get('ignore_space_change') or |