##// END OF EJS Templates
rebase: remove some redundant setting of dirstate parents...
rebase: remove some redundant setting of dirstate parents Since we're now setting the dirstate parents to its correct values from the beginning (right after `merge.update()`), we usually don't need to set them again before committing. The only case we need to care about is when committing collapsed commits. So we can remove the `setparents()` calls just before committing and add one only for the collapse case. Differential Revision: https://phab.mercurial-scm.org/D7828

File last commit:

r44516:7126d8b8 default
r44822:8082a77c 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