# HG changeset patch # User Pierre-Yves David # Date 2015-10-05 04:48:19 # Node ID 1956026e4db2a7103feba1fa4f1a8ae2bd3cebc4 # Parent 5c9ec1cc671aaf8a3cc49b9a51fa939ed6221e57 unbundle: properly read head modification result from bundle2 We were reading the wrong key... diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -6475,7 +6475,7 @@ def unbundle(ui, repo, fname1, *fnames, finally: if tr: tr.release() - changes = [r.get('result', 0) + changes = [r.get('return', 0) for r in op.records['changegroup']] modheads = changegroup.combineresults(changes) else: diff --git a/tests/test-bundle2-format.t b/tests/test-bundle2-format.t --- a/tests/test-bundle2-format.t +++ b/tests/test-bundle2-format.t @@ -997,6 +997,7 @@ Support for changegroup adding manifests adding file changes added 0 changesets with 0 changes to 3 files + (run 'hg update' to get a working copy) with reply @@ -1125,6 +1126,7 @@ Simple case where it just work: GZ adding manifests adding file changes added 0 changesets with 0 changes to 3 files + (run 'hg update' to get a working copy) Simple case where it just work: BZ ---------------------------------- @@ -1211,6 +1213,7 @@ Simple case where it just work: BZ adding manifests adding file changes added 0 changesets with 0 changes to 3 files + (run 'hg update' to get a working copy) unknown compression while unbundling -----------------------------