diff options
| author | Francois Ferrand <thetypz@gmail.com> | 2013-09-24 14:44:22 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-09-26 23:10:59 +0200 |
| commit | 367cfc841967ab9c3ed2e2615a34e57a5d968513 (patch) | |
| tree | eca1b73f1729e03fcf5559ee2b1ed9122fc41aa8 /src/plugins/git/giteditor.h | |
| parent | c372f7b60180bebaaab1fbe144a18b1f25c669b7 (diff) | |
Git: Support staging a single chunk.
Add context menu in diff editor to stage/unstage a single chunk from the diff.
Task-number: QTCREATORBUG-5875
Change-Id: Ic244a0d84b5ed5f66b90d7fe8784fc1b8041d183
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/giteditor.h')
| -rw-r--r-- | src/plugins/git/giteditor.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h index 648a2fa4ec..1ed80c7ccf 100644 --- a/src/plugins/git/giteditor.h +++ b/src/plugins/git/giteditor.h @@ -57,9 +57,13 @@ public slots: private slots: void cherryPickChange(); void revertChange(); + void stageDiffChunk(); + void unstageDiffChunk(); + void applyDiffChunk(const VcsBase::DiffChunk& chunk, bool revert); private: void init(); + void addDiffActions(QMenu *menu, const VcsBase::DiffChunk &chunk); bool open(QString *errorString, const QString &fileName, const QString &realFileName); QSet<QString> annotationChanges() const; QString changeUnderCursor(const QTextCursor &) const; |