##// END OF EJS Templates
merge: don't grab wlock when merging in memory...
merge: don't grab wlock when merging in memory I noticed this because we have an internal extension that does an in-memory rebase while holding only a repo lock, which resulted in a developer warning about the working copy lock being taken after the repo lock. Differential Revision: https://phab.mercurial-scm.org/D8665

File last commit:

r44516:7126d8b8 default
r45536:d1471dbb default
Show More
hashutil.py
10 lines | 183 B | text/x-python | PythonLexer
from __future__ import absolute_import
import hashlib
try:
from ..thirdparty import sha1dc
sha1 = sha1dc.sha1
except (ImportError, AttributeError):
sha1 = hashlib.sha1