discovery: stop being stupid about variable name
Overwritten variable are overwritten...
The test coverage makes a simple pass in the loop :(
--- a/hgext/evolve.py Fri Apr 10 23:43:14 2015 -0400
+++ b/hgext/evolve.py Sat Apr 11 00:06:59 2015 -0400
@@ -2415,10 +2415,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:
@@ -2434,7 +2434,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)]