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

Git: Prompt for unchanged file after custom mergetool fails

Browse Source 
To reproduce, create a conflict and configure a custom mergetool that does
nothing:

git config mergetool.my.cmd true
git config merge.tool my

Then execute merge tool from Qt Creator. The merge tool process hangs
while asking how to handle the unchanged file, and can only be killed
externally.

Change-Id: I4d2a91061bd7549e308f6a25f106e6a7afc5cadb
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2016-06-23 21:52:00 +03:00
committed by Orgad Shaneh
parent 53c4b36e4a
commit 573958e79f
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,6 +218,18 @@ void MergeTool::addButton(QMessageBox *msgBox, const QString &text, char key)
msgBox->addButton(text, QMessageBox::AcceptRole)->setProperty("key", key); msgBox->addButton(text, QMessageBox::AcceptRole)->setProperty("key", key);
} }
void MergeTool::prompt(const QString &title, const QString &question)
{
if (QMessageBox::question(Core::ICore::dialogParent(), title, question,
QMessageBox::Yes | QMessageBox::No,
QMessageBox::No) == QMessageBox::Yes) {
m_process->write("y\n");
} else {
m_process->write("n\n");
}
m_process->waitForBytesWritten();
}
void MergeTool::readData() void MergeTool::readData()
{ {
while (m_process->bytesAvailable()) { while (m_process->bytesAvailable()) {
@@ -231,16 +243,10 @@ void MergeTool::readData()
m_localState = waitAndReadStatus(m_localInfo); m_localState = waitAndReadStatus(m_localInfo);
m_remoteState = waitAndReadStatus(m_remoteInfo); m_remoteState = waitAndReadStatus(m_remoteInfo);
chooseAction(); chooseAction();
} else if (line.startsWith("Was the merge successful")) {
prompt(tr("Unchanged File"), tr("Was the merge successful?"));
} else if (line.startsWith("Continue merging")) { } else if (line.startsWith("Continue merging")) {
if (QMessageBox::question(Core::ICore::dialogParent(), tr("Continue Merging"), prompt(tr("Continue Merging"), tr("Continue merging other unresolved paths?"));
tr("Continue merging other unresolved paths?"),
QMessageBox::Yes | QMessageBox::No,
QMessageBox::No) == QMessageBox::Yes) {
m_process->write("y\n");
} else {
m_process->write("n\n");
}
m_process->waitForBytesWritten();
} }
} }
} }

1
src/plugins/git/mergetool.h
View File

@@ -64,6 +64,7 @@ public:
}; };
private: private:
void prompt(const QString &title, const QString &question);
void readData(); void readData();
void done(); void done();