| ︙ | | |
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
-
+
|
# Stop Tk from meddling with the command line by copying it first.
set ::eskil(argv) $::argv
set ::eskil(argc) $::argc
set ::argv {}
set ::argc 0
set debug 0
set diffver "Version 2.1+ 2007-01-07"
set diffver "Version 2.1+ 2007-02-17"
set ::thisScript [file join [pwd] [info script]]
# Do initalisations for needed packages and globals.
# This is not run until needed to speed up command line error reporting.
proc Init {} {
package require Tk 8.4
catch {package require textSearch}
|
| ︙ | | |
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
-
+
|
source $::thisDir/clip.tcl
source $::thisDir/compare.tcl
source $::thisDir/map.tcl
source $::thisDir/merge.tcl
source $::thisDir/registry.tcl
source $::thisDir/dirdiff.tcl
source $::thisDir/help.tcl
#source $::thisDir/printobj.tcl
source $::thisDir/printobj.tcl
source $::thisDir/print.tcl
source $::thisDir/rev.tcl
set ::util(diffexe) diff
# Diff functionality is in the DiffUtil package.
package require DiffUtil
|
| ︙ | | |
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
+
+
+
+
|
}
wm withdraw .
}
# Debug function to be able to reread the source even when wrapped in a kit.
proc EskilRereadSource {} {
set this $::thisScript
# FIXA: Better detection of starkit?
# There appears to be a variable ::starkit::mode, which is set to
# starkit or starpack
# Are we in a Starkit?
if {[regexp {^(.*eskil)((?:\.[^/]+)?)(/src/.*)$} $this -> \
pre ext post]} {
if {$ext ne ".vfs"} {
# If the unpacked vfs directory is available, read from that
# instead.
|
| ︙ | | |
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
|
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
|
-
+
|
proc FileIsDirectory {file} {
# Skip directories
if {[file isdirectory $file]} {return 1}
# This detects .kit but how to detect starpacks?
if {[file extension $file] eq ".kit"} {
package require vfs::mk4
vfs::mk4::Mount $file $file
vfs::mk4::Mount $file $file -readonly
# Check for contents to ensure it is a kit
if {[llength [glob -nocomplain $file/*]] == 0} {
vfs::unmount $file
}
}
return [file isdirectory $file]
}
|
| ︙ | | |
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
|
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
|
-
+
+
+
|
$top.m.mf add command -label "Open Conflict File..." \
-command [list openConflict $top]
$top.m.mf add command -label "Open Patch File..." \
-command [list openPatch $top]
$top.m.mf add command -label "Revision Diff..." -underline 0 \
-command [list openRev $top]
$top.m.mf add separator
$top.m.mf add command -label "Print..." -underline 0 \
$top.m.mf add command -label "Print Ps..." -underline 0 \
-command [list doPrint $top]
$top.m.mf add command -label "Print Pdf..." \
-command [list doPrint2 $top]
$top.m.mf add separator
$top.m.mf add command -label "Close" -underline 0 \
-command [list cleanupAndExit $top]
$top.m.mf add separator
$top.m.mf add command -label "Quit" -underline 0 \
-command {cleanupAndExit all}
|
| ︙ | | |
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
|
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
|
+
+
+
|
set Pref(regsub) {}
set Pref(toolbar) 0
# Print options
set Pref(grayLevel1) 0.6
set Pref(grayLevel2) 0.8
set Pref(wideLines) 0
set Pref(printHeaderSize) 10
set Pref(printCharsPerLine) 80
set Pref(printPaper) a4
# Directory diff options
set Pref(comparelevel) 1
set Pref(dir,ignorekey) 0
set Pref(recursive) 0
set Pref(dir,onlydiffs) 0
set Pref(nodir) 0
|
| ︙ | | |