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

debugobsolete: also issue the "new obsmarkers" messsage...

debugobsolete: also issue the "new obsmarkers" messsage We are going to improve the way this message is issued in the core codebase. This will make it appears for `hg debugobsolete` too. Since this seems like a good idea, we make the output change in a previous changesets to clarify the next changeset.

Phil Cohen - - Load All Authors

File last commit:

r34124:c0ce6045 default


                r43163:34a46d48

default

Download file

             failfilemerge.py
        
                    19 lines
            
             | 518 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
            
      )

      def failfilemerge(filemergefn,

        Phil Cohen
    
merge: pass wctx to premerge, filemerge...

              r34124
            
                        premerge, repo, wctx, mynode, orig, fcd, fco, fca,

                        labels=None):

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
          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

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	)

		def failfilemerge(filemergefn,
Phil Cohen merge: pass wctx to premerge, filemerge...	r34124	premerge, repo, wctx, mynode, orig, fcd, fco, fca,
		labels=None):
timeless rebase: update working directory when aborting (issue5084)	r27988	raise error.Abort("^C")
		return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)

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