upstream/mercurial-mirror Files · tests/failfilemerge.py

debugcommands: introduce new debugrequirements command...

debugcommands: introduce new debugrequirements command This for now just prints out the list of current requirements. In future this will be helpful in reading requirements from couple of sources, and checking which requirement comes from where. Differential Revision: https://phab.mercurial-scm.org/D8632

Augie Fackler - - Load All Authors

File last commit:

r43346:2372284d default


                r45667:4a28f5e8

default

Download file

             failfilemerge.py
        
                    20 lines
            
             | 462 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / failfilemerge.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # extension to emulate interrupting filemerge._filemerge

      from __future__ import absolute_import

      from mercurial import (

          error,

          extensions,

          filemerge,

      )

      def failfilemerge(

          filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None

      ):

          raise error.Abort("^C")

          return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)

      def extsetup(ui):

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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# extension to emulate interrupting filemerge._filemerge

				from __future__ import absolute_import

				from mercurial import (
				error,
				extensions,
				filemerge,
				)


				def failfilemerge(
				filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
				):
				raise error.Abort("^C")
				return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)


				def extsetup(ui):
				extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)