On Fri, 19 Aug 2011, Michal Sojka wrote:
> On Fri, 19 Aug 2011, Chris Packham wrote:
> > One thing I've thought about (but don't know enough TCL to begin to
> > implement) is a graphical rebase front end. I often use git gui to make
> > tweaks to the last commit (message and content) so why not extend that
> > to a rebase operation. I think that might address some of Peffs concerns
> > because the user would be invoking something specifically intended for
> > rebasing and accepts all the caveats that go along with that.
>
> Hi Chris,
>
> the version of the patch below supports not only editing of commit
> message but also of the commit itself. There is an easy way to split
> commits and to remove lines/hunks form the commits. Additionally, with
> the help of editor and "Rescan" button in git gui, you can add things to
> the commits.
>
> I think that in the similar way as in this patch, it would be easy to
> allow gitk doing fixup and squash operations offered by rebase.
Here is another proof of concept, that gitk can also fold commits
together. It applies on top of the previously sent patch.
This operation is probably even more dangerous then simple edit because
it reorders commits. Does anybody have an idea which checks should be
employed in order to warn users about unexpected results?
-Michal
--8<---------------cut here---------------start------------->8---
>From 5943dfcd9738f8da9d159f912302cfbb2b4d35b5 Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojka@xxxxxxxxxxxxxxxxxxxx>
Date: Fri, 19 Aug 2011 16:33:55 +0200
Subject: [PATCH 2/2] gitk: Learn how to fixup commits
Signed-off-by: Michal Sojka <sojka@xxxxxxxxxxxxxxxxxxxx>
---
gitk-git/gitk | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 432ca9b..53fa51d 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -2488,6 +2488,7 @@ proc makewindow {} {
{mc "Diff this -> selected" command {diffvssel 0}}
{mc "Diff selected -> this" command {diffvssel 1}}
{mc "Edit this commit" command edit_commit}
+ {mc "Fold this into selected (fixup)" command fixup_commit}
{mc "Make patch" command mkpatch}
{mc "Create tag" command mktag}
{mc "Write commit to file" command writecommit}
@@ -8448,6 +8449,7 @@ proc rowmenu {x y id} {
$menu entryconfigure [mca "Diff this -> selected"] -state $state
$menu entryconfigure [mca "Diff selected -> this"] -state $state
$menu entryconfigure [mca "Make patch"] -state $state
+ $menu entryconfigure [mca "Fold this into selected (fixup)"] -state $state
tk_popup $menu $x $y
}
@@ -9103,14 +9105,24 @@ proc cherrypick {} {
notbusy cherrypick
}
+proc rebase_ok {id} {
+ if {[exec git branch -r --contains=$id] ne {}} {
+ if { [confirm_popup [mc "The commit you are going to edit is contained 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 1
+ } else {
+ return 0
+ }
+ }
+ return 1
+}
+
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 is contained 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 }
+ if {![rebase_ok $rowmenuid]} 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]} {
@@ -9141,6 +9153,25 @@ proc edit_commit {} {
notbusy edit
}
+proc fixup_commit {} {
+ global rowmenuid selectedline
+ set selectedid [commitonrow $selectedline]
+ set baseid [exec git merge-base $selectedid $rowmenuid]
+
+ if {![rebase_ok $baseid]} return
+
+ set this [string range $rowmenuid 0 6]
+ set selected [string range $selectedid 0 6]
+ nowbusy fixup
+ if {[catch {exec sh -c "GIT_EDITOR=\"sed -i -e '/^pick $selected/a fixup $this' -e '/^pick $this/d'\" git rebase -p -i $baseid^ 2>&1"} err]} {
+ notbusy fixup
+ error_popup $err
+ exec git rebase --abort
+ return
+ }
+ updatecommits
+ notbusy fixup
+}
proc resethead {} {
global mainhead rowmenuid confirm_ok resettype NS
--
1.7.5.4
--8<---------------cut here---------------end--------------->8---
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html