upstream/mercurial-mirror Files · tests/blackbox-readonly-dispatch.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:

r36757:f4a508f4 default


                r38817:bb54db4a

@96 default

Download file

             blackbox-readonly-dispatch.py
        
                    38 lines
            
             | 1.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / blackbox-readonly-dispatch.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import

      import os

      from mercurial import (

          dispatch,

          ui as uimod,

      )

      def testdispatch(cmd):

          """Simple wrapper around dispatch.dispatch()

          Prints command and result value, but does not handle quoting.

          """

          ui = uimod.ui.load()

          ui.status(b"running: %s\n" % cmd)

          req = dispatch.request(cmd.split(), ui)

          result = dispatch.dispatch(req)

          ui.status(b"result: %r\n" % result)

      # create file 'foo', add and commit

      f = open(b'foo', 'wb')

      f.write(b'foo\n')

      f.close()

      testdispatch(b"--debug add foo")

      testdispatch(b"--debug commit -m commit1 -d 2000-01-01 foo")

      # append to file 'foo' and commit

      f = open(b'foo', 'ab')

      f.write(b'bar\n')

      f.close()

      # remove blackbox.log directory (proxy for readonly log file)

      os.rmdir(b".hg/blackbox.log")

      # replace it with the real blackbox.log file

      os.rename(b".hg/blackbox.log-", b".hg/blackbox.log")

      testdispatch(b"--debug commit -m commit2 -d 2000-01-02 foo")

      # check 88803a69b24 (fancyopts modified command table)

      testdispatch(b"--debug log -r 0")

      testdispatch(b"--debug log -r tip")

	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
				import os
				from mercurial import (
				dispatch,
				ui as uimod,
				)

				def testdispatch(cmd):
				"""Simple wrapper around dispatch.dispatch()

				Prints command and result value, but does not handle quoting.
				"""
				ui = uimod.ui.load()
				ui.status(b"running: %s\n" % cmd)
				req = dispatch.request(cmd.split(), ui)
				result = dispatch.dispatch(req)
				ui.status(b"result: %r\n" % result)

				# create file 'foo', add and commit
				f = open(b'foo', 'wb')
				f.write(b'foo\n')
				f.close()
				testdispatch(b"--debug add foo")
				testdispatch(b"--debug commit -m commit1 -d 2000-01-01 foo")

				# append to file 'foo' and commit
				f = open(b'foo', 'ab')
				f.write(b'bar\n')
				f.close()
				# remove blackbox.log directory (proxy for readonly log file)
				os.rmdir(b".hg/blackbox.log")
				# replace it with the real blackbox.log file
				os.rename(b".hg/blackbox.log-", b".hg/blackbox.log")
				testdispatch(b"--debug commit -m commit2 -d 2000-01-02 foo")

				# check 88803a69b24 (fancyopts modified command table)
				testdispatch(b"--debug log -r 0")
				testdispatch(b"--debug log -r tip")