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
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Mads Kiilerich
    
spelling: fixes of non-dictionary words

              r30332
            
      # extension to emulate interrupting filemerge._filemerge

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
      from mercurial import (

        Yuya Nishihara
    
tests: sort import lines in failfilemerge.py

              r28772
            
          error,

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
          extensions,

        Yuya Nishihara
    
tests: sort import lines in failfilemerge.py

              r28772
            
          filemerge,

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
      )

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
        Martin von Zweigbergk
    
tests: remove unnecessary explicit args from `failfilemerge.py`...

              r49255
            
      def failfilemerge(*args, **kwargs):

        Martin von Zweigbergk
    
errors: stop passing non-strings to Abort's constructor...

              r46273
            
          raise error.Abort(b"^C")

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
      def extsetup(ui):

        Martin von Zweigbergk
    
filemerge: inline `_filemerge()` into `filemerge()`...

              r49261
            
          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

Mads Kiilerich spelling: fixes of non-dictionary words	r30332	# extension to emulate interrupting filemerge._filemerge
timeless rebase: update working directory when aborting (issue5084)	r27988

		from mercurial import (
Yuya Nishihara tests: sort import lines in failfilemerge.py	r28772	error,
timeless rebase: update working directory when aborting (issue5084)	r27988	extensions,
Yuya Nishihara tests: sort import lines in failfilemerge.py	r28772	filemerge,
timeless rebase: update working directory when aborting (issue5084)	r27988	)

Augie Fackler formatting: blacken the codebase...	r43346
Martin von Zweigbergk tests: remove unnecessary explicit args from `failfilemerge.py`...	r49255	def failfilemerge(args, *kwargs):
Martin von Zweigbergk errors: stop passing non-strings to Abort's constructor...	r46273	raise error.Abort(b"^C")
timeless rebase: update working directory when aborting (issue5084)	r27988
Augie Fackler formatting: blacken the codebase...	r43346
timeless rebase: update working directory when aborting (issue5084)	r27988	def extsetup(ui):
Martin von Zweigbergk filemerge: inline `_filemerge()` into `filemerge()`...	r49261	extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)