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: use stepsdone to control bookmark push
authorPierre-Yves David <pierre-yves.david@fb.com>
Fri, 15 Aug 2014 18:40:57 -0700
changeset 22240 d092f4b68fb6
parent 22239 0688010ee38f
child 22241 3dc3cf8d0e73
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.
mercurial/exchange.py file | annotate | diff | comparison | revisions 
--- 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:
Mercurial