Show More
@@ -395,6 +395,14 b' def processbundle(repo, unbundler, trans' | |||
|
395 | 395 | |
|
396 | 396 | return op |
|
397 | 397 | |
|
398 | def _processchangegroup(op, cg, tr, source, url, **kwargs): | |
|
399 | ret, addednodes = cg.apply(op.repo, tr, source, url, **kwargs) | |
|
400 | op.records.add('changegroup', { | |
|
401 | 'return': ret, | |
|
402 | 'addednodes': addednodes, | |
|
403 | }) | |
|
404 | return ret | |
|
405 | ||
|
398 | 406 | def _processpart(op, part): |
|
399 | 407 | """process a single part from a bundle |
|
400 | 408 | |
@@ -1524,12 +1532,8 b' def handlechangegroup(op, inpart):' | |||
|
1524 | 1532 | op.repo.requirements.add('treemanifest') |
|
1525 | 1533 | op.repo._applyopenerreqs() |
|
1526 | 1534 | op.repo._writerequirements() |
|
1527 |
ret |
|
|
1528 |
|
|
|
1529 | op.records.add('changegroup', { | |
|
1530 | 'return': ret, | |
|
1531 | 'addednodes': addednodes, | |
|
1532 | }) | |
|
1535 | ret = _processchangegroup(op, cg, tr, 'bundle2', 'bundle2', | |
|
1536 | expectedtotal=nbchangesets) | |
|
1533 | 1537 | if op.reply is not None: |
|
1534 | 1538 | # This is definitely not the final form of this |
|
1535 | 1539 | # return. But one need to start somewhere. |
@@ -1592,11 +1596,7 b' def handleremotechangegroup(op, inpart):' | |||
|
1592 | 1596 | if not isinstance(cg, changegroup.cg1unpacker): |
|
1593 | 1597 | raise error.Abort(_('%s: not a bundle version 1.0') % |
|
1594 | 1598 | util.hidepassword(raw_url)) |
|
1595 |
ret |
|
|
1596 | op.records.add('changegroup', { | |
|
1597 | 'return': ret, | |
|
1598 | 'addednodes': addednodes, | |
|
1599 | }) | |
|
1599 | ret = _processchangegroup(op, cg, tr, 'bundle2', 'bundle2') | |
|
1600 | 1600 | if op.reply is not None: |
|
1601 | 1601 | # This is definitely not the final form of this |
|
1602 | 1602 | # return. But one need to start somewhere. |
General Comments 0
You need to be logged in to leave comments.
Login now