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

phase: better error message when --force is needed...

phase: better error message when --force is needed When trying to turn a draft changeset into a secret changeset, I was told: % hg phase -s . cannot move 1 changesets to a more permissive phase, use --force no phases changed That message struck me as being backwards -- the secret phase feels less permissive to me since it restricts the changesets from being pushed. We don't use the word "permissive" elsewhere, 'hg help phase' talks about "lower phases" and "higher phases". I therefore reformulated the error message to be cannot move 1 changesets to a higher phase, use --force That is not perfect either, but more in line with the help text. An alternative could be cannot move phase backwards for 1 changesets, use --force which fits better with the help text for --force.

Matt Mackall - - Load All Authors

File last commit:

r10263:25e57239 stable


                r20093:1dee888b

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