Mercurial > hg
view hgext/progress.py @ 26165:927c0d84e09f
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
author | liscju <piotr.listkiewicz@gmail.com> |
---|---|
date | Tue, 01 Sep 2015 21:37:51 +0200 |
parents | 5ef327e9c157 |
children |
line wrap: on
line source
# progress.py show progress bars for some actions # # Copyright (C) 2010 Augie Fackler <durin42@gmail.com> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. """show progress bars for some actions (DEPRECATED) This extension has been merged into core, you can remove it from your config. See hg help config.progress for configuration options. """ # Note for extension authors: ONLY specify testedwith = 'internal' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. testedwith = 'internal'