equal
deleted
inserted
replaced
2144 'ignorewsamount') |
2144 'ignorewsamount') |
2145 buildopts['ignoreblanklines'] = get('ignore_blank_lines', |
2145 buildopts['ignoreblanklines'] = get('ignore_blank_lines', |
2146 'ignoreblanklines') |
2146 'ignoreblanklines') |
2147 if formatchanging: |
2147 if formatchanging: |
2148 buildopts['text'] = opts and opts.get('text') |
2148 buildopts['text'] = opts and opts.get('text') |
2149 buildopts['nobinary'] = get('nobinary') |
2149 buildopts['nobinary'] = get('nobinary', forceplain=False) |
2150 buildopts['noprefix'] = get('noprefix', forceplain=False) |
2150 buildopts['noprefix'] = get('noprefix', forceplain=False) |
2151 |
2151 |
2152 return mdiff.diffopts(**buildopts) |
2152 return mdiff.diffopts(**buildopts) |
2153 |
2153 |
2154 def diff(repo, node1=None, node2=None, match=None, changes=None, opts=None, |
2154 def diff(repo, node1=None, node2=None, match=None, changes=None, opts=None, |