# HG changeset patch # User Yuya Nishihara # Date 1531039542 -32400 # Node ID afef1e362d650fb800735691af40940bd52cf769 # Parent 1fad808f2a6bae6c8dcabffab7e03f2f3a38388f py3: fix bundle heads to be consumable more than once diff -r 1fad808f2a6b -r afef1e362d65 contrib/python3-whitelist --- a/contrib/python3-whitelist Sun Jul 08 17:37:05 2018 +0900 +++ b/contrib/python3-whitelist Sun Jul 08 17:45:42 2018 +0900 @@ -32,8 +32,10 @@ test-branch-tag-confict.t test-branches.t test-bundle-phases.t +test-bundle-r.t test-bundle-type.t test-bundle-vs-outgoing.t +test-bundle.t test-bundle2-multiple-changegroups.t test-bundle2-pushback.t test-cappedreader.py diff -r 1fad808f2a6b -r afef1e362d65 mercurial/commands.py --- a/mercurial/commands.py Sun Jul 08 17:37:05 2018 +0900 +++ b/mercurial/commands.py Sun Jul 08 17:45:42 2018 +0900 @@ -1220,7 +1220,7 @@ other = hg.peer(repo, opts, dest) revs = [repo[r].hex() for r in revs] revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) - heads = revs and map(repo.lookup, revs) or revs + heads = revs and pycompat.maplist(repo.lookup, revs) or revs outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=heads, force=opts.get('force'),