Mercurial > public > mercurial-scm > hg
comparison mercurial/patch.py @ 34013:da07367d683b
mdiff: add a --ignore-space-at-eol option
Add an option that only ignores whitespaces at EOL. The name of the option is
the same as Git.
.. feature::
Added `--ignore-space-at-eol` diff option to ignore whitespace differences
at line endings.
Differential Revision: https://phab.mercurial-scm.org/D422
| author | David Soria Parra <davidsp@fb.com> |
|---|---|
| date | Tue, 29 Aug 2017 18:20:50 -0700 |
| parents | 5707bfe04deb |
| children | c0170d88ed2b |
comparison
equal
deleted
inserted
replaced
| 34012:dcfdf4d09663 | 34013:da07367d683b |
|---|---|
| 2280 buildopts['ignorews'] = get('ignore_all_space', 'ignorews') | 2280 buildopts['ignorews'] = get('ignore_all_space', 'ignorews') |
| 2281 buildopts['ignorewsamount'] = get('ignore_space_change', | 2281 buildopts['ignorewsamount'] = get('ignore_space_change', |
| 2282 'ignorewsamount') | 2282 'ignorewsamount') |
| 2283 buildopts['ignoreblanklines'] = get('ignore_blank_lines', | 2283 buildopts['ignoreblanklines'] = get('ignore_blank_lines', |
| 2284 'ignoreblanklines') | 2284 'ignoreblanklines') |
| 2285 buildopts['ignorewseol'] = get('ignore_space_at_eol', 'ignorewseol') | |
| 2285 if formatchanging: | 2286 if formatchanging: |
| 2286 buildopts['text'] = opts and opts.get('text') | 2287 buildopts['text'] = opts and opts.get('text') |
| 2287 binary = None if opts is None else opts.get('binary') | 2288 binary = None if opts is None else opts.get('binary') |
| 2288 buildopts['nobinary'] = (not binary if binary is not None | 2289 buildopts['nobinary'] = (not binary if binary is not None |
| 2289 else get('nobinary', forceplain=False)) | 2290 else get('nobinary', forceplain=False)) |