equal
deleted
inserted
replaced
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: |