equal
deleted
inserted
replaced
5216 "information")) |
5216 "information")) |
5217 modheads = bundle2.combinechangegroupresults(op) |
5217 modheads = bundle2.combinechangegroupresults(op) |
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, addednodes = gen.apply(repo, tr, 'unbundle', url) |
5221 modheads = bundle2.applybundle1(repo, gen, tr, |
|
5222 source='unbundle', |
|
5223 url=url) |
5222 |
5224 |
5223 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) |
5225 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) |
5224 |
5226 |
5225 @command('^update|up|checkout|co', |
5227 @command('^update|up|checkout|co', |
5226 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
5228 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |