Skip to content

Commit

Permalink
gitk: Fix some bugs in the new cherry-picking code
Browse files Browse the repository at this point in the history
    
When inserting the new commit row for the cherry-picked commit, we weren't
advancing the selected line (if there is one), and we weren't updating
commitlisted properly.
  • Loading branch information
Paul Mackerras committed Aug 28, 2006
1 parent d1e4675 commit 561d038
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions gitk
Original file line number Diff line number Diff line change
Expand Up @@ -3314,14 +3314,14 @@ proc finishcommits {} {
catch {unset pending_select}
}

# Inserting a new commit as the child of the commit on row $row.
# Insert a new commit as the child of the commit on row $row.
# The new commit will be displayed on row $row and the commits
# on that row and below will move down one row.
proc insertrow {row newcmit} {
global displayorder parentlist childlist commitlisted
global commitrow curview rowidlist rowoffsets numcommits
global rowrangelist idrowranges rowlaidout rowoptim numcommits
global linesegends
global linesegends selectedline

if {$row >= $numcommits} {
puts "oops, inserting new row $row but only have $numcommits rows"
Expand All @@ -3334,6 +3334,7 @@ proc insertrow {row newcmit} {
lappend kids $newcmit
lset childlist $row $kids
set childlist [linsert $childlist $row {}]
set commitlisted [linsert $commitlisted $row 1]
set l [llength $displayorder]
for {set r $row} {$r < $l} {incr r} {
set id [lindex $displayorder $r]
Expand Down Expand Up @@ -3409,6 +3410,9 @@ proc insertrow {row newcmit} {
incr rowoptim
incr numcommits

if {[info exists selectedline] && $selectedline >= $row} {
incr selectedline
}
redisplay
}

Expand Down

0 comments on commit 561d038

Please sign in to comment.