Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/failfilemerge.py
author Sushil khanchi <sushilkhanchi97@gmail.com>
Fri, 23 Jul 2021 13:42:12 +0530
branchstable
changeset 48991 d4752aeb20f1
parent 48432 f45a4a47f6a8
child 48875 6000f5b25c9b
permissions -rw-r--r--
precheck: fix false warning about content-divergence creation Before this patch, if we try to `hg prune` (without any successors) an already obsoleted cset which has at least one successor, it would false warn about new content-divergence. As we know, pruning cset without any successors can not create any divergence. Differential Revision: https://phab.mercurial-scm.org/D12002
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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









43076






2372284d9457
formatting: blacken the codebase



Augie Fackler <augie@google.com>


parents: 
34122

diff
changeset




    11









48426






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: 
34122

diff
changeset




    15









27988






61f4d59e9a0b
rebase: update working directory when aborting (issue5084)



timeless <timeless@mozdev.org>


parents: 

diff
changeset




    16


def extsetup(ui):








48432






f45a4a47f6a8
filemerge: inline `_filemerge()` into `filemerge()`



Martin von Zweigbergk <martinvonz@google.com>


parents: 
48426

diff
changeset




    17


    extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)















Mercurial