equal
deleted
inserted
replaced
1650 errormsg = 'entered unreachable condition' |
1650 errormsg = 'entered unreachable condition' |
1651 raise error.ProgrammingError(errormsg) |
1651 raise error.ProgrammingError(errormsg) |
1652 repo.ui.status(msg) |
1652 repo.ui.status(msg) |
1653 |
1653 |
1654 # search new changesets directly pulled as obsolete |
1654 # search new changesets directly pulled as obsolete |
1655 obsadded = unfi.revs('%d: and obsolete()', origrepolen) |
1655 duplicates = tr.changes.get('revduplicates', ()) |
|
1656 obsadded = unfi.revs('(%d: + %ld) and obsolete()', |
|
1657 origrepolen, duplicates) |
1656 cl = repo.changelog |
1658 cl = repo.changelog |
1657 extinctadded = [r for r in obsadded if r not in cl] |
1659 extinctadded = [r for r in obsadded if r not in cl] |
1658 if extinctadded: |
1660 if extinctadded: |
1659 # They are not just obsolete, but obsolete and invisible |
1661 # They are not just obsolete, but obsolete and invisible |
1660 # we call them "extinct" internally but the terms have not been |
1662 # we call them "extinct" internally but the terms have not been |