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

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Boris Feld - - Load All Authors

File last commit:

r36625:c6061cad default


                r38817:bb54db4a

@96 default

Download file

             fakepatchtime.py
        
                    40 lines
            
             | 1.1 KiB
            
                | 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,

          registrar,

      )

      from mercurial.utils import dateutil

      configtable = {}

      configitem = registrar.configitem(configtable)

      configitem(b'fakepatchtime', b'fakenow',

          default=None,

      )

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

                        prefix=b'', files=None,

                        eolmode=b'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(b'fakepatchtime', b'fakenow')

          if fakenow:

              # parsing 'fakenow' in YYYYmmddHHMM format makes comparison between

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

              fakenow = dateutil.parsedate(fakenow, [b'%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,
				registrar,
				)
				from mercurial.utils import dateutil

				configtable = {}
				configitem = registrar.configitem(configtable)

				configitem(b'fakepatchtime', b'fakenow',
				default=None,
				)

				def internalpatch(orig, ui, repo, patchobj, strip,
				prefix=b'', files=None,
				eolmode=b'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(b'fakepatchtime', b'fakenow')
				if fakenow:
				# parsing 'fakenow' in YYYYmmddHHMM format makes comparison between
				# 'fakenow' value and 'touch -t YYYYmmddHHMM' argument easy
				fakenow = dateutil.parsedate(fakenow, [b'%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)