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

histedit: make check for unresolved conflicts explicit (issue5545)...

histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.

Gregory Szorc - - Load All Authors

File last commit:

r27284:f624b0e6 default


                r32057:e5ffc91a

stable

Download file

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

        FUJIWARA Katsunori
    
tests: add extension to emulate invoking internalpatch at the specific time...

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

      # specified by '[fakepatchtime] fakenow'

        Gregory Szorc
    
tests/fakepatchtime.py: use absolute_import

              r27284
            
      from __future__ import absolute_import

      from mercurial import (

          extensions,

          patch as patchmod,

          util,

      )

        FUJIWARA Katsunori
    
tests: add extension to emulate invoking internalpatch at the specific time...

              r25756
            
      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

FUJIWARA Katsunori tests: add extension to emulate invoking internalpatch at the specific time...	r25756	# extension to emulate invoking 'patch.internalpatch()' at the time
		# specified by '[fakepatchtime] fakenow'

Gregory Szorc tests/fakepatchtime.py: use absolute_import	r27284	from __future__ import absolute_import

		from mercurial import (
		extensions,
		patch as patchmod,
		util,
		)
FUJIWARA Katsunori tests: add extension to emulate invoking internalpatch at the specific time...	r25756
		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)