equal
deleted
inserted
replaced
2208 'ignorewsamount') |
2208 'ignorewsamount') |
2209 buildopts['ignoreblanklines'] = get('ignore_blank_lines', |
2209 buildopts['ignoreblanklines'] = get('ignore_blank_lines', |
2210 'ignoreblanklines') |
2210 'ignoreblanklines') |
2211 if formatchanging: |
2211 if formatchanging: |
2212 buildopts['text'] = opts and opts.get('text') |
2212 buildopts['text'] = opts and opts.get('text') |
2213 buildopts['nobinary'] = get('nobinary', forceplain=False) |
2213 binary = None if opts is None else opts.get('binary') |
|
2214 buildopts['nobinary'] = (not binary if binary is not None |
|
2215 else get('nobinary', forceplain=False)) |
2214 buildopts['noprefix'] = get('noprefix', forceplain=False) |
2216 buildopts['noprefix'] = get('noprefix', forceplain=False) |
2215 |
2217 |
2216 return mdiff.diffopts(**pycompat.strkwargs(buildopts)) |
2218 return mdiff.diffopts(**pycompat.strkwargs(buildopts)) |
2217 |
2219 |
2218 def diff(repo, node1=None, node2=None, match=None, changes=None, |
2220 def diff(repo, node1=None, node2=None, match=None, changes=None, |