# HG changeset patch # User Pierre-Yves David # Date 1428725219 14400 # Node ID 1556d8fed538880ab8e59486df29354a44c61d25 # Parent c7db753ca300fbc1256ebecb1196f2268ecbf69c discovery: stop being stupid about variable name Overwritten variable are overwritten... The test coverage makes a simple pass in the loop :( diff -r c7db753ca300 -r 1556d8fed538 hgext/evolve.py --- 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)]