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

py2: remove simple from __future__ statements...

py2: remove simple from __future__ statements These were needed for Python 2 support. Now that our linter no longer mandates these, we can start deleting them. Differential Revision: https://phab.mercurial-scm.org/D12254

Gregory Szorc - - Load All Authors

File last commit:

r49730:6000f5b2 default


                r49730:6000f5b2

default

Download file

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

      # extension to emulate interrupting filemerge._filemerge

      from mercurial import (

          error,

          extensions,

          filemerge,

      )

      def failfilemerge(*args, **kwargs):

          raise error.Abort(b"^C")

      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 mercurial import (
				error,
				extensions,
				filemerge,
				)


				def failfilemerge(args, *kwargs):
				raise error.Abort(b"^C")


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