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

revlog: subclass the new `repository.iverifyproblem` Protocol class...

revlog: subclass the new `repository.iverifyproblem` Protocol class This is the same transformation as did for dirstate, but the CamelCase naming was already cleaned up here. We shouldn't have to explicitly subclass, but I'm doing so to test the interplay of regular attributes and the `attrs` class. Also, PyCharm has a nifty feature that puts a jump point in the gutter to navigate back and forth between the base class and subclasses (and override functions and base class functions) when there's an explicit subclassing. Additionally, PyCharm will immediately flag signature mismatches without a 40m pytype run.

Gregory Szorc - - Load All Authors

File last commit:

r49730:6000f5b2 default


                r53365:4ef6dbc2

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)