# HG changeset patch
# User liscju <piotr.listkiewicz@gmail.com>
# Date 1441136271 -7200
# Node ID 927c0d84e09fd5cd75c8041ba42f5d6982def534
# Parent  e037fd28c8bb2d4cf051603dcc06e1827438b80c
rebase: fix warning about ignoring tool option on rebase continue (issue4698)

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 e037fd28c8bb -r 927c0d84e09f hgext/rebase.py
--- a/hgext/rebase.py	Sat Aug 22 16:39:29 2015 -0700
+++ 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 e037fd28c8bb -r 927c0d84e09f tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t	Sat Aug 22 16:39:29 2015 -0700
+++ 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)