Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: move the list of obsmarker to push into the push operation
authorPierre-Yves David <pierre-yves.david@fb.com>
Sat, 05 Jul 2014 19:17:09 +0200
changeset 22034 5f57bc77657c
parent 22033 342e7c428e47
child 22035 24bb01f42e82
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.
mercurial/exchange.py file | annotate | diff | comparison | revisions 
--- 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]
Mercurial