Fossil SCM
Avoid putting extraneous text after the filenames in column labels for xdiff and fdiff.
Commit
0743cfc2e71c80a132d256f28946bd68f2ce1ae1dd2531257b6993678450e1c7
Parent
e54a4b5fa96df33…
1 file changed
+4
-1
+4
-1
| --- src/diff.tcl | ||
| +++ src/diff.tcl | ||
| @@ -110,11 +110,14 @@ | ||
| 110 | 110 | |
| 111 | 111 | set fromIndex [lsearch -glob $fossilcmd *-from] |
| 112 | 112 | set toIndex [lsearch -glob $fossilcmd *-to] |
| 113 | 113 | set branchIndex [lsearch -glob $fossilcmd *-branch] |
| 114 | 114 | set checkinIndex [lsearch -glob $fossilcmd *-checkin] |
| 115 | - if {[lsearch -glob $fossilcmd *-label]>=0} { | |
| 115 | + if {[lsearch -glob $fossilcmd *-label]>=0 | |
| 116 | + || [lindex $fossilcmd 2]=="xdiff" | |
| 117 | + || [lindex $fossilcmd 2]=="fdiff" | |
| 118 | + } { | |
| 116 | 119 | set fA {} |
| 117 | 120 | set fB {} |
| 118 | 121 | } else { |
| 119 | 122 | if {[string match *?--external-baseline* $fossilcmd]} { |
| 120 | 123 | set fA {external baseline} |
| 121 | 124 |
| --- src/diff.tcl | |
| +++ src/diff.tcl | |
| @@ -110,11 +110,14 @@ | |
| 110 | |
| 111 | set fromIndex [lsearch -glob $fossilcmd *-from] |
| 112 | set toIndex [lsearch -glob $fossilcmd *-to] |
| 113 | set branchIndex [lsearch -glob $fossilcmd *-branch] |
| 114 | set checkinIndex [lsearch -glob $fossilcmd *-checkin] |
| 115 | if {[lsearch -glob $fossilcmd *-label]>=0} { |
| 116 | set fA {} |
| 117 | set fB {} |
| 118 | } else { |
| 119 | if {[string match *?--external-baseline* $fossilcmd]} { |
| 120 | set fA {external baseline} |
| 121 |
| --- src/diff.tcl | |
| +++ src/diff.tcl | |
| @@ -110,11 +110,14 @@ | |
| 110 | |
| 111 | set fromIndex [lsearch -glob $fossilcmd *-from] |
| 112 | set toIndex [lsearch -glob $fossilcmd *-to] |
| 113 | set branchIndex [lsearch -glob $fossilcmd *-branch] |
| 114 | set checkinIndex [lsearch -glob $fossilcmd *-checkin] |
| 115 | if {[lsearch -glob $fossilcmd *-label]>=0 |
| 116 | || [lindex $fossilcmd 2]=="xdiff" |
| 117 | || [lindex $fossilcmd 2]=="fdiff" |
| 118 | } { |
| 119 | set fA {} |
| 120 | set fB {} |
| 121 | } else { |
| 122 | if {[string match *?--external-baseline* $fossilcmd]} { |
| 123 | set fA {external baseline} |
| 124 |