Mercurial > hg
view tests/failfilemerge.py @ 44607:a7b7a67b79c1
tests: update test-debugcommands.t stack trace checks for python3.9
Python 3.9 prints a complete filepath in more cases, so we need to handle that
in our test output. Since we don't really care *that* much about the specific
path formatting here, just use globbing.
Differential Revision: https://phab.mercurial-scm.org/D8329
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 25 Mar 2020 12:06:49 -0400 |
parents | 2372284d9457 |
children | a736ab681b78 |
line wrap: on
line source
# extension to emulate interrupting filemerge._filemerge from __future__ import absolute_import from mercurial import ( error, extensions, filemerge, ) 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)