# HG changeset patch # User Boris Feld # Date 2018-03-09 15:31:35 # Node ID cc51b6a07869876e6ad2e1aa0337e2e4b4da4f9e # Parent a2baa61bbb140f39b1392c7efa638abff95500a8 push-discovery: don't turn use generator when comparing bookmarks We want extensions to be able to implement their own logic. Generators can be consume only once, impractical for this purpose. diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -620,8 +620,8 @@ def _pushdiscoverybookmarks(pushop): return hex(x) def hexifycompbookmarks(bookmarks): - for b, scid, dcid in bookmarks: - yield b, safehex(scid), safehex(dcid) + return [(b, safehex(scid), safehex(dcid)) + for (b, scid, dcid) in bookmarks] comp = [hexifycompbookmarks(marks) for marks in comp] addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp