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

Yuya Nishihara - - Load All Authors

File last commit:

r37138:a8a902d7 default


                r38817:bb54db4a

@96 default

Download file

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

      from __future__ import absolute_import

      from mercurial.utils import (

          procutil,

      )

      # XXX: we should probably offer a devel option to do this in blackbox directly

      def getuser():

          return b'bob'

      def getpid():

          return 5000

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

      def uisetup(ui):

          procutil.getuser = getuser

          procutil.getpid = getpid

	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 __future__ import absolute_import
				from mercurial.utils import (
				procutil,
				)

				# XXX: we should probably offer a devel option to do this in blackbox directly
				def getuser():
				return b'bob'
				def getpid():
				return 5000

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