Mercurial > hg
comparison mercurial/exchange.py @ 22224:f713de1d3916
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.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 15 Aug 2014 15:25:12 -0700 |
parents | 616a455b02ca |
children | 827bce9e24fb |
comparison
equal
deleted
inserted
replaced
22223:c39d404f0eb0 | 22224:f713de1d3916 |
---|---|
185 and pushop.remote.capable('bundle2-exp')): | 185 and pushop.remote.capable('bundle2-exp')): |
186 _pushbundle2(pushop) | 186 _pushbundle2(pushop) |
187 _pushchangeset(pushop) | 187 _pushchangeset(pushop) |
188 _pushsyncphase(pushop) | 188 _pushsyncphase(pushop) |
189 _pushobsolete(pushop) | 189 _pushobsolete(pushop) |
190 _pushbookmark(pushop) | |
190 finally: | 191 finally: |
191 if lock is not None: | 192 if lock is not None: |
192 lock.release() | 193 lock.release() |
193 finally: | 194 finally: |
194 if locallock is not None: | 195 if locallock is not None: |
195 locallock.release() | 196 locallock.release() |
196 | 197 |
197 _pushbookmark(pushop) | |
198 return pushop.ret | 198 return pushop.ret |
199 | 199 |
200 # list of steps to perform discovery before push | 200 # list of steps to perform discovery before push |
201 pushdiscoveryorder = [] | 201 pushdiscoveryorder = [] |
202 | 202 |