# HG changeset patch # User Pierre-Yves David # Date 1404580629 -7200 # Node ID 5f57bc77657cd0fdf9aa53a4e8a9d2db7a21e6be # Parent 342e7c428e475a2c00b15c72f4af2a002112949b push: move the list of obsmarker to push into the push operation The list is now carried in the push operation, this will let extensions override it. diff -r 342e7c428e47 -r 5f57bc77657c mercurial/exchange.py --- a/mercurial/exchange.py Fri Jul 04 19:31:49 2014 +0200 +++ b/mercurial/exchange.py Sat Jul 05 19:17:09 2014 +0200 @@ -81,6 +81,8 @@ 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): @@ -590,7 +592,7 @@ 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]