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

largefiles: correctly handle dirstate status when rebasing...

largefiles: correctly handle dirstate status when rebasing When rebasing, we need to trust that the standins are always correct. The rebase operation updates the standins according to the changeset it is rebasing. We need to make the largefiles in the working copy match. If we don't make them match, then they get accidentally reverted, either during the rebase or during the next commit after the rebase. This worked previously only becuase we were relying on the behavior that largefiles with a changed standin, but unchanged contents, never showed up in the list of modified largefiles. Unfortunately, pre-commit hooks can get an incorrect status this way, and it also results in extra execution of code. The solution is to simply trust the standins when we are about to commit a rebased changeset, and politely ask updatelfiles() to pull the new contents down. In this case, updatelfiles() will also mark any files it has pulled down as dirty in the lfdirstate so that pre-commit hooks will get correct status output.

Matt Mackall - - Load All Authors

File last commit:

r10263:25e57239 stable


                r15793:3ef07ecd

default

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