︙ | | |
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
|
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
set i [lsearch -glob $allrevs "*$rev" ]
if {$i >= 0} {
set rev [lindex [split [lindex $allrevs $i] "@"] end]
}
}
set rev [file normalize [file join $stream $rev]]
# If we don't have a version number, try to find the latest
if {![string is integer [file tail $rev]]} {
if {![info exists allrevs]} {
if {[catch {exec cleartool lshistory -short $filename} allrevs]} {
tk_messageBox -icon error -title "Cleartool error" \
-message $allrevs
return
}
set allrevs [split $allrevs \n]
}
set apa [lsearch -regexp -all -inline $allrevs "$rev/\\d+\$"]
set apa [lindex [lsort -dictionary $apa] end]
if {$apa ne ""} {
set rev [lindex [split $apa "@"] end]
}
}
return $rev
}
# Get the last two elements in a file path
proc GetLastTwoPath {path} {
set last [file tail $path]
set penultimate [file tail [file dirname $path]]
|
︙ | | |
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
|
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
|
-
-
+
+
-
-
+
+
|
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 diff."
entry $top.er1 -width 6 -textvariable diff($top,doptrev1)
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 diff."
entry $top.er2 -width 6 -textvariable diff($top,doptrev2)
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]
|
︙ | | |
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
|
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
|
-
+
|
set tail1 [file tail $dirdiff(leftDir)]
set tail2 [file tail $dirdiff(rightDir)]
if {$tail1 eq $tail2} {
wm title .dirdiff "Eskil Dir: $tail1"
} else {
wm title .dirdiff "Eskil Dir: $tail1 vs $tail2"
}
$dirdiff(wLeft) delete 1.0 end
$dirdiff(wRight) delete 1.0 end
set top .dirdiff
busyCursor $top
clearMap $top
update idletasks
compareDirs $dirdiff(leftDir) $dirdiff(rightDir)
|
︙ | | |
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
|
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
|
-
+
|
set w [helpWin .ab "About Eskil"]
text $w.t -width 45 -height 11 -wrap none -relief flat \
-bg [$w cget -bg]
pack $w.t -side top -expand y -fill both
$w.t insert end "A Tcl/Tk frontend to diff\n\n"
$w.t insert end "A graphical frontend to diff\n\n"
$w.t insert end "$diffver\n\n"
$w.t insert end "Made by Peter Spjuth\n"
$w.t insert end "E-Mail: peter.spjuth@space.se\n"
$w.t insert end "\nURL: http://spjuth.pointclark.net/Eskil.html\n"
$w.t insert end "\nTcl version: [info patchlevel]\n"
set du [package provide DiffUtil]
|
︙ | | |
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
|
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
|
+
|
set dodir 1
} elseif {$arg eq "-clip"} {
set doclip 1
} elseif {$arg eq "-browse"} {
set autobrowse 1
} elseif {$arg eq "-conflict"} {
set opts(mode) "conflict"
set opts(modetype) ""
set Pref(ignore) " "
set Pref(nocase) 0
} elseif {$arg eq "-print"} {
set nextArg printFile
} elseif {$arg eq "-server"} {
if {$::tcl_platform(platform) eq "windows"} {
catch {
|
︙ | | |
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
|
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
|
-
+
-
+
|
set Pref(editor) ""
# Directory diff options
set Pref(comparelevel) 1
set Pref(recursive) 0
set Pref(dir,onlydiffs) 0
set Pref(nodir) 0
set Pref(autocompare) 1
# Backward compatibilty option
set Pref(onlydiffs) -1
set ::diff(filter) ""
if {![info exists ::eskil_testsuite] && [file exists "~/.eskilrc"]} {
safeLoad "~/.eskilrc" Pref
}
if {$Pref(editor) ne ""} {
|
︙ | | |