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

simplemerge: make merge_lines() a free function...

simplemerge: make merge_lines() a free function IMO, the rendering of a conflict as text with merge markers should be separate from the code for resolving conflicts. The latter is what `Merge3Text` is mostly about already. Differential Revision: https://phab.mercurial-scm.org/D11974

Matt Harbison - - Load All Authors

File last commit:

r47543:521ac0d7 stable


                r49406:c6649c53

default

Download file

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

      from __future__ import absolute_import

      import hashlib

      try:

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

          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

				from __future__ import absolute_import

				import hashlib

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

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