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

filemerge: show warning about choice of :prompt only at an actual fallback...

filemerge: show warning about choice of :prompt only at an actual fallback Before this patch, internal merge tool :prompt shows "no tool found to merge FILE" line, even if :prompt is explicitly specified as a tool to be used. This patch shows warning message about choice of :prompt only at an actual fallback, in which case any tool is rejected by capability for binary or symlink. It is for backward compatibility to omit warning message in "changedelete" case.

Robert Stanca - - Load All Authors

File last commit:

r28943:417380aa default


                r32253:7d4ce4b5

default

Download file

             mockblackbox.py
        
                    17 lines
            
             | 332 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / mockblackbox.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import

      from mercurial import (

          util,

      )

      def makedate():

          return 0, 0

      def getuser():

          return 'bob'

      def getpid():

          return 5000

      # mock the date and user apis so the output is always the same

      def uisetup(ui):

          util.makedate = makedate

          util.getuser = getuser

          util.getpid = getpid

	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

				from __future__ import absolute_import
				from mercurial import (
				util,
				)

				def makedate():
				return 0, 0
				def getuser():
				return 'bob'
				def getpid():
				return 5000

				# mock the date and user apis so the output is always the same
				def uisetup(ui):
				util.makedate = makedate
				util.getuser = getuser
				util.getpid = getpid