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

resolve: fix incorrect merge...

resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

Gregory Szorc - - Load All Authors

File last commit:

r24705:0ead0a07 default


                r27025:ec372573

default

Download file

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

      from mercurial import util

      def makedate():

          return 0, 0

      def getuser():

          return 'bob'

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

      def uisetup(ui):

          util.makedate = makedate

          util.getuser = getuser

	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 mercurial import util

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

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