Mercurial > hg
annotate tests/failfilemerge.py @ 40249:c9e8c93e241c
tests: accept slightly different zip file in Python 3
I added some `unzip -t` here and I *think* the only change is from
Python 3 having more data in the zip file headers or something. Sigh.
Differential Revision: https://phab.mercurial-scm.org/D5075
author | Augie Fackler <augie@google.com> |
---|---|
date | Sat, 13 Oct 2018 07:55:34 -0400 |
parents | c0ce60459d84 |
children | 2372284d9457 |
rev | line source |
---|---|
30332
318a24b52eeb
spelling: fixes of non-dictionary words
Mads Kiilerich <madski@unity3d.com>
parents:
29774
diff
changeset
|
1 # extension to emulate interrupting filemerge._filemerge |
27988
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
2 |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
3 from __future__ import absolute_import |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
4 |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
5 from mercurial import ( |
28772
424c1632fffb
tests: sort import lines in failfilemerge.py
Yuya Nishihara <yuya@tcha.org>
parents:
27988
diff
changeset
|
6 error, |
27988
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
7 extensions, |
28772
424c1632fffb
tests: sort import lines in failfilemerge.py
Yuya Nishihara <yuya@tcha.org>
parents:
27988
diff
changeset
|
8 filemerge, |
27988
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
9 ) |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
10 |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
11 def failfilemerge(filemergefn, |
34122
c0ce60459d84
merge: pass wctx to premerge, filemerge
Phil Cohen <phillco@fb.com>
parents:
30332
diff
changeset
|
12 premerge, repo, wctx, mynode, orig, fcd, fco, fca, |
c0ce60459d84
merge: pass wctx to premerge, filemerge
Phil Cohen <phillco@fb.com>
parents:
30332
diff
changeset
|
13 labels=None): |
27988
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
14 raise error.Abort("^C") |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
15 return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
16 |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
17 def extsetup(ui): |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
18 extensions.wrapfunction(filemerge, '_filemerge', |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
19 failfilemerge) |