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

rebase: clear updatestate during rebase --abort in more cases...

rebase: clear updatestate during rebase --abort in more cases Previously, rebase --abort would only call update if you were on a node that had already been rebased. This meant that if the rebase failed during the rebase of the first commit, the working copy would be left dirty (with a .hg/updatestate file) and rebase --abort would not have update to clean it up. The fix is to also perform an update if you're still on the target node or on the original working copy node (since the working copy may be dirty, we still need to do the update). We don't want to perform an update in all cases though because of issue4009. A subsequent patch makes this case much more common, since it causes the entire rebase transaction to rollback during unexpected exceptions. This causes the existing test-rebase-abort.t to cover this case.

Pulkit Goyal - - Load All Authors

File last commit:

r28353:cd03fbd5 default


                r31222:56d3e0b4

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()