1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
|
# Restore view
foreach item {wLine1 wDiff1 wLine2 wDiff2} {
set w $::widgets($top,$item)
seeText $w $first.0 $last.0
}
}
# Main diff function.
proc doDiff {top} {
global Pref
global doingLine1 doingLine2
if {$::diff($top,mode) eq "" && ($::diff($top,leftOK) == 0 || $::diff($top,rightOK) == 0)} {
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
|
# Restore view
foreach item {wLine1 wDiff1 wLine2 wDiff2} {
set w $::widgets($top,$item)
seeText $w $first.0 $last.0
}
}
# Make an appropriate tail for a window title, depending on mode and files.
proc TitleTail {top} {
set tail1 [file tail $::diff($top,rightLabel)]
set tail2 [file tail $::diff($top,leftLabel)]
if {$::diff($top,mode) ne "" || $tail1 eq $tail2} {
if {$::diff($top,mode) eq "rev"} {
set tail1 [file tail $::diff($top,RevFile)]
} elseif {$::diff($top,mode) eq "conflict"} {
set tail1 [file tail $::diff($top,conflictFile)]
}
return $tail1
} else {
return "$tail2 vs $tail1"
}
}
# Main diff function.
proc doDiff {top} {
global Pref
global doingLine1 doingLine2
if {$::diff($top,mode) eq "" && ($::diff($top,leftOK) == 0 || $::diff($top,rightOK) == 0)} {
|
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
|
$::widgets($top,wLine2) see 1.0
normalCursor $top
return
} else {
prepareFiles $top
}
set tail1 [file tail $::diff($top,rightLabel)]
set tail2 [file tail $::diff($top,leftLabel)]
if {$::diff($top,mode) ne "" || $tail1 eq $tail2} {
if {$::diff($top,mode) eq "rev"} {
set tail1 [file tail $::diff($top,RevFile)]
} elseif {$::diff($top,mode) eq "conflict"} {
set tail1 [file tail $::diff($top,conflictFile)]
}
wm title $top "Eskil: $tail1"
} else {
wm title $top "Eskil: $tail2 vs $tail1"
}
# Run diff and parse the result.
set opts $Pref(ignore)
if {$Pref(nocase)} {lappend opts -nocase}
if {$Pref(noempty)} {lappend opts -noempty}
if {[info exists ::diff($top,aligns)] && \
[llength $::diff($top,aligns)] > 0} {
|
<
<
<
<
<
<
<
<
|
<
<
<
|
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
|
$::widgets($top,wLine2) see 1.0
normalCursor $top
return
} else {
prepareFiles $top
}
wm title $top "Eskil: [TitleTail $top]"
# Run diff and parse the result.
set opts $Pref(ignore)
if {$Pref(nocase)} {lappend opts -nocase}
if {$Pref(noempty)} {lappend opts -noempty}
if {[info exists ::diff($top,aligns)] && \
[llength $::diff($top,aligns)] > 0} {
|