tests/failfilemerge.py
author Martin von Zweigbergk <martinvonz@google.com>
Fri, 13 Apr 2018 09:19:38 -0700
changeset 37676 1764527af92e
parent 34137 c0ce60459d84
child 43076 2372284d9457
permissions -rw-r--r--
context: set stack level for deprecation warning This patch makes the deprecation warning print the caller of repo.__getitem__. That's not quite correct, since there could also be other callers of changectx.__init__, but it seems like the most helpful stack level in practice. Differential Revision: https://phab.mercurial-scm.org/D3307
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
61f4d59e9a0b rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
diff changeset
    11
def failfilemerge(filemergefn,
34137
c0ce60459d84 merge: pass wctx to premerge, filemerge
Phil Cohen <phillco@fb.com>
parents: 30342
diff changeset
    12
                  premerge, repo, wctx, mynode, orig, fcd, fco, fca,
c0ce60459d84 merge: pass wctx to premerge, filemerge
Phil Cohen <phillco@fb.com>
parents: 30342
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)