Fossil SCM
Merge enhancements to file labels in Tk diff frontend
Commit
f7c0657bbd238ea523ba52a0ef95c3365fc4312779f65dfbc6669b359e1beaf8
Parent
ec6cb37a6aae635…
1 file changed
+16
-2
+16
-2
| --- src/diff.tcl | ||
| +++ src/diff.tcl | ||
| @@ -73,22 +73,36 @@ | ||
| 73 | 73 | set ii 0 |
| 74 | 74 | set nDiffs 0 |
| 75 | 75 | set n1 0 |
| 76 | 76 | set n2 0 |
| 77 | 77 | array set widths {txt 3 ln 3 mkr 1} |
| 78 | + | |
| 79 | + | |
| 80 | + set fromIndex [lsearch -glob $fossilcmd *-from] | |
| 81 | + set toIndex [lsearch -glob $fossilcmd *-to] | |
| 82 | + set branchIndex [lsearch -glob $fossilcmd *-branch] | |
| 83 | + set checkinIndex [lsearch -glob $fossilcmd *-checkin] | |
| 84 | + set fA {base check-in} | |
| 85 | + set fB {current check-out} | |
| 86 | + if {$fromIndex > -1} {set fA [lindex $fossilcmd $fromIndex+1]} | |
| 87 | + if {$toIndex > -1} {set fB [lindex $fossilcmd $toIndex+1]} | |
| 88 | + if {$branchIndex > -1} {set fA "branch point"; set fB "leaf of branch '[lindex $fossilcmd $branchIndex+1]'"} | |
| 89 | + if {$checkinIndex > -1} {set fA "primary parent"; set fB [lindex $fossilcmd $checkinIndex+1]} | |
| 90 | + | |
| 91 | + | |
| 78 | 92 | while {[set line [getLine $difftxt $N ii]] != -1} { |
| 79 | 93 | switch -- [lindex $line 0] { |
| 80 | 94 | FILE { |
| 81 | 95 | incr nDiffs |
| 82 | 96 | foreach wx [list [string length $n1] [string length $n2]] { |
| 83 | 97 | if {$wx>$widths(ln)} {set widths(ln) $wx} |
| 84 | 98 | } |
| 85 | 99 | .lnA insert end \n fn \n - |
| 86 | - .txtA insert end [lindex $line 1]\n fn \n - | |
| 100 | + .txtA insert end "[lindex $line 1] ($fA)\n" fn \n - | |
| 87 | 101 | .mkr insert end \n fn \n - |
| 88 | 102 | .lnB insert end \n fn \n - |
| 89 | - .txtB insert end [lindex $line 2]\n fn \n - | |
| 103 | + .txtB insert end "[lindex $line 2] ($fB)\n" fn \n - | |
| 90 | 104 | .wfiles.lb insert end [lindex $line 2] |
| 91 | 105 | set n1 0 |
| 92 | 106 | set n2 0 |
| 93 | 107 | } |
| 94 | 108 | SKIP { |
| 95 | 109 |
| --- src/diff.tcl | |
| +++ src/diff.tcl | |
| @@ -73,22 +73,36 @@ | |
| 73 | set ii 0 |
| 74 | set nDiffs 0 |
| 75 | set n1 0 |
| 76 | set n2 0 |
| 77 | array set widths {txt 3 ln 3 mkr 1} |
| 78 | while {[set line [getLine $difftxt $N ii]] != -1} { |
| 79 | switch -- [lindex $line 0] { |
| 80 | FILE { |
| 81 | incr nDiffs |
| 82 | foreach wx [list [string length $n1] [string length $n2]] { |
| 83 | if {$wx>$widths(ln)} {set widths(ln) $wx} |
| 84 | } |
| 85 | .lnA insert end \n fn \n - |
| 86 | .txtA insert end [lindex $line 1]\n fn \n - |
| 87 | .mkr insert end \n fn \n - |
| 88 | .lnB insert end \n fn \n - |
| 89 | .txtB insert end [lindex $line 2]\n fn \n - |
| 90 | .wfiles.lb insert end [lindex $line 2] |
| 91 | set n1 0 |
| 92 | set n2 0 |
| 93 | } |
| 94 | SKIP { |
| 95 |
| --- src/diff.tcl | |
| +++ src/diff.tcl | |
| @@ -73,22 +73,36 @@ | |
| 73 | set ii 0 |
| 74 | set nDiffs 0 |
| 75 | set n1 0 |
| 76 | set n2 0 |
| 77 | array set widths {txt 3 ln 3 mkr 1} |
| 78 | |
| 79 | |
| 80 | set fromIndex [lsearch -glob $fossilcmd *-from] |
| 81 | set toIndex [lsearch -glob $fossilcmd *-to] |
| 82 | set branchIndex [lsearch -glob $fossilcmd *-branch] |
| 83 | set checkinIndex [lsearch -glob $fossilcmd *-checkin] |
| 84 | set fA {base check-in} |
| 85 | set fB {current check-out} |
| 86 | if {$fromIndex > -1} {set fA [lindex $fossilcmd $fromIndex+1]} |
| 87 | if {$toIndex > -1} {set fB [lindex $fossilcmd $toIndex+1]} |
| 88 | if {$branchIndex > -1} {set fA "branch point"; set fB "leaf of branch '[lindex $fossilcmd $branchIndex+1]'"} |
| 89 | if {$checkinIndex > -1} {set fA "primary parent"; set fB [lindex $fossilcmd $checkinIndex+1]} |
| 90 | |
| 91 | |
| 92 | while {[set line [getLine $difftxt $N ii]] != -1} { |
| 93 | switch -- [lindex $line 0] { |
| 94 | FILE { |
| 95 | incr nDiffs |
| 96 | foreach wx [list [string length $n1] [string length $n2]] { |
| 97 | if {$wx>$widths(ln)} {set widths(ln) $wx} |
| 98 | } |
| 99 | .lnA insert end \n fn \n - |
| 100 | .txtA insert end "[lindex $line 1] ($fA)\n" fn \n - |
| 101 | .mkr insert end \n fn \n - |
| 102 | .lnB insert end \n fn \n - |
| 103 | .txtB insert end "[lindex $line 2] ($fB)\n" fn \n - |
| 104 | .wfiles.lb insert end [lindex $line 2] |
| 105 | set n1 0 |
| 106 | set n2 0 |
| 107 | } |
| 108 | SKIP { |
| 109 |