Mercurial > hg

changeset 22240:d092f4b68fb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: use stepsdone to control bookmark push If bookmark are to be integrated in the unified bundle2, we need a way to disable the old-style push.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 15 Aug 2014 18:40:57 -0700
parents 0688010ee38f
children 3dc3cf8d0e73
files mercurial/exchange.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/exchange.py	Fri Aug 15 18:39:39 2014 -0700
+++ b/mercurial/exchange.py	Fri Aug 15 18:40:57 2014 -0700
@@ -633,8 +633,9 @@
 
 def _pushbookmark(pushop):
     """Update bookmark position on remote"""
-    if pushop.ret == 0:
+    if pushop.ret == 0 or 'bookmarks' in pushop.stepsdone:
         return
+    pushop.stepsdone.add('bookmarks')
     ui = pushop.ui
     remote = pushop.remote
     for b, old, new in pushop.outbookmarks: