summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
eb447a1)
The first was a simple typo where I put $yc instead of [yc $row].
The second was that I broke the logic for keeping up with fast
movement through the commits, e.g. when you select a commit and then
press down-arrow and let it autorepeat. That got broken when I
changed the merge diff display to use git-diff-tree --cc.
Signed-off-by: Paul Mackerras <paulus@samba.org>
set x [xc $row $ccol]
set y [yc $row]
if {$ccol < $col - 1} {
set x [xc $row $ccol]
set y [yc $row]
if {$ccol < $col - 1} {
- lappend coords [xc $row [expr {$col - 1}]] $yc
+ lappend coords [xc $row [expr {$col - 1}]] [yc $row]
} elseif {$ccol > $col + 1} {
} elseif {$ccol > $col + 1} {
- lappend coords [xc $row [expr {$col + 1}]] $yc
+ lappend coords [xc $row [expr {$col + 1}]] [yc $row]
proc mergediff {id} {
global parents diffmergeid diffopts mdifffd
proc mergediff {id} {
global parents diffmergeid diffopts mdifffd
+ global difffilestart diffids
catch {unset difffilestart}
# this doesn't seem to actually affect anything...
set env(GIT_DIFF_OPTS) $diffopts
catch {unset difffilestart}
# this doesn't seem to actually affect anything...
set env(GIT_DIFF_OPTS) $diffopts
proc getmergediffline {mdf id} {
global diffmergeid ctext cflist nextupdate nparents mergemax
proc getmergediffline {mdf id} {
global diffmergeid ctext cflist nextupdate nparents mergemax
+ global difffilestart mdifffd
set n [gets $mdf line]
if {$n < 0} {
set n [gets $mdf line]
if {$n < 0} {
- if {![info exists diffmergeid] || $id != $diffmergeid} {
+ if {![info exists diffmergeid] || $id != $diffmergeid
+ || $mdf != $mdifffd($id)} {
return
}
$ctext conf -state normal
return
}
$ctext conf -state normal
set treediffs($ids) $treediff
unset treepending
if {$ids != $diffids} {
set treediffs($ids) $treediff
unset treepending
if {$ids != $diffids} {
- gettreediffs $diffids
- } else {
- if {[info exists diffmergeid]} {
- contmergediff $ids
- } else {
- addtocflist $ids
+ if {![info exists diffmergeid]} {
+ gettreediffs $diffids
+ } else {
+ addtocflist $ids