##// END OF EJS Templates
pull: remove inadequate use of operations records to update stepdone...
Boris Feld -
r34324:6c7aaf59 default
parent child Browse files
Show More
@@ -1844,7 +1844,6 b' def handlephases(op, inpart):'
1844 1844 """apply phases from bundle part to repo"""
1845 1845 headsbyphase = phases.binarydecode(inpart)
1846 1846 phases.updatephases(op.repo.unfiltered(), op.gettransaction, headsbyphase)
1847 op.records.add('phase-heads', {})
1848 1847
1849 1848 @parthandler('reply:pushkey', ('return', 'in-reply-to'))
1850 1849 def handlepushkeyreply(op, inpart):
@@ -1400,10 +1400,6 b' def _pullbundle2(pullop):'
1400 1400 if pullop.fetch:
1401 1401 pullop.cgresult = bundle2.combinechangegroupresults(op)
1402 1402
1403 # If the bundle had a phase-heads part, then phase exchange is already done
1404 if op.records['phase-heads']:
1405 pullop.stepsdone.add('phases')
1406
1407 1403 # processing phases change
1408 1404 for namespace, value in op.records['listkeys']:
1409 1405 if namespace == 'phases':
General Comments 0
You need to be logged in to leave comments. Login now