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

diff: replace --merge option by config option...

diff: replace --merge option by config option I can't think of any reason you'd want to enable the merge diff on a run-to-run basis; you'd probably either always or never want it set (though I can't see why you'd never want it set). If you have it set, you'll probably also want the same output in `hg log -p` output. Having a single config option for the feature makes sense. Differential Revision: https://phab.mercurial-scm.org/D9956

Augie Fackler - - Load All Authors

File last commit:

r44516:7126d8b8 default


                r47224:6bb80672

default

Download file

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

          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

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