D3870: rebase: add --confirm option

[yuja (Yuya Nishihara)]

yuja added a comment.


  >   >> +            if confirm:
  >   >>  +                # abort as in-memory merge doesn't support conflict
  >   >>  +                rbsrt._prepareabortorcontinue(isabort=True, backup=False,
  >   >>  +                                              suppwarns=True)
  >   >>  +                needsabort = False
  >   >>  +                if not ui.promptchoice(_(b'apply changes (yn)?'
  >   >>  +                                         b'$$ &Yes $$ &No')):
  >   > 
  >   > Nit: This isn't actually "apply changes".
  >   
  >   Hmm, then what it should be?
  
  I think we'll need to tell that we'll rerun the rebase that's known to have
  at least one merge conflict. "apply changes" sounds like it would just
  finalize the rebase up to the previous revision of the merge conflict.
  
  Alternatively, it can just abort without the prompt since the dry-run was
  incomplete.

REPOSITORY
  rHG Mercurial

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

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