equal
deleted
inserted
replaced
6513 tr.release() |
6513 tr.release() |
6514 changes = [r.get('return', 0) |
6514 changes = [r.get('return', 0) |
6515 for r in op.records['changegroup']] |
6515 for r in op.records['changegroup']] |
6516 modheads = changegroup.combineresults(changes) |
6516 modheads = changegroup.combineresults(changes) |
6517 else: |
6517 else: |
6518 modheads = changegroup.addchangegroup(repo, gen, 'unbundle', |
6518 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname) |
6519 'bundle:' + fname) |
|
6520 finally: |
6519 finally: |
6521 lock.release() |
6520 lock.release() |
6522 |
6521 |
6523 return postincoming(ui, repo, modheads, opts.get('update'), None) |
6522 return postincoming(ui, repo, modheads, opts.get('update'), None) |
6524 |
6523 |