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>

4 files changed, 13 insertions, 1 deletions

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index d28c6bb2630..9fdd6a27905 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -291,6 +291,7 @@ GitDiffEditorController::GitDiffEditorController(IDocument *document, const QStr
 {
     connect(&m_decorator, &DescriptionWidgetDecorator::branchListRequested,
             this, &GitDiffEditorController::updateBranchList);
+    setDisplayName("Git Diff");
 }
 
 void GitDiffEditorController::updateBranchList()
@@ -514,7 +515,9 @@ public:
         GitDiffEditorController(document, dir),
         m_id(id),
         m_state(Idle)
-    { }
+    {
+        setDisplayName("Git Show");
+    }
 
     void reload() override;
     void processCommandOutput(const QString &output) override;
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index 4e3f6e37e35..f311d824c3f 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)
diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
index 6ece9c8b9d9..cb41e7e7d25 100644
--- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
+++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
@@ -98,6 +98,7 @@ public:
     const QString m_directory;
     QString m_startupFile;
     QString m_output;
+    QString m_displayName;
     QPointer<VcsCommand> m_command;
     QPointer<VcsCommandResultProxy> m_commandResultProxy;
     QFutureWatcher<QList<FileData>> *m_processWatcher = nullptr;
@@ -251,6 +252,7 @@ void VcsBaseDiffEditorController::runCommand(const QList<QStringList> &args, uns
     d->cancelReload();
 
     d->m_command = new VcsCommand(workingDirectory(), d->m_client->processEnvironment());
+    d->m_command->setDisplayName(d->m_displayName);
     d->m_command->setCodec(codec ? codec : EditorManager::defaultTextCodec());
     d->m_commandResultProxy = new VcsCommandResultProxy(d->m_command.data(), d);
     d->m_command->addFlags(flags);
@@ -289,6 +291,11 @@ QString VcsBaseDiffEditorController::startupFile() const
     return d->m_startupFile;
 }
 
+void VcsBaseDiffEditorController::setDisplayName(const QString &displayName)
+{
+    d->m_displayName = displayName;
+}
+
 } // namespace VcsBase
 
 #include "vcsbasediffeditorcontroller.moc"
diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
index eb6e97157f0..8b4668dbf05 100644
--- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
+++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
@@ -53,6 +53,7 @@ protected:
     QString workingDirectory() const;
     void setStartupFile(const QString &startupFile);
     QString startupFile() const;
+    void setDisplayName(const QString &displayName);
 
 private:
     friend class VcsBaseDiffEditorControllerPrivate;