Mercurial > hg
comparison tests/failfilemerge.py @ 27988:61f4d59e9a0b stable
rebase: update working directory when aborting (issue5084)
author | timeless <timeless@mozdev.org> |
---|---|
date | Fri, 05 Feb 2016 01:56:46 +0000 |
parents | |
children | 424c1632fffb |
comparison
equal
deleted
inserted
replaced
27987:b19d8d5d6b51 | 27988:61f4d59e9a0b |
---|---|
1 # extension to emulate interupting filemerge._filemerge | |
2 | |
3 from __future__ import absolute_import | |
4 | |
5 from mercurial import ( | |
6 filemerge, | |
7 extensions, | |
8 error, | |
9 ) | |
10 | |
11 def failfilemerge(filemergefn, | |
12 premerge, repo, mynode, orig, fcd, fco, fca, labels=None): | |
13 raise error.Abort("^C") | |
14 return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) | |
15 | |
16 def extsetup(ui): | |
17 extensions.wrapfunction(filemerge, '_filemerge', | |
18 failfilemerge) |