797 def run(self): |
797 def run(self): |
798 repo = self.repo |
798 repo = self.repo |
799 rulectx = repo[self.node] |
799 rulectx = repo[self.node] |
800 hg.update(repo, self.state.parentctxnode, quietempty=True) |
800 hg.update(repo, self.state.parentctxnode, quietempty=True) |
801 applychanges(repo.ui, repo, rulectx, {}) |
801 applychanges(repo.ui, repo, rulectx, {}) |
|
802 hint = _(b'to edit %s, `hg histedit --continue` after making changes') |
802 raise error.InterventionRequired( |
803 raise error.InterventionRequired( |
803 _(b'Editing (%s), you may commit or record as needed now.') |
804 _(b'Editing (%s), commit as needed now to split the change') |
804 % node.short(self.node), |
805 % node.short(self.node), |
805 hint=_(b'hg histedit --continue to resume'), |
806 hint=hint % node.short(self.node), |
806 ) |
807 ) |
807 |
808 |
808 def commiteditor(self): |
809 def commiteditor(self): |
809 return cmdutil.getcommiteditor(edit=True, editform=b'histedit.edit') |
810 return cmdutil.getcommiteditor(edit=True, editform=b'histedit.edit') |
810 |
811 |