︙ | | | ︙ | |
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
# Add a dummy if it does not exist.
proc addBalloon {args} {}
} else {
namespace import -force psballoon::addBalloon
}
set debug 0
set diffver "Version 2.0.5+ 2004-09-06"
set thisScript [file join [pwd] [info script]]
set thisDir [file dirname $thisScript]
# Follow any link
set tmplink $thisScript
while {[file type $tmplink] eq "link"} {
set tmplink [file readlink $tmplink]
|
|
|
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
# Add a dummy if it does not exist.
proc addBalloon {args} {}
} else {
namespace import -force psballoon::addBalloon
}
set debug 0
set diffver "Version 2.0.5+ 2004-10-19"
set thisScript [file join [pwd] [info script]]
set thisDir [file dirname $thisScript]
# Follow any link
set tmplink $thisScript
while {[file type $tmplink] eq "link"} {
set tmplink [file readlink $tmplink]
|
︙ | | | ︙ | |
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
|
return
}
}
# Figure out ClearCase revision from arguments
proc ParseCtRevs {filename stream rev} {
# If the argument is of the form "name/rev", look for a fitting one
if {[regexp {^[^/.]+(/\d+)?$} $rev]} {
if {[catch {exec cleartool lshistory -short $filename} allrevs]} {
tk_messageBox -icon error -title "Cleartool error" \
-message $allrevs
return
}
set allrevs [split $allrevs \n]
|
|
|
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
|
return
}
}
# Figure out ClearCase revision from arguments
proc ParseCtRevs {filename stream rev} {
# If the argument is of the form "name/rev", look for a fitting one
if {![string is digit $rev] && [regexp {^[^/.]+(/\d+)?$} $rev]} {
if {[catch {exec cleartool lshistory -short $filename} allrevs]} {
tk_messageBox -icon error -title "Cleartool error" \
-message $allrevs
return
}
set allrevs [split $allrevs \n]
|
︙ | | | ︙ | |
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
|
} 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 {[info exists ::diff($top,aligns)] && \
[llength $::diff($top,aligns)] > 0} {
lappend opts -align $::diff($top,aligns)
}
set range {}
if {[info exists ::diff($top,range)] && \
[llength $::diff($top,range)] == 4} {
|
>
|
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
|
} 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(nodigit)} {lappend opts -nodigit}
if {[info exists ::diff($top,aligns)] && \
[llength $::diff($top,aligns)] > 0} {
lappend opts -align $::diff($top,aligns)
}
set range {}
if {[info exists ::diff($top,range)] && \
[llength $::diff($top,range)] == 4} {
|
︙ | | | ︙ | |
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
|
$top.mo.mi add radiobutton -label "Space changes (-b)" \
-variable Pref(ignore) -value "-b"
$top.mo.mi add radiobutton -label "All spaces (-w)" \
-variable Pref(ignore) -value "-w"
$top.mo.mi add separator
$top.mo.mi add checkbutton -label "Case (-i)" \
-variable Pref(nocase)
menu $top.mo.mp
$top.mo.mp add radiobutton -label "Nothing" -variable Pref(parse) -value 0
$top.mo.mp add radiobutton -label "Lines" -variable Pref(parse) -value 1
$top.mo.mp add radiobutton -label "Blocks (small)" -variable Pref(parse) \
-value 2
$top.mo.mp add radiobutton -label "Blocks" -variable Pref(parse) -value 3
|
>
>
|
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
|
$top.mo.mi add radiobutton -label "Space changes (-b)" \
-variable Pref(ignore) -value "-b"
$top.mo.mi add radiobutton -label "All spaces (-w)" \
-variable Pref(ignore) -value "-w"
$top.mo.mi add separator
$top.mo.mi add checkbutton -label "Case (-i)" \
-variable Pref(nocase)
$top.mo.mi add checkbutton -label "Digits" \
-variable Pref(nodigit)
menu $top.mo.mp
$top.mo.mp add radiobutton -label "Nothing" -variable Pref(parse) -value 0
$top.mo.mp add radiobutton -label "Lines" -variable Pref(parse) -value 1
$top.mo.mp add radiobutton -label "Blocks (small)" -variable Pref(parse) \
-value 2
$top.mo.mp add radiobutton -label "Blocks" -variable Pref(parse) -value 3
|
︙ | | | ︙ | |
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
|
set Pref(ignore) "-b"
} elseif {$arg eq "-noignore"} {
set Pref(ignore) " "
} elseif {$arg eq "-i"} {
set Pref(nocase) 1
} elseif {$arg eq "-nocase"} {
set Pref(nocase) 1
} elseif {$arg eq "-noparse"} {
set Pref(parse) 0
} elseif {$arg eq "-line"} {
set Pref(parse) 1
} elseif {$arg eq "-smallblock"} {
set Pref(parse) 2
} elseif {$arg eq "-block"} {
|
>
>
|
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
|
set Pref(ignore) "-b"
} elseif {$arg eq "-noignore"} {
set Pref(ignore) " "
} elseif {$arg eq "-i"} {
set Pref(nocase) 1
} elseif {$arg eq "-nocase"} {
set Pref(nocase) 1
} elseif {$arg eq "-nodigit"} {
set Pref(nodigit) 1
} elseif {$arg eq "-noparse"} {
set Pref(parse) 0
} elseif {$arg eq "-line"} {
set Pref(parse) 1
} elseif {$arg eq "-smallblock"} {
set Pref(parse) 2
} elseif {$arg eq "-block"} {
|
︙ | | | ︙ | |
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
|
proc getOptions {} {
global Pref
set Pref(fontsize) 8
set Pref(fontfamily) Courier
set Pref(ignore) "-b"
set Pref(nocase) 0
set Pref(parse) 2
set Pref(lineparsewords) 0
set Pref(colorchange) red
set Pref(colornew1) darkgreen
set Pref(colornew2) blue
set Pref(bgchange) #ffe0e0
set Pref(bgnew1) #a0ffa0
|
>
|
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
|
proc getOptions {} {
global Pref
set Pref(fontsize) 8
set Pref(fontfamily) Courier
set Pref(ignore) "-b"
set Pref(nocase) 0
set Pref(nodigit) 0
set Pref(parse) 2
set Pref(lineparsewords) 0
set Pref(colorchange) red
set Pref(colornew1) darkgreen
set Pref(colornew2) blue
set Pref(bgchange) #ffe0e0
set Pref(bgnew1) #a0ffa0
|
︙ | | | ︙ | |