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

amend: check for file modifications when updating dirstate (issue6233)...

amend: check for file modifications when updating dirstate (issue6233) Previously, we called dirstate.normal(f), which would put information into the dirstate claiming that the file on disk is what it "should be" for the current checkout, and it would have the size and timestamp of the most recent modification to the file (which is not necessarily the one we just committed). If the file was modified while the commit message editor was open, we would put incorrect information into the dirstate. Differential Revision: https://phab.mercurial-scm.org/D7521

Augie Fackler - - Load All Authors

File last commit:

r43346:2372284d default


                r44238:5558e343

default

Download file

             error.py
        
                    15 lines
            
             | 413 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / fastannotate / error.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # 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

				# 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"""