5337 changes = [r.get('return', 0) |
5337 changes = [r.get('return', 0) |
5338 for r in op.records['changegroup']] |
5338 for r in op.records['changegroup']] |
5339 modheads = changegroup.combineresults(changes) |
5339 modheads = changegroup.combineresults(changes) |
5340 else: |
5340 else: |
5341 txnname = 'unbundle\n%s' % util.hidepassword(url) |
5341 txnname = 'unbundle\n%s' % util.hidepassword(url) |
5342 with repo.transaction(txnname): |
5342 with repo.transaction(txnname) as tr: |
5343 modheads = gen.apply(repo, 'unbundle', url) |
5343 modheads = gen.apply(repo, tr, 'unbundle', url) |
5344 |
5344 |
5345 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) |
5345 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) |
5346 |
5346 |
5347 @command('^update|up|checkout|co', |
5347 @command('^update|up|checkout|co', |
5348 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
5348 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |