Mercurial > public > mercurial-scm > hg

comparison mercurial/scmutil.py @ 39900:a89dd6d01df0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pullreport: rev duplicated and extinct into account If we already have some obsolete and hidden nodes locally and the server send them again to you, it seems useful to point it out instead of being silent about it.
author Boris Feld <boris.feld@octobus.net>
date Thu, 27 Sep 2018 16:55:06 +0200
parents f9232b0310ef
children 1857f50a9643
comparison
equal deleted inserted replaced
39899:f9232b0310ef 39900:a89dd6d01df0
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