gitk: Select something appropriate on cherry-pick, branch reset and checkout

paulusmack · paulusmack · commit 46308ea1da67 · 2008-01-15T22:16:32.000+11:00
This makes gitk select the new commit when cherry-picking, and select
the new checked-out head when resetting or checking out a branch.
This feels more natural because the user is usually more interested
in that commit now than whatever was selected before.

Signed-off-by: Paul Mackerras &lt;paulus@samba.org&gt;
diff --git a/gitk b/gitk
@@ -3397,7 +3397,7 @@ proc ordertoken {id} {
 	set id [first_real_child $curview,$p]
 	if {$id eq {}} {
 	    # it's a root
-	    set tok [lindex $varctok($curview) $a]
+	    set tok [lindex $varctok($curview) $varcid($curview,$p)]
 	    break
 	}
 	if {[llength $parents($curview,$id)] == 1} {
@@ -7028,6 +7028,7 @@ proc cherrypick {} {
 	}
 	redrawtags $oldhead
 	redrawtags $newhead
+	selbyid $newhead
     }
     notbusy cherrypick
 }
@@ -7072,6 +7073,7 @@ proc resethead {} {
 	dohidelocalchanges
 	filerun $fd [list readresetstat $fd]
 	nowbusy reset [mc "Resetting"]
+	selbyid $rowmenuid
     }
 }
 
@@ -7144,6 +7146,7 @@ proc cobranch {} {
 	    redrawtags $headids($oldmainhead)
 	}
 	redrawtags $headmenuid
+	selbyid $headmenuid
     }
     if {$showlocalchanges} {
 	dodiffindex

Original file line number	Diff line number	Diff line change
`@@ -3397,7 +3397,7 @@ proc ordertoken {id} {`
`3397`	`3397`	`set id [first_real_child $curview,$p]`
`3398`	`3398`	`if {$id eq {}} {`
`3399`	`3399`	`# it's a root`
`3400`		`- set tok [lindex $varctok($curview) $a]`
	`3400`	`+ set tok [lindex $varctok($curview) $varcid($curview,$p)]`
`3401`	`3401`	`break`
`3402`	`3402`	`}`
`3403`	`3403`	`if {[llength $parents($curview,$id)] == 1} {`
`@@ -7028,6 +7028,7 @@ proc cherrypick {} {`
`7028`	`7028`	`}`
`7029`	`7029`	`redrawtags $oldhead`
`7030`	`7030`	`redrawtags $newhead`
	`7031`	`+ selbyid $newhead`
`7031`	`7032`	`}`
`7032`	`7033`	`notbusy cherrypick`
`7033`	`7034`	`}`
`@@ -7072,6 +7073,7 @@ proc resethead {} {`
`7072`	`7073`	`dohidelocalchanges`
`7073`	`7074`	`filerun $fd [list readresetstat $fd]`
`7074`	`7075`	`nowbusy reset [mc "Resetting"]`
	`7076`	`+ selbyid $rowmenuid`
`7075`	`7077`	`}`
`7076`	`7078`	`}`
`7077`	`7079`
`@@ -7144,6 +7146,7 @@ proc cobranch {} {`
`7144`	`7146`	`redrawtags $headids($oldmainhead)`
`7145`	`7147`	`}`
`7146`	`7148`	`redrawtags $headmenuid`
	`7149`	`+ selbyid $headmenuid`
`7147`	`7150`	`}`
`7148`	`7151`	`if {$showlocalchanges} {`
`7149`	`7152`	`dodiffindex`