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

merge-tools: allow marking a mergetool as completely disabled...

merge-tools: allow marking a mergetool as completely disabled Very often in my life I'm finding that the only configured merge tool present on the system is vimdiff[0], and it's currently impossible (as far as I can tell) short of specifying `ui.merge = `[1] to actually *disable* a merge tool. This allows vimdiff-haters to put: [merge-tools] vimdiff.disable = yes in their ~/.hgrc and never see vimdiff again. I'm stopping short of putting this as a commented out entry in the sample new user hgrc (seen when a user runs `hg config --edit` with no ~/.hgrc) for now, but I might come back and do that later. 0: vimdiff is at an awkward intersection: it's usually installed by the vim package which is often installed as a vi substitute, so it's mere presence doesn't imply me wanting it, unlike (say) kdiff3. 1: There's a related problem I ran into today where specifying `ui.merge = :merge` failed because :merge isn't a command, which I think is a regression. I'll try and figure that out and at least file a bug.

Matt Mackall - - Load All Authors

File last commit:

r26123:bdac264e default


                r26730:a1e43e85

default

Download file

             showstack.py
        
                    17 lines
            
             | 460 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)

      import sys, signal, 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)

				import sys, signal, 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