aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/mercurial
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2019-02-28 09:01:15 +0200
committerOrgad Shaneh <orgads@gmail.com>2019-02-28 08:12:30 +0000
commit17b3e45b8cb86a72ff0208dbe28b47034c95921e (patch)
tree74f7b8610b30cb1e3a1a57c2b943f4fe04d6b523 /src/plugins/mercurial
parent8a0f7bcfd5ddf0727304f531d021e9ff0b991b01 (diff)
VCS: Fix display of diff/show commands in progress bar
In 6ae0e8d2c7f5d1bb3d3240bdfba3cd68eb093252 we added 2 arguments that precede the diff sub-command (-c diff.color=false). When display name is not set, ShellCommand uses the binary followed by the first argument, so it now showed "Git -c" instead of "Git Diff". Change-Id: Ie584837bd87fd529e0cd015025fc3bf1a69d085c Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Xiaofeng Wang <wasphin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/mercurial')
-rw-r--r--src/plugins/mercurial/mercurialclient.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index 4e3f6e37e3..f311d824c3 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -68,6 +68,7 @@ protected:
MercurialDiffEditorController::MercurialDiffEditorController(IDocument *document, const QString &workingDirectory):
VcsBaseDiffEditorController(document, MercurialPlugin::client(), workingDirectory)
{
+ setDisplayName("Hg Diff");
}
void MercurialDiffEditorController::runCommand(const QList<QStringList> &args, QTextCodec *codec)