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

Git: Suggest continuing rebase after conflicts are resolved

Browse Source 
Change-Id: Icf74397ee7a3cedd7e46c63777832e1fc9f46033
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-14 22:26:12 +02:00
committed by Orgad Shaneh
parent 099345d110
commit 3e9f2d688c
3 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@
#include <vcsbase/vcsbaseoutputwindow.h>
#include <QFile>
#include <QMessageBox>
#include <QProcess>
#include <QPushButton>
@@ -257,10 +258,21 @@ void MergeTool::done()
{
VcsBase::VcsBaseOutputWindow *outputWindow = VcsBase::VcsBaseOutputWindow::instance();
int exitCode = m_process->exitCode();
if (!exitCode)
if (!exitCode) {
outputWindow->append(tr("Merge tool process finished successully"));
else
QString workingDirectory = m_process->workingDirectory();
GitClient *client = GitPlugin::instance()->gitClient();
QString gitDir = client->findGitDirForRepository(workingDirectory);
if (QFile::exists(gitDir + QLatin1String("/rebase-apply/rebasing"))) {
if (QMessageBox::question(0, tr("Continue Rebase"),
tr("Continue rebase?"),
QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) {
client->synchronousRebaseContinue(workingDirectory);
}
}
} else {
outputWindow->append(tr("Merge tool process terminated with exit code %1").arg(exitCode));
}
deleteLater();
}