987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
|
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
continue
}
# A new section in a -u style diff
if {[regexp {^@@\s+-(\d+),\d+\s+\+(\d+),} $line -> sub1 sub2]} {
if {$state eq "both"} {
displayOnePatch $top $leftLines $rightLines \
$leftLine $rightLine
}
# Look for c function annotation in -u style
if {[regexp {^@@.*@@(.*)$} $line -> cfun]} {
set cfun [string trim $cfun]
if {$cfun ne ""} {
insertLine $top 1 "" $cfun patch
insertLine $top 2 "" $cfun patch
}
}
set state both
set leftLine $sub1
set rightLine $sub2
set leftLines {}
set rightLines {}
continue
}
# A new section in a -c style diff
if {[regexp {^\*\*\*\*\*} $line]} {
if {$state eq "right"} {
displayOnePatch $top $leftLines $rightLines $leftLine $rightLine
}
# Look for c function annotation in -c style
if {[regexp {^\*\*\*\*\*\S*\s+(.*)$} $line -> cfun]} {
set cfun [string trim $cfun]
if {$cfun ne ""} {
insertLine $top 1 "" $cfun patch
insertLine $top 2 "" $cfun patch
}
}
set leftLines {}
set rightLines {}
set state left
continue
}
# We are in the left part of a -c style diff
|