changeset 38598:afef1e362d65

py3: fix bundle heads to be consumable more than once
author Yuya Nishihara <yuya@tcha.org>
date Sun, 08 Jul 2018 17:45:42 +0900
parents 1fad808f2a6b
children d046bf37f1ba
files contrib/python3-whitelist mercurial/commands.py
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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'),