97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
|
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
|
-
+
|
set ::diff($top,rightOK) 1
set ::diff($top,leftLabel) $rev
set ::diff($top,leftOK) 0
set ::Pref(toolbar) 1
}
# Get a CVS revision
proc GetCvsRev {filename outfile {rev {}}} {
proc eskil::rev::CVS::get {filename outfile {rev {}}} {
set old ""
set dir [file dirname $filename]
if {$dir != "."} {
set old [pwd]
set outfile [file join [pwd] $outfile]
cd $dir
set filename [file tail $filename]
|
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
|
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
|
-
+
-
+
|
lappend revs $::diff($top,doptrev2)
}
if {$type eq "CT"} {
set revs2 {}
set revlabels {}
foreach rev $revs {
set rev [ParseCtRevs $::diff($top,RevFile) $stream $rev]
set rev [eskil::rev::CT::ParseRevs $::diff($top,RevFile) $stream $rev]
lappend revs2 $rev
lappend revlabels [GetLastTwoPath $rev]
}
set revs $revs2
} elseif {$type eq "CVS"} {
set revs2 {}
set revlabels {}
foreach rev $revs {
set rev [ParseCvsRevs $::diff($top,RevFile) $rev]
set rev [eskil::rev::CVS::ParseRevs $::diff($top,RevFile) $rev]
lappend revs2 $rev
}
set revs $revs2
set revlabels $revs
} else {
set revlabels $revs
}
|
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
|
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
|
-
-
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
-
+
|
set tag "($type [lindex $revlabels 0])"
}
set ::diff($top,leftFile) [tmpFile]
set ::diff($top,leftLabel) "$::diff($top,RevFile) $tag"
set ::diff($top,rightLabel) $::diff($top,RevFile)
set ::diff($top,rightFile) $::diff($top,RevFile)
if {$type eq "CVS"} {
GetCvsRev $::diff($top,RevFile) $::diff($top,leftFile) $r
eskil::rev::${type}::get $::diff($top,RevFile) $::diff($top,leftFile) $r
} elseif {$type eq "RCS"} {
GetRcsRev $::diff($top,RevFile) $::diff($top,leftFile) $r
} else {
GetCtRev $::diff($top,RevFile) $::diff($top,leftFile) $r
}
if {$type eq "CVS" && [llength $revs] == 0} {
$::widgets($top,commit) configure -state normal
}
} else {
# Compare the two specified versions.
disallowEdit $top
set r1 [lindex $revs 0]
set r2 [lindex $revs 1]
set ::diff($top,leftFile) [tmpFile]
set ::diff($top,rightFile) [tmpFile]
set ::diff($top,leftLabel) \
"$::diff($top,RevFile) ($type [lindex $revlabels 0])"
set ::diff($top,rightLabel) \
"$::diff($top,RevFile) ($type [lindex $revlabels 1])"
if {$type eq "CVS"} {
GetCvsRev $::diff($top,RevFile) $::diff($top,leftFile) $r1
GetCvsRev $::diff($top,RevFile) $::diff($top,rightFile) $r2
eskil::rev::${type}::get $::diff($top,RevFile) $::diff($top,leftFile) $r1
eskil::rev::${type}::get $::diff($top,RevFile) $::diff($top,rightFile) $r2
} elseif {$type eq "RCS"} {
GetRcsRev $::diff($top,RevFile) $::diff($top,leftFile) $r1
GetRcsRev $::diff($top,RevFile) $::diff($top,rightFile) $r2
} else {
GetCtRev $::diff($top,RevFile) $::diff($top,leftFile) $r1
GetCtRev $::diff($top,RevFile) $::diff($top,rightFile) $r2
}
}
# Make sure labels are updated before processing starts
update idletasks
}
# Clean up after a RCS/CVS/CT diff.
proc cleanupRev {top} {
global Pref
clearTmp $::diff($top,rightFile) $::diff($top,leftFile)
set ::diff($top,rightFile) $::diff($top,RevFile)
set ::diff($top,leftFile) $::diff($top,RevFile)
}
proc revCommit {top} {
if {[$::widgets($top,commit) cget -state] eq "disabled"} return
CvsCommitFile $top $::diff($top,RevFile)
eskil::rev::CVS::commitFile $top $::diff($top,RevFile)
}
# Check in CVS controlled file
proc CvsCommitFile {top filename} {
proc eskil::rev::CVS::commitFile {top filename} {
set logmsg [LogDialog $top $filename]
if {$logmsg ne ""} {
catch {exec cvs -q commit -m $logmsg $filename}
}
}
# Dialog for log message
|