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

dirstate: add prefix and suffix arguments to backup...

dirstate: add prefix and suffix arguments to backup This would allow the code explicitly copying dirstate to use this method instead. Use of this method will increase encapsulation (the dirstate class will be sole owner of its on-disk storage).

Yuya Nishihara - - Load All Authors

File last commit:

r28772:424c1632 default


                r29189:930d4ee4

default

Download file

             failfilemerge.py
        
                    18 lines
            
             | 483 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / failfilemerge.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
      # extension to emulate interupting filemerge._filemerge

      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
            
      )

      def failfilemerge(filemergefn,

              premerge, repo, 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

timeless rebase: update working directory when aborting (issue5084)	r27988	# extension to emulate interupting filemerge._filemerge

		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	)

		def failfilemerge(filemergefn,
		premerge, repo, 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)