upstream/mercurial-mirror Files · tests/fakepatchtime.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.

Gregory Szorc - - Load All Authors

File last commit:

r27284:f624b0e6 default


                r32253:7d4ce4b5

default

Download file

             fakepatchtime.py
        
                    32 lines
            
             | 999 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / fakepatchtime.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # extension to emulate invoking 'patch.internalpatch()' at the time

      # specified by '[fakepatchtime] fakenow'

      from __future__ import absolute_import

      from mercurial import (

          extensions,

          patch as patchmod,

          util,

      )

      def internalpatch(orig, ui, repo, patchobj, strip,

                        prefix='', files=None,

                        eolmode='strict', similarity=0):

          if files is None:

              files = set()

          r = orig(ui, repo, patchobj, strip,

                   prefix=prefix, files=files,

                   eolmode=eolmode, similarity=similarity)

          fakenow = ui.config('fakepatchtime', 'fakenow')

          if fakenow:

              # parsing 'fakenow' in YYYYmmddHHMM format makes comparison between

              # 'fakenow' value and 'touch -t YYYYmmddHHMM' argument easy

              fakenow = util.parsedate(fakenow, ['%Y%m%d%H%M'])[0]

              for f in files:

                  repo.wvfs.utime(f, (fakenow, fakenow))

          return r

      def extsetup(ui):

          extensions.wrapfunction(patchmod, 'internalpatch', internalpatch)

	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

				# extension to emulate invoking 'patch.internalpatch()' at the time
				# specified by '[fakepatchtime] fakenow'

				from __future__ import absolute_import

				from mercurial import (
				extensions,
				patch as patchmod,
				util,
				)

				def internalpatch(orig, ui, repo, patchobj, strip,
				prefix='', files=None,
				eolmode='strict', similarity=0):
				if files is None:
				files = set()
				r = orig(ui, repo, patchobj, strip,
				prefix=prefix, files=files,
				eolmode=eolmode, similarity=similarity)

				fakenow = ui.config('fakepatchtime', 'fakenow')
				if fakenow:
				# parsing 'fakenow' in YYYYmmddHHMM format makes comparison between
				# 'fakenow' value and 'touch -t YYYYmmddHHMM' argument easy
				fakenow = util.parsedate(fakenow, ['%Y%m%d%H%M'])[0]
				for f in files:
				repo.wvfs.utime(f, (fakenow, fakenow))

				return r

				def extsetup(ui):
				extensions.wrapfunction(patchmod, 'internalpatch', internalpatch)