Mercurial > public > mercurial-scm > hg

comparison mercurial/verify.py @ 49827:d09a57ce6fc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
verify: print short `p1` node in relevant dirstate messages This will help with debugging.
author Rapha?l Gom?s <rgomes@octobus.net>
date Wed, 21 Dec 2022 12:26:00 +0100
parents c84844cd523a
children 521fec115dad
comparison
equal deleted inserted replaced
49826:c84844cd523a 49827:d09a57ce6fc4
610 dirstate_errors = 0 610 dirstate_errors = 0
611 611
612 is_narrow = requirements.NARROW_REQUIREMENT in repo.requirements 612 is_narrow = requirements.NARROW_REQUIREMENT in repo.requirements
613 narrow_matcher = repo.narrowmatch() if is_narrow else None 613 narrow_matcher = repo.narrowmatch() if is_narrow else None
614 614
615 for err in repo.dirstate.verify(m1, m2, narrow_matcher): 615 for err in repo.dirstate.verify(m1, m2, parent1, narrow_matcher):
616 ui.error(err) 616 ui.error(err)
617 dirstate_errors += 1 617 dirstate_errors += 1
618 618
619 if dirstate_errors: 619 if dirstate_errors:
620 self.errors += dirstate_errors 620 self.errors += dirstate_errors