# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1428725410 14400
# Node ID 53e07f12a3e6d33722b06b0d263ea587460bc3f8
# Parent  4279ec5ff3a7b1a6fc04754fec351810e31c9839# Parent  f88d5125d41b522480c4a485941e5068c8e43b2d
merge with stable

diff -r 4279ec5ff3a7 -r 53e07f12a3e6 README
--- a/README	Fri Apr 10 23:48:23 2015 -0400
+++ b/README	Sat Apr 11 00:10:10 2015 -0400
@@ -51,6 +51,10 @@
 Changelog
 =========
 
+5.1.3 --
+
+- discovery: fix misbehaving discovery accros python version
+
 5.1.2 -- 2015-04-01
 
 - evolve: prevent a crash in httpclient_pushobsmarkers() when pushing
diff -r 4279ec5ff3a7 -r 53e07f12a3e6 hgext/evolve.py
--- 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)]