comparison hgext/evolve.py @ 1278:5ff8a5d85b2b stable

getbundleobsmarker: prevent crash from filtered content (issue4616) The discovery may discover common markers on non-served nodes. This lead to crash when building the obsmarker part.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 21 Apr 2015 16:52:08 +0200
parents c52c15100fb2
children 064cf9ee4460
comparison
equal deleted inserted replaced
1277:0ac2ad8e7235 1278:5ff8a5d85b2b
2655 if kwargs.get('obsmarkers', False): 2655 if kwargs.get('obsmarkers', False):
2656 if heads is None: 2656 if heads is None:
2657 heads = repo.heads() 2657 heads = repo.heads()
2658 obscommon = kwargs.get('evo_obscommon', ()) 2658 obscommon = kwargs.get('evo_obscommon', ())
2659 assert obscommon 2659 assert obscommon
2660 obsset = repo.set('::%ln - ::%ln', heads, obscommon) 2660 obsset = repo.unfiltered().set('::%ln - ::%ln', heads, obscommon)
2661 subset = [c.node() for c in obsset] 2661 subset = [c.node() for c in obsset]
2662 markers = repo.obsstore.relevantmarkers(subset) 2662 markers = repo.obsstore.relevantmarkers(subset)
2663 exchange.buildobsmarkerspart(bundler, markers) 2663 exchange.buildobsmarkerspart(bundler, markers)
2664 2664
2665 @eh.uisetup 2665 @eh.uisetup