comparison mercurial/scmutil.py @ 39899:f9232b0310ef

pullreport: issue a message about "extinct" pulled changesets Changeset pulled from a remote repository while already obsolete locally can end up hidden after the pull. Hiding obsolete changesets is a good behavior but silently "skipping" some of the pulled content can get confusing. We now detect this situation and emit a message about it. The message is simple and the wording could be improved, however, we focus on the detection here. Evolution is still an experimental feature, so the output is open to changes. In particular, we could point out at the latest successors of the obsolete changesets, however, it can get tricky is there are many of them. So we delay these improvements to another adventure. Another easy improvement would be to merge this message with the previous line about the new nodes and their phases. This is a good example of cases where we can only transmit a limited amount of data to users by default. We need some sort of "transaction journal" we could point the user to.
author Boris Feld <boris.feld@octobus.net>
date Thu, 27 Sep 2018 16:52:25 +0200
parents b5e12039e6e0
children a89dd6d01df0
comparison
equal deleted inserted replaced
39898:b5e12039e6e0 39899:f9232b0310ef
1649 else: 1649 else:
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
1655 obsadded = unfi.revs('%d: and obsolete()', origrepolen)
1656 cl = repo.changelog
1657 extinctadded = [r for r in obsadded if r not in cl]
1658 if extinctadded:
1659 # They are not just obsolete, but obsolete and invisible
1660 # we call them "extinct" internally but the terms have not been
1661 # exposed to users.
1662 msg = '(%d other changesets obsolete on arrival)\n'
1663 repo.ui.status(msg % len(extinctadded))
1664
1654 @reportsummary 1665 @reportsummary
1655 def reportphasechanges(repo, tr): 1666 def reportphasechanges(repo, tr):
1656 """Report statistics of phase changes for changesets pre-existing 1667 """Report statistics of phase changes for changesets pre-existing
1657 pull/unbundle. 1668 pull/unbundle.
1658 """ 1669 """