upstream/mercurial-mirror Files · contrib/showstack.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:

r35674:c9eb92fb default


                r38817:bb54db4a

@96 default

Download file

             showstack.py
        
                    22 lines
            
             | 596 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / showstack.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # showstack.py - extension to dump a Python stack trace on signal

      #

      # binds to both SIGQUIT (Ctrl-\) and SIGINFO (Ctrl-T on BSDs)

      """dump stack trace when receiving SIGQUIT (Ctrl-\) and SIGINFO (Ctrl-T on BSDs)

      """

      from __future__ import absolute_import

      import signal

      import sys

      import traceback

      def sigshow(*args):

          sys.stderr.write("\n")

          traceback.print_stack(args[1], limit=10, file=sys.stderr)

          sys.stderr.write("----\n")

      def extsetup(ui):

          signal.signal(signal.SIGQUIT, sigshow)

          try:

              signal.signal(signal.SIGINFO, sigshow)

          except AttributeError:

              pass

	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

				# showstack.py - extension to dump a Python stack trace on signal
				#
				# binds to both SIGQUIT (Ctrl-\) and SIGINFO (Ctrl-T on BSDs)
				"""dump stack trace when receiving SIGQUIT (Ctrl-\) and SIGINFO (Ctrl-T on BSDs)
				"""

				from __future__ import absolute_import
				import signal
				import sys
				import traceback

				def sigshow(*args):
				sys.stderr.write("\n")
				traceback.print_stack(args[1], limit=10, file=sys.stderr)
				sys.stderr.write("----\n")

				def extsetup(ui):
				signal.signal(signal.SIGQUIT, sigshow)
				try:
				signal.signal(signal.SIGINFO, sigshow)
				except AttributeError:
				pass