5216 for r in op.records['changegroup']] |
5216 for r in op.records['changegroup']] |
5217 modheads = changegroup.combineresults(changes) |
5217 modheads = changegroup.combineresults(changes) |
5218 else: |
5218 else: |
5219 txnname = 'unbundle\n%s' % util.hidepassword(url) |
5219 txnname = 'unbundle\n%s' % util.hidepassword(url) |
5220 with repo.transaction(txnname) as tr: |
5220 with repo.transaction(txnname) as tr: |
5221 modheads = gen.apply(repo, tr, 'unbundle', url) |
5221 modheads, addednodes = gen.apply(repo, tr, 'unbundle', url) |
5222 |
5222 |
5223 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) |
5223 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) |
5224 |
5224 |
5225 @command('^update|up|checkout|co', |
5225 @command('^update|up|checkout|co', |
5226 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
5226 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |