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

rebase: allow aborting if last-message.txt is missing...

rebase: allow aborting if last-message.txt is missing Previously, if .hg/rebasestate existed but .hg/last-message.txt was missing, 'hg rebase --abort' would say there's no rebase in progress but 'hg checkout foo' would say 'abort: rebase in progress'. It turns out loading the collapse message will throw a "no rebase in progress" error if the file doesn't exist, even though .hg/rebasestate obviously indicates a rebase is in progress. The fix is to only throw an exception if we're trying to --continue, and to just eat the issues if we're doing --abort. This issue is exposed by us writing the rebase state earlier in the process. This will be used by later patches to ensure the user can appropriately 'hg rebase --abort' if there's a crash before the first the first commit has finished rebasing. Tests cover all of this. The only negative affect is we now require a hg rebase --abort in a very specific exception case, as shown in the test.

Pulkit Goyal - - Load All Authors

File last commit:

r28353:cd03fbd5 default


                r31225:749b057b

default

Download file

             debugcmdserver.py
        
                    49 lines
            
             | 1.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / debugcmdserver.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env python

      #

      # Dumps output generated by Mercurial's command server in a formatted style to a

      # given file or stderr if '-' is specified. Output is also written in its raw

      # format to stdout.

      #

      # $ ./hg serve --cmds pipe | ./contrib/debugcmdserver.py -

      # o, 52   -> 'capabilities: getencoding runcommand\nencoding: UTF-8'

      from __future__ import absolute_import, print_function

      import struct

      import sys

      if len(sys.argv) != 2:

          print('usage: debugcmdserver.py FILE')

          sys.exit(1)

      outputfmt = '>cI'

      outputfmtsize = struct.calcsize(outputfmt)

      if sys.argv[1] == '-':

          log = sys.stderr

      else:

          log = open(sys.argv[1], 'a')

      def read(size):

          data = sys.stdin.read(size)

          if not data:

              raise EOFError

          sys.stdout.write(data)

          sys.stdout.flush()

          return data

      try:

          while True:

              header = read(outputfmtsize)

              channel, length = struct.unpack(outputfmt, header)

              log.write('%s, %-4d' % (channel, length))

              if channel in 'IL':

                  log.write(' -> waiting for input\n')

              else:

                  data = read(length)

                  log.write(' -> %r\n' % data)

              log.flush()

      except EOFError:

          pass

      finally:

          if log != sys.stderr:

              log.close()

	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

				#!/usr/bin/env python
				#
				# Dumps output generated by Mercurial's command server in a formatted style to a
				# given file or stderr if '-' is specified. Output is also written in its raw
				# format to stdout.
				#
				# $ ./hg serve --cmds pipe \| ./contrib/debugcmdserver.py -
				# o, 52 -> 'capabilities: getencoding runcommand\nencoding: UTF-8'

				from __future__ import absolute_import, print_function
				import struct
				import sys

				if len(sys.argv) != 2:
				print('usage: debugcmdserver.py FILE')
				sys.exit(1)

				outputfmt = '>cI'
				outputfmtsize = struct.calcsize(outputfmt)

				if sys.argv[1] == '-':
				log = sys.stderr
				else:
				log = open(sys.argv[1], 'a')

				def read(size):
				data = sys.stdin.read(size)
				if not data:
				raise EOFError
				sys.stdout.write(data)
				sys.stdout.flush()
				return data

				try:
				while True:
				header = read(outputfmtsize)
				channel, length = struct.unpack(outputfmt, header)
				log.write('%s, %-4d' % (channel, length))
				if channel in 'IL':
				log.write(' -> waiting for input\n')
				else:
				data = read(length)
				log.write(' -> %r\n' % data)
				log.flush()
				except EOFError:
				pass
				finally:
				if log != sys.stderr:
				log.close()