| author | Raphaël Gomès <rgomes@octobus.net> |
| Thu, 28 Mar 2024 14:47:20 +0000 | |
| branch | stable |
| changeset 51540 | 803e61387e86 |
| parent 48875 | 6000f5b25c9b |
| permissions | -rw-r--r-- |
|
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 |
|
|
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
4 |
from mercurial import ( |
|
28772
424c1632fffb
tests: sort import lines in failfilemerge.py
Yuya Nishihara <yuya@tcha.org>
parents:
27988
diff
changeset
|
5 |
error, |
|
27988
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
6 |
extensions, |
|
28772
424c1632fffb
tests: sort import lines in failfilemerge.py
Yuya Nishihara <yuya@tcha.org>
parents:
27988
diff
changeset
|
7 |
filemerge, |
|
27988
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
8 |
) |
|
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
9 |
|
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
34122
diff
changeset
|
10 |
|
|
48426
de8181c5414d
tests: remove unnecessary explicit args from `failfilemerge.py`
Martin von Zweigbergk <martinvonz@google.com>
parents:
45681
diff
changeset
|
11 |
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
|
12 |
raise error.Abort(b"^C") |
|
27988
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
13 |
|
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
34122
diff
changeset
|
14 |
|
|
27988
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
15 |
def extsetup(ui): |
|
48432
f45a4a47f6a8
filemerge: inline `_filemerge()` into `filemerge()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
48426
diff
changeset
|
16 |
extensions.wrapfunction(filemerge, 'filemerge', failfilemerge) |