Mercurial > hg-stable

changeset 36943:cc51b6a07869

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Boris Feld <boris.feld@octobus.net>
date Fri, 09 Mar 2018 16:31:35 +0100
parents a2baa61bbb14
children 8fd9b56e8d7c
files mercurial/exchange.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/exchange.py	Tue Mar 13 16:56:13 2018 -0700
+++ b/mercurial/exchange.py	Fri Mar 09 16:31:35 2018 +0100
@@ -620,8 +620,8 @@
         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