# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1408153257 25200
# Node ID d092f4b68fb6959de698b86ff455e92a3925995c
# Parent  0688010ee38fc2b0b0e1a793759d76fb7262c519
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.

diff -r 0688010ee38f -r d092f4b68fb6 mercurial/exchange.py
--- 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: