##// END OF EJS Templates
patch.diffopts: use a dict for initialization...
Siddharth Agarwal -
r23429:f35526b9 default
parent child Browse files
Show More
@@ -1568,17 +1568,20 b' def diffopts(ui, opts=None, untrusted=Fa'
1568 return forceplain
1568 return forceplain
1569 return getter(section, name or key, None, untrusted=untrusted)
1569 return getter(section, name or key, None, untrusted=untrusted)
1570
1570
1571 return mdiff.diffopts(
1571 buildopts = {
1572 text=opts and opts.get('text'),
1572 'text': opts and opts.get('text'),
1573 git=get('git'),
1573 'git': get('git'),
1574 nodates=get('nodates'),
1574 'nodates': get('nodates'),
1575 nobinary=get('nobinary'),
1575 'nobinary': get('nobinary'),
1576 noprefix=get('noprefix', forceplain=False),
1576 'noprefix': get('noprefix', forceplain=False),
1577 showfunc=get('show_function', 'showfunc'),
1577 'showfunc': get('show_function', 'showfunc'),
1578 ignorews=get('ignore_all_space', 'ignorews'),
1578 'ignorews': get('ignore_all_space', 'ignorews'),
1579 ignorewsamount=get('ignore_space_change', 'ignorewsamount'),
1579 'ignorewsamount': get('ignore_space_change', 'ignorewsamount'),
1580 ignoreblanklines=get('ignore_blank_lines', 'ignoreblanklines'),
1580 'ignoreblanklines': get('ignore_blank_lines', 'ignoreblanklines'),
1581 context=get('unified', getter=ui.config))
1581 'context': get('unified', getter=ui.config),
1582 }
1583
1584 return mdiff.diffopts(**buildopts)
1582
1585
1583 def diff(repo, node1=None, node2=None, match=None, changes=None, opts=None,
1586 def diff(repo, node1=None, node2=None, match=None, changes=None, opts=None,
1584 losedatafn=None, prefix=''):
1587 losedatafn=None, prefix=''):
General Comments 0
You need to be logged in to leave comments. Login now