Mercurial > hg-stable
annotate tests/failfilemerge.py @ 48771:7dd5a2c0116a
revlog: implement changelogv2 packing and unpacking in C
This introduces a C implementation of changelogv2 records packing and unpacking
operations matching the pure Python counterpart, similarly to what we already
have for revlogv1 and revlogv2.
This is also necessary to access changelogv2 record fields from future Rust
code without going through the Python part, which would annihilate any
performance benefit.
Differential Revision: https://phab.mercurial-scm.org/D12178
author | pacien <pacien.trangirard@pacien.net> |
---|---|
date | Mon, 14 Feb 2022 12:34:02 +0100 |
parents | f45a4a47f6a8 |
children | 6000f5b25c9b |
rev | line source |
---|---|
30342
318a24b52eeb
spelling: fixes of non-dictionary words
Mads Kiilerich <madski@unity3d.com>
parents:
29785
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 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
34137
diff
changeset
|
11 |
48471
de8181c5414d
tests: remove unnecessary explicit args from `failfilemerge.py`
Martin von Zweigbergk <martinvonz@google.com>
parents:
45681
diff
changeset
|
12 def failfilemerge(*args, **kwargs): |
45681
a736ab681b78
errors: stop passing non-strings to Abort's constructor
Martin von Zweigbergk <martinvonz@google.com>
parents:
43076
diff
changeset
|
13 raise error.Abort(b"^C") |
27988
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
14 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
34137
diff
changeset
|
15 |
27988
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
16 def extsetup(ui): |
48477
f45a4a47f6a8
filemerge: inline `_filemerge()` into `filemerge()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
48471
diff
changeset
|
17 extensions.wrapfunction(filemerge, 'filemerge', failfilemerge) |