upstream/mercurial-mirror Files · hgext/inotify/common.py

histedit: suggest "histedit --abort" for inconsistent histedit state...

histedit: suggest "histedit --abort" for inconsistent histedit state Mercurial earlier than 2.7 allows users to do anything other than starting new histedit, even though current histedit is not finished or aborted yet. So, unfinished (and maybe inconsistent now) histedit states may be left and forgotten in repositories. Before this patch, histedit extension shows the message below, when it detects such inconsistent state: abort: REV is not an ancestor of working directory (update to REV or descendant and run "hg histedit --continue" again) But this message is incorrect, unless old Mercurial is re-installed, because Mercurial 2.7 or later disallows users to update the working directory to another revision. This patch changes the hint message to suggest "hg histedit --abort".

Matt Mackall - - Load All Authors

File last commit:

r10263:25e57239 stable


                r19847:45c30868

stable

Download file

             common.py
        
                    53 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / inotify / common.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # server.py - inotify common protocol code

      #

      # Copyright 2006, 2007, 2008 Bryan O'Sullivan <bos@serpentine.com>

      # Copyright 2007, 2008 Brendan Cully <brendan@kublai.com>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      import cStringIO, socket, struct

      """

        Protocol between inotify clients and server:

        Client sending query:

        1) send protocol version number

        2) send query type (string, 4 letters long)

        3) send query parameters:

           - For STAT, N+1 \0-separated strings:

              1) N different names that need checking

              2) 1 string containing all the status types to match

           - No parameter needed for DBUG

        Server sending query answer:

        1) send protocol version number

        2) send query type

        3) send struct.pack'ed headers describing the length of the content:

            e.g. for STAT, receive 9 integers describing the length of the

            9 \0-separated string lists to be read:

             * one file list for each lmar!?ic status type

             * one list containing the directories visited during lookup

      """

      version = 3

      resphdrfmts = {

          'STAT': '>lllllllll', # status requests

          'DBUG': '>l'          # debugging queries

      }

      resphdrsizes = dict((k, struct.calcsize(v))

                          for k, v in resphdrfmts.iteritems())

      def recvcs(sock):

          cs = cStringIO.StringIO()

          s = True

          try:

              while s:

                  s = sock.recv(65536)

                  cs.write(s)

          finally:

              sock.shutdown(socket.SHUT_RD)

          cs.seek(0)

          return cs

	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

				# server.py - inotify common protocol code
				#
				# Copyright 2006, 2007, 2008 Bryan O'Sullivan <bos@serpentine.com>
				# Copyright 2007, 2008 Brendan Cully <brendan@kublai.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				import cStringIO, socket, struct

				"""
				Protocol between inotify clients and server:

				Client sending query:
				1) send protocol version number
				2) send query type (string, 4 letters long)
				3) send query parameters:
				- For STAT, N+1 \0-separated strings:
				1) N different names that need checking
				2) 1 string containing all the status types to match
				- No parameter needed for DBUG

				Server sending query answer:
				1) send protocol version number
				2) send query type
				3) send struct.pack'ed headers describing the length of the content:
				e.g. for STAT, receive 9 integers describing the length of the
				9 \0-separated string lists to be read:
				* one file list for each lmar!?ic status type
				* one list containing the directories visited during lookup

				"""

				version = 3

				resphdrfmts = {
				'STAT': '>lllllllll', # status requests
				'DBUG': '>l' # debugging queries
				}
				resphdrsizes = dict((k, struct.calcsize(v))
				for k, v in resphdrfmts.iteritems())

				def recvcs(sock):
				cs = cStringIO.StringIO()
				s = True
				try:
				while s:
				s = sock.recv(65536)
				cs.write(s)
				finally:
				sock.shutdown(socket.SHUT_RD)
				cs.seek(0)
				return cs