Mercurial > hg
view tests/failfilemerge.py @ 40850:fcee112fb7c4
remotefilelog: reduce use of "count" container
We had already given the initial value of "count[0]" a name, so just
use that when applicable.
Differential Revision: https://phab.mercurial-scm.org/D5385
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 04 Dec 2018 22:15:42 -0800 |
parents | c0ce60459d84 |
children | 2372284d9457 |
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)