Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 44349:a0ec05d93c8e
cleanup: re-run black on the codebase
Looks like a few patches have landed without having been blackened. I
strongly suspect I should write a patch for baymax that blackens
things on the way in...
# skip-blame automatic formatting
Differential Revision: https://phab.mercurial-scm.org/D8104
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 10 Feb 2020 17:31:05 -0500 |
parents | 5830efce522b |
children | 2bd3b95fdce0 |
comparison
equal
deleted
inserted
replaced
44348:d8d4fa9a7f18 | 44349:a0ec05d93c8e |
---|---|
168 (b'G', b'graph', None, _(b"show the revision DAG")), | 168 (b'G', b'graph', None, _(b"show the revision DAG")), |
169 ] + templateopts | 169 ] + templateopts |
170 | 170 |
171 diffopts = [ | 171 diffopts = [ |
172 (b'a', b'text', None, _(b'treat all files as text')), | 172 (b'a', b'text', None, _(b'treat all files as text')), |
173 (b'g', b'git', None, _(b'use git extended diff format (DEFAULT: diff.git)')), | 173 ( |
174 b'g', | |
175 b'git', | |
176 None, | |
177 _(b'use git extended diff format (DEFAULT: diff.git)'), | |
178 ), | |
174 (b'', b'binary', None, _(b'generate binary diffs in git mode (default)')), | 179 (b'', b'binary', None, _(b'generate binary diffs in git mode (default)')), |
175 (b'', b'nodates', None, _(b'omit dates from diff headers')), | 180 (b'', b'nodates', None, _(b'omit dates from diff headers')), |
176 ] | 181 ] |
177 | 182 |
178 diffwsopts = [ | 183 diffwsopts = [ |
207 (b'', b'noprefix', None, _(b'omit a/ and b/ prefixes from filenames')), | 212 (b'', b'noprefix', None, _(b'omit a/ and b/ prefixes from filenames')), |
208 ( | 213 ( |
209 b'p', | 214 b'p', |
210 b'show-function', | 215 b'show-function', |
211 None, | 216 None, |
212 _(b'show which function each change is in (DEFAULT: diff.showfunc)'), | 217 _( |
218 b'show which function each change is in (DEFAULT: diff.showfunc)' | |
219 ), | |
213 ), | 220 ), |
214 (b'', b'reverse', None, _(b'produce a diff that undoes the changes')), | 221 (b'', b'reverse', None, _(b'produce a diff that undoes the changes')), |
215 ] | 222 ] |
216 + diffwsopts | 223 + diffwsopts |
217 + [ | 224 + [ |