Mercurial > hg
comparison mercurial/diffutil.py @ 45942:89a2afe31e82
formating: upgrade to black 20.8b1
This required a couple of small tweaks to un-confuse black, but now it
works. Big formatting changes come from:
* Dramatically improved collection-splitting logic upstream
* Black having a strong (correct IMO) opinion that """ is better than '''
Differential Revision: https://phab.mercurial-scm.org/D9430
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 27 Nov 2020 17:03:29 -0500 |
parents | 687b865b95ad |
children | 6000f5b25c9b |
comparison
equal
deleted
inserted
replaced
45941:346af7687c6f | 45942:89a2afe31e82 |
---|---|
41 git=False, | 41 git=False, |
42 whitespace=False, | 42 whitespace=False, |
43 formatchanging=False, | 43 formatchanging=False, |
44 configprefix=b'', | 44 configprefix=b'', |
45 ): | 45 ): |
46 '''return diffopts with only opted-in features parsed | 46 """return diffopts with only opted-in features parsed |
47 | 47 |
48 Features: | 48 Features: |
49 - git: git-style diffs | 49 - git: git-style diffs |
50 - whitespace: whitespace options like ignoreblanklines and ignorews | 50 - whitespace: whitespace options like ignoreblanklines and ignorews |
51 - formatchanging: options that will likely break or cause correctness issues | 51 - formatchanging: options that will likely break or cause correctness issues |
52 with most diff parsers | 52 with most diff parsers |
53 ''' | 53 """ |
54 | 54 |
55 def get(key, name=None, getter=ui.configbool, forceplain=None): | 55 def get(key, name=None, getter=ui.configbool, forceplain=None): |
56 if opts: | 56 if opts: |
57 v = opts.get(key) | 57 v = opts.get(key) |
58 # diffopts flags are either None-default (which is passed | 58 # diffopts flags are either None-default (which is passed |