equal
deleted
inserted
replaced
1398 raise error.Abort(_('missing support for %s') % exc) |
1398 raise error.Abort(_('missing support for %s') % exc) |
1399 |
1399 |
1400 if pullop.fetch: |
1400 if pullop.fetch: |
1401 pullop.cgresult = bundle2.combinechangegroupresults(op) |
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 # processing phases change |
1403 # processing phases change |
1408 for namespace, value in op.records['listkeys']: |
1404 for namespace, value in op.records['listkeys']: |
1409 if namespace == 'phases': |
1405 if namespace == 'phases': |
1410 _pullapplyphases(pullop, value) |
1406 _pullapplyphases(pullop, value) |
1411 |
1407 |