comparison hgext/evolve.py @ 1196:9e3f332f7630

discovery: filter null from the discovery revset If there is nothing in common, common will be "null" and the revset will now returns "-1" crashing the discovery process. We filter out the null revision to prevent that.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 30 Jan 2015 20:29:33 +0000
parents de73285cf504
children 0d15d461a316
comparison
equal deleted inserted replaced
1195:af9fd422adbb 1196:9e3f332f7630
2573 Its a separed functio to play around with strategy for that.""" 2573 Its a separed functio to play around with strategy for that."""
2574 repo = pullop.repo 2574 repo = pullop.repo
2575 cl = pullop.repo.changelog 2575 cl = pullop.repo.changelog
2576 remote = pullop.remote 2576 remote = pullop.remote
2577 unfi = repo.unfiltered() 2577 unfi = repo.unfiltered()
2578 revs = unfi.revs('::%ln', pullop.common) 2578 revs = unfi.revs('::(%ln - null)', pullop.common)
2579 common = [nullid] 2579 common = [nullid]
2580 if remote.capable('_evoext_obshash_0'): 2580 if remote.capable('_evoext_obshash_0'):
2581 obsexcmsg(repo.ui, "looking for common markers in %i nodes\n" 2581 obsexcmsg(repo.ui, "looking for common markers in %i nodes\n"
2582 % len(revs)) 2582 % len(revs))
2583 common = findcommonobsmarkers(repo.ui, repo, remote, revs) 2583 common = findcommonobsmarkers(repo.ui, repo, remote, revs)