Mercurial > hg
comparison hgext/rebase.py @ 45151:e429e7c801b2
error: normalize "unresolved conflicts" error messages with a custom class
Differential Revision: https://phab.mercurial-scm.org/D8713
author | Daniel Ploch <dploch@google.com> |
---|---|
date | Tue, 14 Jul 2020 13:35:54 -0700 |
parents | dc5e5577af39 |
children | 0ea08126a2af |
comparison
equal
deleted
inserted
replaced
45150:dc5e5577af39 | 45151:e429e7c801b2 |
---|---|
628 ) | 628 ) |
629 if stats.unresolvedcount > 0: | 629 if stats.unresolvedcount > 0: |
630 if self.inmemory: | 630 if self.inmemory: |
631 raise error.InMemoryMergeConflictsError() | 631 raise error.InMemoryMergeConflictsError() |
632 else: | 632 else: |
633 raise error.InterventionRequired( | 633 raise error.ConflictResolutionRequired(b'rebase') |
634 _( | |
635 b"unresolved conflicts (see 'hg " | |
636 b"resolve', then 'hg rebase --continue')" | |
637 ) | |
638 ) | |
639 if not self.collapsef: | 634 if not self.collapsef: |
640 merging = p2 != nullrev | 635 merging = p2 != nullrev |
641 editform = cmdutil.mergeeditform(merging, b'rebase') | 636 editform = cmdutil.mergeeditform(merging, b'rebase') |
642 editor = cmdutil.getcommiteditor( | 637 editor = cmdutil.getcommiteditor( |
643 editform=editform, **pycompat.strkwargs(opts) | 638 editform=editform, **pycompat.strkwargs(opts) |