Mercurial > evolve
changeset 1251:53e07f12a3e6
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sat, 11 Apr 2015 00:10:10 -0400 |
| parents | 4279ec5ff3a7 (current diff) f88d5125d41b (diff) |
| children | 749c931aa47b |
| files | hgext/evolve.py |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)]