Mercurial > hg
comparison tests/failfilemerge.py @ 45681:a736ab681b78
errors: stop passing non-strings to Abort's constructor
The next patch will change `Abort`'s constructor and `__bytes__`
functions and they will start assuming that the first argument is the
messages as `bytes`.
Differential Revision: https://phab.mercurial-scm.org/D9178
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 08 Oct 2020 15:35:44 -0700 |
parents | 2372284d9457 |
children | de8181c5414d |
comparison
equal
deleted
inserted
replaced
45680:bb1a988ef4a5 | 45681:a736ab681b78 |
---|---|
10 | 10 |
11 | 11 |
12 def failfilemerge( | 12 def failfilemerge( |
13 filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None | 13 filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None |
14 ): | 14 ): |
15 raise error.Abort("^C") | 15 raise error.Abort(b"^C") |
16 return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) | 16 return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) |
17 | 17 |
18 | 18 |
19 def extsetup(ui): | 19 def extsetup(ui): |
20 extensions.wrapfunction(filemerge, '_filemerge', failfilemerge) | 20 extensions.wrapfunction(filemerge, '_filemerge', failfilemerge) |