Mercurial > hg-stable
comparison mercurial/commands.py @ 26539:1956026e4db2
unbundle: properly read head modification result from bundle2
We were reading the wrong key...
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sun, 04 Oct 2015 21:48:19 -0700 |
| parents | 3e61b325e79a |
| children | 4688945f316c |
comparison
equal
deleted
inserted
replaced
| 26538:5c9ec1cc671a | 26539:1956026e4db2 |
|---|---|
| 6473 "wiki/BundleFeature for more " | 6473 "wiki/BundleFeature for more " |
| 6474 "information")) | 6474 "information")) |
| 6475 finally: | 6475 finally: |
| 6476 if tr: | 6476 if tr: |
| 6477 tr.release() | 6477 tr.release() |
| 6478 changes = [r.get('result', 0) | 6478 changes = [r.get('return', 0) |
| 6479 for r in op.records['changegroup']] | 6479 for r in op.records['changegroup']] |
| 6480 modheads = changegroup.combineresults(changes) | 6480 modheads = changegroup.combineresults(changes) |
| 6481 else: | 6481 else: |
| 6482 modheads = changegroup.addchangegroup(repo, gen, 'unbundle', | 6482 modheads = changegroup.addchangegroup(repo, gen, 'unbundle', |
| 6483 'bundle:' + fname) | 6483 'bundle:' + fname) |