# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1408141512 25200
# Node ID f713de1d391664614add55577d71e9b52ff328a7
# Parent  c39d404f0eb0f5946210dc7db67519a09e162105
push: update bookmarks within the remote lock

Updating bookmarks is part of the push. It should be done within the same lock
as the other steps of the push.

diff -r c39d404f0eb0 -r f713de1d3916 mercurial/exchange.py
--- a/mercurial/exchange.py	Mon Aug 18 12:12:57 2014 -0700
+++ b/mercurial/exchange.py	Fri Aug 15 15:25:12 2014 -0700
@@ -187,6 +187,7 @@
             _pushchangeset(pushop)
             _pushsyncphase(pushop)
             _pushobsolete(pushop)
+            _pushbookmark(pushop)
         finally:
             if lock is not None:
                 lock.release()
@@ -194,7 +195,6 @@
         if locallock is not None:
             locallock.release()
 
-    _pushbookmark(pushop)
     return pushop.ret
 
 # list of steps to perform discovery before push