mercurial/exchange.py
changeset 33904 13dc7f29531e
parent 33903 800bb35d891e
child 34111 f85dfde1731a
equal deleted inserted replaced
33903:800bb35d891e 33904:13dc7f29531e
  1399         raise error.Abort(_('missing support for %s') % exc)
  1399         raise error.Abort(_('missing support for %s') % exc)
  1400 
  1400 
  1401     if pullop.fetch:
  1401     if pullop.fetch:
  1402         pullop.cgresult = bundle2.combinechangegroupresults(op)
  1402         pullop.cgresult = bundle2.combinechangegroupresults(op)
  1403 
  1403 
       
  1404     # If the bundle had a phase-heads part, then phase exchange is already done
       
  1405     if op.records['phase-heads']:
       
  1406         pullop.stepsdone.add('phases')
       
  1407 
  1404     # processing phases change
  1408     # processing phases change
  1405     for namespace, value in op.records['listkeys']:
  1409     for namespace, value in op.records['listkeys']:
  1406         if namespace == 'phases':
  1410         if namespace == 'phases':
  1407             _pullapplyphases(pullop, value)
  1411             _pullapplyphases(pullop, value)
  1408 
  1412