Show More
@@ -1517,7 +1517,8 b' def combinechangegroupresults(op):' | |||||
1517 | result = -1 + changedheads |
|
1517 | result = -1 + changedheads | |
1518 | return result |
|
1518 | return result | |
1519 |
|
1519 | |||
1520 |
@parthandler('changegroup', ('version', 'nbchanges', 'treemanifest' |
|
1520 | @parthandler('changegroup', ('version', 'nbchanges', 'treemanifest', | |
|
1521 | 'targetphase')) | |||
1521 | def handlechangegroup(op, inpart): |
|
1522 | def handlechangegroup(op, inpart): | |
1522 | """apply a changegroup part on the repo |
|
1523 | """apply a changegroup part on the repo | |
1523 |
|
1524 | |||
@@ -1542,8 +1543,12 b' def handlechangegroup(op, inpart):' | |||||
1542 | op.repo.requirements.add('treemanifest') |
|
1543 | op.repo.requirements.add('treemanifest') | |
1543 | op.repo._applyopenerreqs() |
|
1544 | op.repo._applyopenerreqs() | |
1544 | op.repo._writerequirements() |
|
1545 | op.repo._writerequirements() | |
|
1546 | extrakwargs = {} | |||
|
1547 | targetphase = inpart.params.get('targetphase') | |||
|
1548 | if targetphase is not None: | |||
|
1549 | extrakwargs['targetphase'] = int(targetphase) | |||
1545 | ret = _processchangegroup(op, cg, tr, 'bundle2', 'bundle2', |
|
1550 | ret = _processchangegroup(op, cg, tr, 'bundle2', 'bundle2', | |
1546 | expectedtotal=nbchangesets) |
|
1551 | expectedtotal=nbchangesets, **extrakwargs) | |
1547 | if op.reply is not None: |
|
1552 | if op.reply is not None: | |
1548 | # This is definitely not the final form of this |
|
1553 | # This is definitely not the final form of this | |
1549 | # return. But one need to start somewhere. |
|
1554 | # return. But one need to start somewhere. |
General Comments 0
You need to be logged in to leave comments.
Login now