upstream/mercurial-mirror Files · hgext/fastannotate/error.py

merge: fix race that could cause wrong size in dirstate...

merge: fix race that could cause wrong size in dirstate The problem is that hg merge/update/etc work the following way: 1. figure out what files to update 2. apply the update to disk 3. apply the update to in-memory dirstate 4. write dirstate where step3 looks at the filesystem and assumes it sees the result of step2. If a file is changed between step2 and step3, step3 will record incorrect information in the dirstate. I avoid this by passing the size step3 needs directly from step2, for the common path (not implemented for change/delete conflicts for instance). I didn't fix the same race for the exec bit for now, because it's less likely to be problematic and I had trouble due to the fact that the dirstate stores the permissions differently from the manifest (st_mode vs '' 'l' 'x'), in combination with tests that pretend that symlinks are not supported. However, I moved the lstat from step3 to step2, which should tighten the race window markedly, both for the exec bit and for the mtime. Differential Revision: https://phab.mercurial-scm.org/D6475

Augie Fackler - - Load All Authors

File last commit:

r39243:1ddb296e default


                r42649:773b0222

default

Download file

             error.py
        
                    13 lines
            
             | 411 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / fastannotate / error.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
fastannotate: initial import from Facebook's hg-experimental...

              r39243
            
      # Copyright 2016-present Facebook. All Rights Reserved.

      #

      # error: errors used in fastannotate

      #

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

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

      from __future__ import absolute_import

      class CorruptedFileError(Exception):

          pass

      class CannotReuseError(Exception):

          """cannot reuse or update the cache incrementally"""

	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

Augie Fackler fastannotate: initial import from Facebook's hg-experimental...	r39243	# Copyright 2016-present Facebook. All Rights Reserved.
		#
		# error: errors used in fastannotate
		#
		# This software may be used and distributed according to the terms of the
		# GNU General Public License version 2 or any later version.
		from __future__ import absolute_import

		class CorruptedFileError(Exception):
		pass

		class CannotReuseError(Exception):
		"""cannot reuse or update the cache incrementally"""