D3959: rebase: add --stop option to stop rebase at any point (issue5206)

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Mon Jul 23 14:59:57 EDT 2018


pulkit added a comment.


  Excellent! I like the feature and this has been on my TODO for long. Thanks for coding this up. You also need to take care of bookmark movements. Bookmark from changesets which have successfully rebased should be moved to their successors when we call --stop.

INLINE COMMENTS

> rebase.py:595
> +            if self.collapsef:
> +                ui.status(_("can't stop in --collapse session\n"))
> +                return abort(self.repo, self.originalwd, self.destmap,

nit: 'cannot stop in --collapse session'

Also, if we cannot stop, we should not fallback to aborting.

> rebase.py:604
> +                      " unrebased descendants"),
> +                    hint=_('either enable evolve extension to allow unstable '
> +                           'revisions or use --keep to keep original '

nit: we don't mention about evolve or any out of tree extension from core. How about making `--stop` only work when obsmarkers are enabled and error out if they are not enabled?

> rebase.py:692
>      ('t', 'tool', '', _('specify merge tool')),
> +    ('S', 'stop', False, _('stop interrupted rebase')),
>      ('c', 'continue', False, _('continue an interrupted rebase')),

Can we prevent having `s` and `S` evaluate to different options i.e. leave 'S' for now?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3959

To: khanchi97, #hg-reviewers
Cc: pulkit, yuja, mercurial-devel


More information about the Mercurial-devel mailing list