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

Git: Disable cherry-pick and revert for commit message and int. rebase

Browse Source 
These editors are usually opened when a process is in progress, so
it doesn't make sense to allow reverting or cherry-picking for them

Change-Id: I6f238ef973be86d07d2646bcea969f9aa2742b9d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-06 10:09:28 +03:00
committed by Orgad Shaneh
parent 808f4492c5
commit 0bd5e79bc7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,8 +284,10 @@ bool GitEditor::isValidRevision(const QString &revision) const
void GitEditor::addChangeActions(QMenu *menu, const QString &change)
{
m_currentChange = change;
menu->addAction(tr("Cherry-Pick Change %1").arg(change), this, SLOT(cherryPickChange()));
menu->addAction(tr("Revert Change %1").arg(change), this, SLOT(revertChange()));
if (contentType() != VcsBase::OtherContent) {
menu->addAction(tr("Cherry-Pick Change %1").arg(change), this, SLOT(cherryPickChange()));
menu->addAction(tr("Revert Change %1").arg(change), this, SLOT(revertChange()));
}
}
QString GitEditor::revisionSubject(const QTextBlock &inBlock) const