914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
|
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
|
+
-
+
|
set leftLine 1
set rightLine 1
set leftLines {}
set rightLines {}
set state none
foreach line [split $data \n] {
# Detect a new file
if {[string match ======* $line]} {
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
|
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
|
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
|
-
+
|
set state newfile
set style c
set leftRE {^\*\*\*\s+(.*)$}
set rightRE {^---\s+(.*)$}
}
}
# Detect the first line in a -u style diff
if {[regexp {^--- } $line]} {
if {[regexp {^--- } $line] && $state eq "none"} {
if {$state eq "right" || $state eq "both"} {
displayOnePatch $top $leftLines $rightLines $leftLine $rightLine
set leftLines {}
set rightLines {}
set state none
}
if {$state eq "none"} {
|