# HG changeset patch # User Pierre-Yves David # Date 2014-07-05 17:32:20 # Node ID 24bb01f42e820986b75de507504a9c1ea4e1da19 # Parent 5f57bc77657cd0fdf9aa53a4e8a9d2db7a21e6be push: introduce a discovery step for obsmarker The discovery step is still not doing anything smart. But this will allow extension to wrap it. diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -82,7 +82,7 @@ class pushoperation(object): # phases changes that must be pushed if changeset push fails self.fallbackoutdatedphases = None # outgoing obsmarkers - self.outobsmarkers = repo.obsstore + self.outobsmarkers = set() @util.propertycache def futureheads(self): @@ -278,6 +278,10 @@ def _pushdiscoveryphase(pushop): pushop.outdatedphases = future pushop.fallbackoutdatedphases = fallback +@pushdiscovery('obsmarker') +def _pushdiscoveryobsmarkers(pushop): + pushop.outobsmarkers = pushop.repo.obsstore + def _pushcheckoutgoing(pushop): outgoing = pushop.outgoing unfi = pushop.repo.unfiltered()