feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Show full description on tooltip in commit chooser dialogs

Browse Source 
Like Push to Gerrit, Rebase, Reset, Fixup Commit.

Fixes: QTCREATORBUG-24366
Change-Id: I0f596f84661a1a4f37fe971683cc0d985a6c9b1f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2020-07-31 07:55:08 +03:00
committed by Orgad Shaneh
parent 78406916a3
commit a48cde86f3
5 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/git/gitclient.cpp
View File

@@ -2089,21 +2089,20 @@ SubmoduleDataMap GitClient::submoduleList(const QString &workingDirectory) const
return result;
}
bool GitClient::synchronousShow(const QString &workingDirectory, const QString &id,
QByteArray *output, QString *errorMessage) const
QByteArray GitClient::synchronousShow(const QString &workingDirectory, const QString &id,
unsigned flags) const
{
if (!canShow(id)) {
*errorMessage = msgCannotShow(id);
return false;
VcsOutputWindow::appendError(msgCannotShow(id));
return {};
}
const QStringList arguments = {"show", decorateOption, noColorOption, id};
const SynchronousProcessResponse resp = vcsFullySynchronousExec(workingDirectory, arguments);
const QStringList arguments = {"show", decorateOption, noColorOption, "--no-patch", id};
const SynchronousProcessResponse resp = vcsFullySynchronousExec(workingDirectory, arguments, flags);
if (resp.result != SynchronousProcessResponse::Finished) {
msgCannotRun(arguments, workingDirectory, resp.stdErr(), errorMessage);
return false;
msgCannotRun(arguments, workingDirectory, resp.stdErr(), nullptr);
return {};
}
*output = resp.rawStdOut;
return true;
return resp.rawStdOut;
}
// Retrieve list of files to be cleaned