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

Git - added continue and abort

Browse Source 
Change-Id: I3dd274ad827c7cbd94d849b991cc518eff7f18ae
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Petar Perisin
2013-04-19 07:48:05 +02:00
parent ec145f36f3
commit 311ca8cd01
6 changed files with 143 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/giteditor.cpp
View File

@@ -213,14 +213,14 @@ void GitEditor::cherryPickChange()
{
const QFileInfo fi(source());
const QString workingDirectory = fi.isDir() ? fi.absoluteFilePath() : fi.absolutePath();
GitPlugin::instance()->gitClient()->cherryPickCommit(workingDirectory, m_currentChange);
GitPlugin::instance()->gitClient()->synchronousCherryPick(workingDirectory, m_currentChange);
}
void GitEditor::revertChange()
{
const QFileInfo fi(source());
const QString workingDirectory = fi.isDir() ? fi.absoluteFilePath() : fi.absolutePath();
GitPlugin::instance()->gitClient()->revertCommit(workingDirectory, m_currentChange);
GitPlugin::instance()->gitClient()->synchronousRevert(workingDirectory, m_currentChange);
}
QString GitEditor::decorateVersion(const QString &revision) const