[PATCH] rebase: fix warning about ignoring tool option on rebase continue (issue4698)

[Augie Fackler]

On Tue, Sep 01, 2015 at 10:37:50PM +0200, liscju wrote:
> # HG changeset patch
> # User liscju <piotr.listkiewicz at gmail.com>
> # Date 1441136271 -7200
> #      Tue Sep 01 21:37:51 2015 +0200
> # Branch stable
> # Node ID 7952cf94eb6aa616e115dda6517b4a531b632d27
> # Parent  006870583088a4767bcaa77903e9607ceb480cba
> rebase: fix warning about ignoring tool option on rebase continue (issue4698)

queued, many thanks

>
> Before this patch rebase --continue with specified --tool option outputs
> warnings "tool option will be ignored". It is false statement because
> in case of any merge conflicts it uses specified tool to resolve it.
>
> This patch makes this warning appears only when user specified --tool
> when running rebase --abort , in this case tool doesn't have any
> sense
>
> diff -r 006870583088 -r 7952cf94eb6a hgext/rebase.py
> --- a/hgext/rebase.py	Mon Aug 31 23:14:58 2015 +0900
> +++ b/hgext/rebase.py	Tue Sep 01 21:37:51 2015 +0200
> @@ -218,7 +218,7 @@
>              if srcf or basef or destf:
>                  raise util.Abort(
>                      _('abort and continue do not allow specifying revisions'))
> -            if opts.get('tool', False):
> +            if abortf and opts.get('tool', False):
>                  ui.warn(_('tool option will be ignored\n'))
>
>              try:
> diff -r 006870583088 -r 7952cf94eb6a tests/test-rebase-parameters.t
> --- a/tests/test-rebase-parameters.t	Mon Aug 31 23:14:58 2015 +0900
> +++ b/tests/test-rebase-parameters.t	Tue Sep 01 21:37:51 2015 +0200
> @@ -485,7 +485,6 @@
>    $ hg resolve -m c2
>    (no more unresolved files)
>    $ hg rebase -c --tool internal:fail
> -  tool option will be ignored
>    rebasing 2:e4e3f3546619 "c2b" (tip)
>    note: rebase of 2:e4e3f3546619 created no changes to commit
>    saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob)
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel