Mercurial > public > mercurial-scm > hg

comparison hgext/fastannotate/context.py @ 40675:9fcf8084ada8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use node.hex(m.digest()) instead of m.hexdigest() hashlib.sha1.hexdigest() returns str on Python 3. Differential Revision: https://phab.mercurial-scm.org/D5287
author Pulkit Goyal <pulkit@yandex-team.ru>
date Mon, 19 Nov 2018 21:12:13 +0300
parents d6a13f6db69c
children dd1006874a5a
comparison
equal deleted inserted replaced
40673:337a38995336 40675:9fcf8084ada8
136 def hashdiffopts(diffopts): 136 def hashdiffopts(diffopts):
137 diffoptstr = stringutil.pprint(sorted( 137 diffoptstr = stringutil.pprint(sorted(
138 (k, getattr(diffopts, k)) 138 (k, getattr(diffopts, k))
139 for k in mdiff.diffopts.defaults 139 for k in mdiff.diffopts.defaults
140 )) 140 ))
141 return hashlib.sha1(diffoptstr).hexdigest()[:6] 141 return node.hex(hashlib.sha1(diffoptstr).digest())[:6]
142 142
143 _defaultdiffopthash = hashdiffopts(mdiff.defaultopts) 143 _defaultdiffopthash = hashdiffopts(mdiff.defaultopts)
144 144
145 class annotateopts(object): 145 class annotateopts(object):
146 """like mercurial.mdiff.diffopts, but is for annotate 146 """like mercurial.mdiff.diffopts, but is for annotate