1677 unficl = unfi.changelog |
1677 unficl = unfi.changelog |
1678 |
1678 |
1679 def headsofdiff(h1, h2): |
1679 def headsofdiff(h1, h2): |
1680 """Returns heads(h1 % h2)""" |
1680 """Returns heads(h1 % h2)""" |
1681 res = unfi.set(b'heads(%ln %% %ln)', h1, h2) |
1681 res = unfi.set(b'heads(%ln %% %ln)', h1, h2) |
1682 return set(ctx.node() for ctx in res) |
1682 return {ctx.node() for ctx in res} |
1683 |
1683 |
1684 def headsofunion(h1, h2): |
1684 def headsofunion(h1, h2): |
1685 """Returns heads((h1 + h2) - null)""" |
1685 """Returns heads((h1 + h2) - null)""" |
1686 res = unfi.set(b'heads((%ln + %ln - null))', h1, h2) |
1686 res = unfi.set(b'heads((%ln + %ln - null))', h1, h2) |
1687 return set(ctx.node() for ctx in res) |
1687 return {ctx.node() for ctx in res} |
1688 |
1688 |
1689 while True: |
1689 while True: |
1690 old_heads = unficl.heads() |
1690 old_heads = unficl.heads() |
1691 clstart = len(unficl) |
1691 clstart = len(unficl) |
1692 _pullbundle2(pullop) |
1692 _pullbundle2(pullop) |