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

branching: merge default into stable for 6.1 freeze

Martin von Zweigbergk - - Load All Authors

File last commit:

r49261:f45a4a47 default


                r49650:c00d3ce4

6.1rc0 stable

Download file

             failfilemerge.py
        
                    17 lines
            
             | 320 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 __future__ import absolute_import

      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 __future__ import absolute_import

		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)