facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

pushkey: wrap pushkey phase movement in a transaction

Browse Source 
Phases are not yet inside the transaction, but we need to prepare for it. So we
wrap the phase movement inside a transaction.
This commit is contained in:
Pierre-Yves David 2014-08-06 00:54:58 -07:00
parent 322ec1b757
commit 4d38b093fd
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mercurial/phases.py
View File

@ -331,13 +331,16 @@ def listphases(repo):
def pushphase(repo, nhex, oldphasestr, newphasestr):
"""List phases root for serialization over pushkey"""
repo = repo.unfiltered()
tr = None
lock = repo.lock()
try:
currentphase = repo[nhex].phase()
newphase = abs(int(newphasestr)) # let's avoid negative index surprise
oldphase = abs(int(oldphasestr)) # let's avoid negative index surprise
if currentphase == oldphase and newphase < oldphase:
tr = repo.transaction('pushkey-phase')
advanceboundary(repo, newphase, [bin(nhex)])
tr.close()
return 1
elif currentphase == newphase:
# raced, but got correct result
@ -345,6 +348,8 @@ def pushphase(repo, nhex, oldphasestr, newphasestr):
else:
return 0
finally:
if tr:
tr.release()
lock.release()
def analyzeremotephases(repo, subset, roots):