Comments
Patch
@@ -80,11 +80,11 @@ class pushoperation(object):
# phases changes that must be pushed along side the changesets
self.outdatedphases = None
# 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):
"""future remote heads if the changeset push succeeds"""
return self.outgoing.missingheads
@@ -276,10 +276,14 @@ def _pushdiscoveryphase(pushop):
fdroots = [f.node() for f in fdroots]
future = list(unfi.set(revset, fdroots, pushop.futureheads))
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()
if not outgoing.missing:
# nothing to push