[PATCH 1 of 6] push: update bookmark within the remote lock
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Mon Aug 18 21:49:59 UTC 2014
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at fb.com>
# Date 1408141512 25200
# Fri Aug 15 15:25:12 2014 -0700
# Node ID cef89d04868a41c6e1a7951e9f2add046fcc681c
# Parent 8dda6f6ff564d8fe6ac7b8ce4c74eb9bfb5de14a
push: update bookmark within the remote lock
Update the bookmark is part of the push. It should be done within the same lock
than the other steps of the push.
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -185,18 +185,18 @@ def push(repo, remote, force=False, revs
and pushop.remote.capable('bundle2-exp')):
_pushbundle2(pushop)
_pushchangeset(pushop)
_pushsyncphase(pushop)
_pushobsolete(pushop)
+ _pushbookmark(pushop)
finally:
if lock is not None:
lock.release()
finally:
if locallock is not None:
locallock.release()
- _pushbookmark(pushop)
return pushop.ret
# list of steps to perform discovery before push
pushdiscoveryorder = []
More information about the Mercurial-devel
mailing list