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

Git: Add context-menu actions for cherry-pick and revert

Browse Source 
Change-Id: Ic266fe039423a37df2fc347ead7530322ac47bb8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-01-23 17:06:43 +02:00
committed by Orgad Shaneh
parent 5e5831bb12
commit b53d398e2c
5 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,10 @@ public slots:
// Matches the signature of the finished signal of GitCommand
void commandFinishedGotoLine(bool ok, int exitCode, const QVariant &v);
private slots:
void cherryPickChange();
void revertChange();
private:
QSet<QString> annotationChanges() const;
QString changeUnderCursor(const QTextCursor &) const;
@@ -61,9 +65,11 @@ private:
QString decorateVersion(const QString &revision) const;
QStringList annotationPreviousVersions(const QString &revision) const;
bool isValidRevision(const QString &revision) const;
void addChangeActions(QMenu *menu, const QString &change);
mutable QRegExp m_changeNumberPattern8;
mutable QRegExp m_changeNumberPattern40;
QString m_currentChange;
};
} // namespace Git