mercurial/exchange.py
changeset 36943 cc51b6a07869
parent 36604 df7b7d5033a5
child 36944 8fd9b56e8d7c
equal deleted inserted replaced
36942:a2baa61bbb14 36943:cc51b6a07869
   618         if x is None:
   618         if x is None:
   619             return x
   619             return x
   620         return hex(x)
   620         return hex(x)
   621 
   621 
   622     def hexifycompbookmarks(bookmarks):
   622     def hexifycompbookmarks(bookmarks):
   623         for b, scid, dcid in bookmarks:
   623         return [(b, safehex(scid), safehex(dcid))
   624             yield b, safehex(scid), safehex(dcid)
   624                 for (b, scid, dcid) in bookmarks]
   625 
   625 
   626     comp = [hexifycompbookmarks(marks) for marks in comp]
   626     comp = [hexifycompbookmarks(marks) for marks in comp]
   627     addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp
   627     addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp
   628 
   628 
   629     for b, scid, dcid in advsrc:
   629     for b, scid, dcid in advsrc: