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

Git: Mark forgotten cases as expected to change

Browse Source 
* When mergetool is done
* Stash
* Stash pop
* Continue/skip command
* executeAndHandleConflicts
* Interactive rebase

Change-Id: Ic8108b096c367c7777dae06f7ff255999d64fda9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-09 23:47:19 +03:00
committed by Orgad Shaneh
parent 0bd5e79bc7
commit 879012a50b
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,9 @@
#include "mergetool.h"
#include "gitclient.h"
#include "gitplugin.h"
#include "gitversioncontrol.h"
#include <coreplugin/documentmanager.h>
#include <vcsbase/vcsbaseoutputwindow.h>
#include <QMessageBox>
@@ -100,6 +102,7 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files)
if (m_process->waitForStarted()) {
connect(m_process, SIGNAL(finished(int)), this, SLOT(done()));
connect(m_process, SIGNAL(readyRead()), this, SLOT(readData()));
Core::DocumentManager::expectDirectoryChange(workingDirectory);
}
else {
delete m_process;
@@ -257,13 +260,16 @@ void MergeTool::readData()
void MergeTool::done()
{
VcsBase::VcsBaseOutputWindow *outputWindow = VcsBase::VcsBaseOutputWindow::instance();
const QString workingDirectory = m_process->workingDirectory();
int exitCode = m_process->exitCode();
if (!exitCode) {
outputWindow->append(tr("Merge tool process finished successully."));
m_gitClient->continueCommandIfNeeded(m_process->workingDirectory());
m_gitClient->continueCommandIfNeeded(workingDirectory);
} else {
outputWindow->append(tr("Merge tool process terminated with exit code %1").arg(exitCode));
}
Core::DocumentManager::unexpectDirectoryChange(workingDirectory);
GitPlugin::instance()->gitVersionControl()->emitRepositoryChanged(workingDirectory);
deleteLater();
}