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

rebase: choose default destination the same way as 'hg merge' (BC)...

rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

Gregory Szorc - - Load All Authors

File last commit:

r27284:f624b0e6 default


                r28189:fac3a24b

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)