upstream/mercurial-mirror Files · mercurial/utils/hashutil.py

copies: distinguish between merged and touched files during upgrade...

copies: distinguish between merged and touched files during upgrade This a filenode being different between p1, p2 and result does not necessarily means a merges happens. For example p2 could be a strict newer version of p1, so the p2 version is picked by the manifest merging, but then the file is manually updated before the commit. In this case the file should be detected as touched. Differential Revision: https://phab.mercurial-scm.org/D10220

Matt Harbison - - Load All Authors

File last commit:

r47543:521ac0d7 stable


                r47571:433cef8f

default

Download file

             hashutil.py
        
                    10 lines
            
             | 215 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / utils / hashutil.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
hashutil: new package for hashing-related features...

              r44516
            
      from __future__ import absolute_import

      import hashlib

      try:

        Matt Harbison
    
typing: disable import error warnings that are already handled...

              r47543
            
          from ..thirdparty import sha1dc  # pytype: disable=import-error

        Augie Fackler
    
hashutil: new package for hashing-related features...

              r44516
            
          sha1 = sha1dc.sha1

      except (ImportError, AttributeError):

          sha1 = hashlib.sha1

	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 hashutil: new package for hashing-related features...	r44516	from __future__ import absolute_import

		import hashlib

		try:
Matt Harbison typing: disable import error warnings that are already handled...	r47543	from ..thirdparty import sha1dc # pytype: disable=import-error
Augie Fackler hashutil: new package for hashing-related features...	r44516
		sha1 = sha1dc.sha1
		except (ImportError, AttributeError):
		sha1 = hashlib.sha1