##// END OF EJS Templates
push: introduce a discovery step for obsmarker...
Pierre-Yves David -
r22035:24bb01f4 default
parent child Browse files
Show More
@@ -82,7 +82,7 b' class pushoperation(object):'
82 # phases changes that must be pushed if changeset push fails
82 # phases changes that must be pushed if changeset push fails
83 self.fallbackoutdatedphases = None
83 self.fallbackoutdatedphases = None
84 # outgoing obsmarkers
84 # outgoing obsmarkers
85 self.outobsmarkers = repo.obsstore
85 self.outobsmarkers = set()
86
86
87 @util.propertycache
87 @util.propertycache
88 def futureheads(self):
88 def futureheads(self):
@@ -278,6 +278,10 b' def _pushdiscoveryphase(pushop):'
278 pushop.outdatedphases = future
278 pushop.outdatedphases = future
279 pushop.fallbackoutdatedphases = fallback
279 pushop.fallbackoutdatedphases = fallback
280
280
281 @pushdiscovery('obsmarker')
282 def _pushdiscoveryobsmarkers(pushop):
283 pushop.outobsmarkers = pushop.repo.obsstore
284
281 def _pushcheckoutgoing(pushop):
285 def _pushcheckoutgoing(pushop):
282 outgoing = pushop.outgoing
286 outgoing = pushop.outgoing
283 unfi = pushop.repo.unfiltered()
287 unfi = pushop.repo.unfiltered()
General Comments 0
You need to be logged in to leave comments. Login now