equal
deleted
inserted
replaced
599 |
599 |
600 # Only compute new roots for revs above the roots that are being |
600 # Only compute new roots for revs above the roots that are being |
601 # retracted. |
601 # retracted. |
602 minnewroot = min(newroots) |
602 minnewroot = min(newroots) |
603 aboveroots = [rev for rev in currentroots if rev >= minnewroot] |
603 aboveroots = [rev for rev in currentroots if rev >= minnewroot] |
604 updatedroots = repo.set(b'roots(%ld::)', aboveroots) |
604 updatedroots = repo.revs(b'roots(%ld::)', aboveroots) |
605 |
605 |
606 finalroots = {rev for rev in currentroots if rev < minnewroot} |
606 finalroots = {rev for rev in currentroots if rev < minnewroot} |
607 finalroots.update(ctx.rev() for ctx in updatedroots) |
607 finalroots.update(updatedroots) |
608 if finalroots != oldroots: |
608 if finalroots != oldroots: |
609 self._updateroots( |
609 self._updateroots( |
610 targetphase, {tonode(rev) for rev in finalroots}, tr |
610 targetphase, {tonode(rev) for rev in finalroots}, tr |
611 ) |
611 ) |
612 return True |
612 return True |