[PATCH] gitk: Allow commit editing
- From
Michal Sojka <sojka@os.inf.tu-dresden.de>
- Date
- Aug 19, 2011, 12:25 UTC
- Message-ID
- <1313756753-26498-1-git-send-email-sojka@os.inf.tu-dresden.de>
- In-Reply-To
- <87obzlwpx0.fsf@steelpick.2x.cz>
I often use gitk to review patches before pushing them and would like to have an easy way of fixing typos in commit messages. The current approach if copying the commitid, switching to terminal, invoking git rebase -i, editing the commit and switching back to gitk is a way too complicated just for chaning a single letter.
This patch adds "Edit this commit" item to gitk's context menu which invokes interactive rebase in a non-interactive way :-). git gui is used to actually edit the commit.
The user is warned if the commit that is going to be edited is contained in a remote branch.
Signed-off-by: Michal Sojka <sojka@os.inf.tu-dresden.de> --- gitk-git/gitk | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk index 4cde0c4..83b3307 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -2487,6 +2487,7 @@ proc makewindow {} { makemenu $rowctxmenu { {mc "Diff this -> selected" command {diffvssel 0}} {mc "Diff selected -> this" command {diffvssel 1}} + {mc "Edit this commit" command edit_commit} {mc "Make patch" command mkpatch} {mc "Create tag" command mktag} {mc "Write commit to file" command writecommit} @@ -9102,6 +9103,36 @@ proc cherrypick {} { notbusy cherrypick } +proc edit_commit {} { + global rowmenuid selectedline + + if {[exec git branch -r --contains=$rowmenuid] ne {}} { + if {![confirm_popup [mc "The commit you are going to edit appears in at least one\ + remote branch. It is a bad idea to change a branch that is\ + possibly used by other people. See git-rebase(1) for details.\n\n\ + Do you want to continue?"]]} return } + + nowbusy edit [mc "Editing commit"] + if {[catch {exec sh -c "(GIT_EDITOR='sed -ie 1s/^pick/edit/' git rebase -p -i $rowmenuid^ && git gui citool --amend) 2>&1"} err]} { + notbusy edit + error_popup $err + exec git rebase --abort + return + } + set newcommit [exec git rev-parse HEAD] + if {[catch {exec sh -c "git rebase --continue 2>&1"} err]} { + notbusy edit + error_popup $err + exec git rebase --abort + return + } + updatecommits + # XXX How to select the edited commit? This doesn't work. + selbyid $newcommit + notbusy edit +} + + proc resethead {} { global mainhead rowmenuid confirm_ok resettype NS
-- 1.7.5.4