1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
|
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
|
+
|
mapNoChange $top 0
}
# Read a patch file and display it
proc displayPatch {top} {
set ::eskil($top,leftLabel) "Patch $::eskil($top,patchFile): old"
set ::eskil($top,rightLabel) "Patch $::eskil($top,patchFile): new"
set ::eskil($top,patchFilelist) {}
update idletasks
if {$::eskil($top,patchFile) eq ""} {
if {$::eskil($top,patchData) eq ""} {
set data [getFullPatch $top]
} else {
set data $::eskil($top,patchData)
|
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
|
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
|
+
+
+
+
|
insertLine $top $side "" $divider patch
insertLine $top $side "" $fname patch
insertLine $top $side "" $divider patch
}
addChange $top 4 change 0 0 0 0
}
set fname [string range $line 7 end]
# Collect the files seen. Used by revision control for commit.
if {[file isfile $fname]} {
lappend ::eskil($top,patchFilelist) $fname
}
}
# Detect the first line in a -c style diff
if {[regexp {^\*\*\* } $line]} {
if {$state eq "right"} {
displayOnePatch $top $leftLines $rightLines $leftLine $rightLine
set leftLines {}
set rightLines {}
|
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
|
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
|
+
+
+
+
|
emptyLine $top $side
insertLine $top $side "" $divider patch
insertLine $top $side "" $fname patch
insertLine $top $side "" $divider patch
}
addChange $top 4 change 0 0 0 0
}
# Cleanup detected files
set ::eskil($top,patchFilelist) [lsort -dictionary -unique \
$::eskil($top,patchFilelist)]
}
#####################################
# Main diff
#####################################
# Prepare for a diff by creating needed temporary files
|