47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
# 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.4+ 2004-08-20"
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]
|
|
|
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
# 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-08-20"
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]
|
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
|
label $top.lo -text "Diff Options"
addBalloon $top.lo "Options passed to the external diff.\nNote\
that options for ignoring whitespace are available in\
the Options menu."
entry $top.eo -width 6 -textvariable diff($top,dopt)
label $top.lr1 -text "Rev 1"
addBalloon $top.lr1 "Revision number for CVS/RCS/ClearCase diff."
entry $top.er1 -width 8 -textvariable diff($top,doptrev1)
label $top.lr2 -text "Rev 2"
addBalloon $top.lr2 "Revision number for CVS/RCS/ClearCase diff."
entry $top.er2 -width 8 -textvariable diff($top,doptrev2)
button $top.bfp -text "Prev Diff" -relief raised \
-command [list findDiff $top -1] \
-underline 0 -padx 15
button $top.bfn -text "Next Diff" -relief raised \
-command [list findDiff $top 1] \
-underline 0 -padx 15
bind $top <Alt-n> [list findDiff $top 1]
|
|
>
|
>
|
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
|
label $top.lo -text "Diff Options"
addBalloon $top.lo "Options passed to the external diff.\nNote\
that options for ignoring whitespace are available in\
the Options menu."
entry $top.eo -width 6 -textvariable diff($top,dopt)
label $top.lr1 -text "Rev 1"
addBalloon $top.lr1 "Revision number for CVS/RCS/ClearCase diff."
entry $top.er1 -width 12 -textvariable diff($top,doptrev1)
set ::widgets($top,rev1) $top.er1
label $top.lr2 -text "Rev 2"
addBalloon $top.lr2 "Revision number for CVS/RCS/ClearCase diff."
entry $top.er2 -width 12 -textvariable diff($top,doptrev2)
set ::widgets($top,rev2) $top.er2
button $top.bfp -text "Prev Diff" -relief raised \
-command [list findDiff $top -1] \
-underline 0 -padx 15
button $top.bfn -text "Next Diff" -relief raised \
-command [list findDiff $top 1] \
-underline 0 -padx 15
bind $top <Alt-n> [list findDiff $top 1]
|
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
|
makeDiffWin
update
set top [lindex $::diff(diffWindows) end]
# Copy the previously collected options
foreach {item val} [array get opts] {
set ::diff($top,$item) $val
}
if {$len == 1} {
set fullname [file join [pwd] [lindex $files 0]]
set fulldir [file dirname $fullname]
if {$::diff($top,mode) eq "conflict"} {
startConflictDiff $top $fullname
after idle [list doDiff $top]
|
>
>
>
>
|
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
|
makeDiffWin
update
set top [lindex $::diff(diffWindows) end]
# Copy the previously collected options
foreach {item val} [array get opts] {
set ::diff($top,$item) $val
}
# It is preferable to see the end if the rev string is too long
$::widgets($top,rev1) xview end
$::widgets($top,rev2) xview end
if {$len == 1} {
set fullname [file join [pwd] [lindex $files 0]]
set fulldir [file dirname $fullname]
if {$::diff($top,mode) eq "conflict"} {
startConflictDiff $top $fullname
after idle [list doDiff $top]
|