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

Robert Stanca - - Load All Authors

File last commit:

r28736:403b0a7a default


                r38817:bb54db4a

@96 default

Download file

             silenttestrunner.py
        
                    24 lines
            
             | 734 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / silenttestrunner.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import, print_function

      import os

      import sys

      import unittest

      def main(modulename):

          '''run the tests found in module, printing nothing when all tests pass'''

          module = sys.modules[modulename]

          suite = unittest.defaultTestLoader.loadTestsFromModule(module)

          results = unittest.TestResult()

          suite.run(results)

          if results.errors or results.failures:

              for tc, exc in results.errors:

                  print('ERROR:', tc)

                  print()

                  sys.stdout.write(exc)

              for tc, exc in results.failures:

                  print('FAIL:', tc)

                  print()

                  sys.stdout.write(exc)

              sys.exit(1)

      if os.environ.get('SILENT_BE_NOISY'):

          main = unittest.main

	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
				import sys
				import unittest

				def main(modulename):
				'''run the tests found in module, printing nothing when all tests pass'''
				module = sys.modules[modulename]
				suite = unittest.defaultTestLoader.loadTestsFromModule(module)
				results = unittest.TestResult()
				suite.run(results)
				if results.errors or results.failures:
				for tc, exc in results.errors:
				print('ERROR:', tc)
				print()
				sys.stdout.write(exc)
				for tc, exc in results.failures:
				print('FAIL:', tc)
				print()
				sys.stdout.write(exc)
				sys.exit(1)

				if os.environ.get('SILENT_BE_NOISY'):
				main = unittest.main