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

VCS: Introduce message style

Browse Source 
Similar to compile and app output panes

Change-Id: Ib9ac6d8be880739ae78d0a39f7051cbe616e46c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-08-11 22:36:21 +03:00
committed by Orgad Shaneh
parent f9c4889a7f
commit a9095ee104
6 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2885,7 +2885,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
const bool rc = fullySynchronousGit(repositoryDirectory, args, &outputText, &errorText);
const QString stdErr = commandOutputFromLocal8Bit(errorText);
if (rc) {
outputWindow()->append(msgCommitted(amendSHA1, commitCount));
outputWindow()->appendMessage(msgCommitted(amendSHA1, commitCount));
outputWindow()->appendError(stdErr);
} else {
outputWindow()->appendError(tr("Cannot commit %n file(s): %1\n", 0, commitCount).arg(stdErr));

2
src/plugins/git/gitplugin.cpp
View File

@@ -1310,7 +1310,7 @@ void GitPlugin::applyPatch(const QString &workingDirectory, QString file)
QString errorMessage;
if (m_gitClient->synchronousApplyPatch(workingDirectory, file, &errorMessage)) {
if (errorMessage.isEmpty())
outwin->append(tr("Patch %1 successfully applied to %2").arg(file, workingDirectory));
outwin->appendMessage(tr("Patch %1 successfully applied to %2").arg(file, workingDirectory));
else
outwin->appendError(errorMessage);
} else {

2
src/plugins/git/mergetool.cpp
View File

@@ -262,7 +262,7 @@ void MergeTool::done()
const QString workingDirectory = m_process->workingDirectory();
int exitCode = m_process->exitCode();
if (!exitCode) {
outputWindow->append(tr("Merge tool process finished successully."));
outputWindow->appendMessage(tr("Merge tool process finished successully."));
m_gitClient->continueCommandIfNeeded(workingDirectory);
} else {
outputWindow->appendError(tr("Merge tool process terminated with exit code %1")