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

merge: introduce mergeresult.addfile() and use it...

merge: introduce mergeresult.addfile() and use it We want to use mergeresult object at more and more places instead of this actions dict to simplify code and further add new APIs to mergeresult object. This patch introduces `addfile()` which adds a new file to the internal actions dict for now. Differential Revision: https://phab.mercurial-scm.org/D8820

Augie Fackler - - Load All Authors

File last commit:

r44516:7126d8b8 default


                r45839:b442920a

default

Download file

             hashutil.py
        
                    10 lines
            
             | 183 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:

          from ..thirdparty import sha1dc

          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:
		from ..thirdparty import sha1dc

		sha1 = sha1dc.sha1
		except (ImportError, AttributeError):
		sha1 = hashlib.sha1