upstream/mercurial-mirror Files · tests/test-ui-color.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:

r37961:32bc3815 default


                r38817:bb54db4a

@96 default

Download file

             test-ui-color.py
        
                    40 lines
            
             | 1023 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-ui-color.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import, print_function

      import os

      from mercurial import (

          dispatch,

          ui as uimod,

      )

      from mercurial.utils import (

          stringutil,

      )

      # ensure errors aren't buffered

      testui = uimod.ui()

      testui.pushbuffer()

      testui.write((b'buffered\n'))

      testui.warn((b'warning\n'))

      testui.write_err(b'error\n')

      print(stringutil.pprint(testui.popbuffer(), bprefix=True).decode('ascii'))

      # test dispatch.dispatch with the same ui object

      hgrc = open(os.environ["HGRCPATH"], 'wb')

      hgrc.write(b'[extensions]\n')

      hgrc.write(b'color=\n')

      hgrc.close()

      ui_ = uimod.ui.load()

      ui_.setconfig(b'ui', b'formatted', b'True')

      # we're not interested in the output, so write that to devnull

      ui_.fout = open(os.devnull, 'wb')

      # call some arbitrary command just so we go through

      # color's wrapped _runcommand twice.

      def runcmd():

          dispatch.dispatch(dispatch.request([b'version', b'-q'], ui_))

      runcmd()

      print("colored? %s" % (ui_._colormode is not None))

      runcmd()

      print("colored? %s" % (ui_._colormode is not None))

	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, print_function

				import os
				from mercurial import (
				dispatch,
				ui as uimod,
				)
				from mercurial.utils import (
				stringutil,
				)

				# ensure errors aren't buffered
				testui = uimod.ui()
				testui.pushbuffer()
				testui.write((b'buffered\n'))
				testui.warn((b'warning\n'))
				testui.write_err(b'error\n')
				print(stringutil.pprint(testui.popbuffer(), bprefix=True).decode('ascii'))

				# test dispatch.dispatch with the same ui object
				hgrc = open(os.environ["HGRCPATH"], 'wb')
				hgrc.write(b'[extensions]\n')
				hgrc.write(b'color=\n')
				hgrc.close()

				ui_ = uimod.ui.load()
				ui_.setconfig(b'ui', b'formatted', b'True')

				# we're not interested in the output, so write that to devnull
				ui_.fout = open(os.devnull, 'wb')

				# call some arbitrary command just so we go through
				# color's wrapped _runcommand twice.
				def runcmd():
				dispatch.dispatch(dispatch.request([b'version', b'-q'], ui_))

				runcmd()
				print("colored? %s" % (ui_._colormode is not None))
				runcmd()
				print("colored? %s" % (ui_._colormode is not None))