Mercurial > hg

changeset 22036:f1528ef123f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: use stepsdone for obsmarkers push We do not have infrastructure to include obsolescence markers in the bundle2 push from core. But extensions may so we make sure it would not be sent twice.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 31 Jul 2014 13:51:17 -0700
parents 24bb01f42e82
children 8665c647da6e
files mercurial/exchange.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/exchange.py	Sat Jul 05 19:32:20 2014 +0200
+++ b/mercurial/exchange.py	Thu Jul 31 13:51:17 2014 -0700
@@ -590,9 +590,12 @@
 
 def _pushobsolete(pushop):
     """utility function to push obsolete markers to a remote"""
+    if 'obsmarkers' in pushop.stepsdone:
+        return
     pushop.ui.debug('try to push obsolete markers to remote\n')
     repo = pushop.repo
     remote = pushop.remote
+    pushop.stepsdone.add('obsmarkers')
     if (obsolete._enabled and repo.obsstore and
         'obsolete' in remote.listkeys('namespaces')):
         rslts = []