facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 16:31:02 +03:00
Code Issues Projects Releases Wiki Activity

fastannotate: improve compatibility with older hg

Browse Source 
Summary:
Before ba91edc29ce5, `diffopts` does not have `__dict__`. Let's fix that by
querying keys from `diffopts.default`, instead of using `__dict__`.

Test Plan: `arc unit`

Reviewers: #sourcecontrol, stash

Reviewed By: stash

Subscribers: mjpieters

Differential Revision: https://phabricator.intern.facebook.com/D4086921

Signature: t1:4086921:1477554146:e48647c59769c2951518b091350289aa966aab7b
This commit is contained in:
Jun Wu 2016-10-27 00:19:05 +01:00
parent 3339323a30
commit 79b9423cee
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fastannotate/context.py
View File

@ -132,7 +132,10 @@ def encodedir(path):
.replace('.lock/', '.lock.hg/'))
def hashdiffopts(diffopts):
diffoptstr = str(sorted(diffopts.__dict__.iteritems()))
diffoptstr = str(sorted(
(k, getattr(diffopts, k))
for k in mdiff.diffopts.defaults.iterkeys()
))
return hashlib.sha1(diffoptstr).hexdigest()[:6]
_defaultdiffopthash = hashdiffopts(mdiff.defaultopts)