--- a/hgext/evolve.py Fri Apr 10 23:48:23 2015 -0400
+++ b/hgext/evolve.py Sat Apr 11 00:10:10 2015 -0400
@@ -2515,10 +2515,10 @@
undecided = set(probeset)
_takefullsample = setdiscovery._takefullsample
if remote.capable('_evoext_obshash_1'):
- remotehash = remote.evoext_obshash1
+ getremotehash = remote.evoext_obshash1
localhash = _obsrelsethashtreefm1(local)
else:
- remotehash = remote.evoext_obshash
+ getremotehash = remote.evoext_obshash
localhash = _obsrelsethashtreefm0(local)
while undecided:
@@ -2534,7 +2534,7 @@
% (roundtrips, len(undecided), len(sample)))
# indices between sample and externalized version must match
sample = list(sample)
- remotehash = remotehash(dag.externalizeall(sample))
+ remotehash = getremotehash(dag.externalizeall(sample))
yesno = [localhash[ix][1] == remotehash[si]
for si, ix in enumerate(sample)]