Mercurial > public > mercurial-scm > hg
diff tests/failfilemerge.py @ 43076:2372284d9457
formatting: blacken the codebase
This is using my patch to black
(https://github.com/psf/black/pull/826) so we don't un-wrap collection
literals.
Done with:
hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**"' | xargs black -S
# skip-blame mass-reformatting only
# no-check-commit reformats foo_bar functions
Differential Revision: https://phab.mercurial-scm.org/D6971
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 06 Oct 2019 09:45:02 -0400 |
| parents | c0ce60459d84 |
| children | a736ab681b78 |
line wrap: on
line diff
--- a/tests/failfilemerge.py Sat Oct 05 10:29:34 2019 -0400 +++ b/tests/failfilemerge.py Sun Oct 06 09:45:02 2019 -0400 @@ -8,12 +8,13 @@ filemerge, ) -def failfilemerge(filemergefn, - premerge, repo, wctx, mynode, orig, fcd, fco, fca, - labels=None): + +def failfilemerge( + filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None +): raise error.Abort("^C") return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) + def extsetup(ui): - extensions.wrapfunction(filemerge, '_filemerge', - failfilemerge) + extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)