upstream/mercurial-mirror Files · contrib/showstack.py

mergestate: don't pop stateextras when there are no conflicts on filemerge...

mergestate: don't pop stateextras when there are no conflicts on filemerge Even if `filemerge.filemerge()` didn't result in conflicts, we should not remove stateextras for a file since we now use that for more things than just merge time information. We use stateextras to store information which is required to be used by commit. I tracked this down while finding why a patch of mine which adds more commit related information does not work as expected and looses the extras in mergestate. Differential Revision: https://phab.mercurial-scm.org/D10148

Augie Fackler - - Load All Authors

File last commit:

r43346:2372284d default


                r47539:1099ca17

default

Download file

             showstack.py
        
                    31 lines
            
             | 734 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)

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

      """

      from __future__ import absolute_import, print_function

      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 sigexit(*args):

          sigshow(*args)

          print('alarm!')

          sys.exit(1)

      def extsetup(ui):

          signal.signal(signal.SIGQUIT, sigshow)

          signal.signal(signal.SIGALRM, sigexit)

          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)
				r"""dump stack trace when receiving SIGQUIT (Ctrl-\) or SIGINFO (Ctrl-T on BSDs)
				"""

				from __future__ import absolute_import, print_function
				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 sigexit(*args):
				sigshow(*args)
				print('alarm!')
				sys.exit(1)


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