Comments
Patch
@@ -79,10 +79,12 @@ class pushoperation(object):
self.incoming = None
# 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
@util.propertycache
def futureheads(self):
"""future remote heads if the changeset push succeeds"""
return self.outgoing.missingheads
@@ -588,11 +590,11 @@ def _pushobsolete(pushop):
repo = pushop.repo
remote = pushop.remote
if (obsolete._enabled and repo.obsstore and
'obsolete' in remote.listkeys('namespaces')):
rslts = []
- remotedata = obsolete._pushkeyescape(repo.obsstore)
+ remotedata = obsolete._pushkeyescape(pushop.outobsmarkers)
for key in sorted(remotedata, reverse=True):
# reverse sort to ensure we end with dump0
data = remotedata[key]
rslts.append(remote.pushkey('obsolete', key, '', data))
if [r for r in rslts if not r]: