Mercurial > evolve
changeset 2673:1014341c637b
topic: also detect head checking using the concurrent part
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 28 Jun 2017 17:23:43 +0200 |
| parents | a08bd434a19b |
| children | 9585fac76d2d |
| files | hgext3rd/topic/discovery.py |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/topic/discovery.py Wed Jun 28 18:16:14 2017 +0200 +++ b/hgext3rd/topic/discovery.py Wed Jun 28 17:23:43 2017 +0200 @@ -129,8 +129,9 @@ handlecheckheads.params = frozenset() def _pushb2phases(orig, pushop, bundler): - hascheck = any(p.type == 'check:heads' for p in bundler._parts) - if pushop.outdatedphases and not hascheck: + checktypes = ('check:heads', 'check:updated-heads') + hascheck = any(p.type in checktypes for p in bundler._parts) + if not hascheck and pushop.outdatedphases: exchange._pushb2ctxcheckheads(pushop, bundler) return orig(pushop, bundler)