Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
43075:57875cf423c9 | 43076:2372284d9457 |
---|---|
6 error, | 6 error, |
7 extensions, | 7 extensions, |
8 filemerge, | 8 filemerge, |
9 ) | 9 ) |
10 | 10 |
11 def failfilemerge(filemergefn, | 11 |
12 premerge, repo, wctx, mynode, orig, fcd, fco, fca, | 12 def failfilemerge( |
13 labels=None): | 13 filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None |
14 ): | |
14 raise error.Abort("^C") | 15 raise error.Abort("^C") |
15 return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) | 16 return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) |
16 | 17 |
18 | |
17 def extsetup(ui): | 19 def extsetup(ui): |
18 extensions.wrapfunction(filemerge, '_filemerge', | 20 extensions.wrapfunction(filemerge, '_filemerge', failfilemerge) |
19 failfilemerge) |