1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
|
set leftLine 1
set rightLine 1
set leftLines {}
set rightLines {}
set state none
set fname ""
foreach line [split $data \n] {
# Detect a new file
if {[string match ======* $line] || [string match "diff *" $line]} {
if {$state != "none"} {
displayOnePatch $top $leftLines $rightLines $leftLine $rightLine
}
set leftLines {}
set rightLines {}
set state none
continue
# Detect a file name
if {[string match "Index: *" $line]} {
# If fname is set, a file that had no contents has passed.
# It could be a binary file or some other that the diffing source
# could not handle.
# Display the name to see that it is involved.
if {$fname ne ""} {
foreach side {1 2} {
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
}
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 {}
|
|
>
>
>
>
|
>
>
>
>
>
>
>
>
>
>
<
|
<
|
<
<
<
|
>
>
|
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
|
set leftLine 1
set rightLine 1
set leftLines {}
set rightLines {}
set state none
set fname ""
foreach line [split $data \n] {
# Detect a new file or file name
# "diff *" handles at least GIT and HG output
# "Index:" and "=====*" handles at least FOSSIL and SVN output
set newFile 0
set newName ""
if {[string match ======* $line]} {
set newFile 1
} elseif {[string match "diff *" $line]} {
set newFile 1
# Extract the last non-space. Works reasonably well.
regexp {\S+\s*$} $line newName
} elseif {[string match "Index: *" $line]} {
set newName [string range $line 7 end]
}
if {$newFile} {
if {$state != "none"} {
displayOnePatch $top $leftLines $rightLines $leftLine $rightLine
}
set leftLines {}
set rightLines {}
set state none
}
if {$newName ne ""} {
# If fname is set, a file that had no contents has passed.
# It could be a binary file or some other that the diffing source
# could not handle.
# Display the name to see that it is involved.
if {$fname ne ""} {
foreach side {1 2} {
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
}
set fname $newName
}
if {$newFile || $newName ne ""} {
continue
}
# 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 {}
|
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)]
|
<
<
<
<
|
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
|
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
}
}
#####################################
# Main diff
#####################################
# Prepare for a diff by creating needed temporary files
|