mercurial/diffutil.py
changeset 49898 024e0580b853
parent 48875 6000f5b25c9b
child 50252 a6b8b1ab9116
equal deleted inserted replaced
49897:a78dfb1ad60e 49898:024e0580b853
   118         buildopts[b'ignoreblanklines'] = get(
   118         buildopts[b'ignoreblanklines'] = get(
   119             b'ignore_blank_lines', b'ignoreblanklines'
   119             b'ignore_blank_lines', b'ignoreblanklines'
   120         )
   120         )
   121         buildopts[b'ignorewseol'] = get(b'ignore_space_at_eol', b'ignorewseol')
   121         buildopts[b'ignorewseol'] = get(b'ignore_space_at_eol', b'ignorewseol')
   122     if formatchanging:
   122     if formatchanging:
   123         buildopts[b'text'] = opts and opts.get(b'text')
   123         buildopts[b'text'] = None if opts is None else opts.get(b'text')
   124         binary = None if opts is None else opts.get(b'binary')
   124         binary = None if opts is None else opts.get(b'binary')
   125         buildopts[b'nobinary'] = (
   125         buildopts[b'nobinary'] = (
   126             not binary
   126             not binary
   127             if binary is not None
   127             if binary is not None
   128             else get(b'nobinary', forceplain=False)
   128             else get(b'nobinary', forceplain=False)