1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
|
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
|
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
|
}
}
}
# Make sure labels are updated before processing starts
update idletasks
}
# Clean up after a RCS/CVS diff.
# Clean up after a RCS/CVS/CT diff.
proc cleanupRCS {top} {
global diff Pref
#clearTmp ;# FIXA
set diff($top,rightFile) $diff($top,RCSFile)
set diff($top,leftFile) $diff($top,RCSFile)
}
# Prepare for ClearCase diff. Checkout copies of the versions needed.
proc prepareClearCase {top} {
global diff Pref
# Compare local file with latest version.
set diff($top,leftFile) [tmpFile]
set diff($top,rightLabel) $diff($top,RCSFile)
set diff($top,rightFile) $diff($top,RCSFile)
set diff($top,leftLabel) "$diff($top,RCSFile) (CT)"
if {[catch {exec cleartool pwv -s} view] || $view == "** NONE **"} {
puts "MIFFFO"
return
}
catch {exec cleartool get -to $diff($top,leftFile) [file nativename $diff($top,RCSFile)@@/main/$view/LATEST]}
}
# Prepare for a diff by creating needed temporary files
proc prepareFiles {top} {
if {$::diff($top,mode) == "RCS" || $::diff($top,mode) == "CVS"} {
prepareRCS $top
} elseif {$::diff($top,mode) == "CT"} {
prepareClearCase $top
} elseif {[string match "conflict*" $::diff($top,mode)]} {
prepareConflict $top
}
}
# Clean up after a diff
proc cleanupFiles {top} {
if {$::diff($top,mode) == "RCS" || $::diff($top,mode) == "CVS"} {
if {$::diff($top,mode) == "RCS" || $::diff($top,mode) == "CVS" || \
$::diff($top,mode) == "CT"} {
cleanupRCS $top
} elseif {[string match "conflict*" $::diff($top,mode)]} {
cleanupConflict $top
}
}
# Main diff function.
|
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
|
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
|
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
|
set diff($top,conflictFile) $fullname
set diff($top,rightDir) $fulldir
set diff($top,rightOK) 1
set diff($top,rightLabel) $fullname
set diff($top,leftLabel) $fullname
after idle [list doDiff $top]
return
}
} elseif {!$autobrowse && \
[llength [glob -nocomplain [file join $fulldir RCS]]]} {
set diff($top,mode) "RCS"
set diff($top,rightDir) $fulldir
set diff($top,RCSFile) $fullname
set diff($top,rightLabel) $fullname
set diff($top,rightFile) $fullname
set diff($top,rightOK) 1
set diff($top,leftLabel) "RCS"
if {$noautodiff} {
enableRedo $top
} else {
after idle [list doDiff $top]
}
} elseif {!$autobrowse && \
[llength [glob -nocomplain [file join $fulldir CVS]]]} {
set diff($top,mode) "CVS"
set diff($top,rightDir) $fulldir
set diff($top,RCSFile) $fullname
set diff($top,rightLabel) $fullname
set diff($top,rightFile) $fullname
set diff($top,rightOK) 1
set diff($top,leftLabel) "CVS"
if {$noautodiff} {
enableRedo $top
} else {
after idle [list doDiff $top]
}
} else {
set diff($top,leftDir) $fulldir
set diff($top,leftFile) $fullname
set diff($top,leftLabel) $fullname
set diff($top,leftOK) 1
if {[regexp {\.(diff|patch)$} $fullname]} {
set diff($top,mode) "patch"
set diff($top,patchFile) $fullname
set autobrowse 0
if {$noautodiff} {
enableRedo $top
} else {
after idle [list doDiff $top]
}
if {!$autobrowse} {
# Check for revision control
# RCS
if {[llength [glob -nocomplain [file join $fulldir RCS]]]} {
set diff($top,mode) "RCS"
set diff($top,rightDir) $fulldir
set diff($top,RCSFile) $fullname
set diff($top,rightLabel) $fullname
set diff($top,rightFile) $fullname
set diff($top,rightOK) 1
set diff($top,leftLabel) "RCS"
if {$noautodiff} {
enableRedo $top
} else {
after idle [list doDiff $top]
}
return
}
# CVS
if {[llength [glob -nocomplain [file join $fulldir CVS]]]} {
set diff($top,mode) "CVS"
set diff($top,rightDir) $fulldir
set diff($top,RCSFile) $fullname
set diff($top,rightLabel) $fullname
set diff($top,rightFile) $fullname
set diff($top,rightOK) 1
set diff($top,leftLabel) "CVS"
if {$noautodiff} {
enableRedo $top
} else {
after idle [list doDiff $top]
}
return
}
# ClearCase
if {[auto_execok cleartool] != ""} {
if {![catch {exec cleartool pwv -s} view] && \
$view != "** NONE **"} {
set diff($top,mode) "CT"
set diff($top,rightDir) $fulldir
set diff($top,RCSFile) $fullname
set diff($top,rightLabel) $fullname
set diff($top,rightFile) $fullname
set diff($top,rightOK) 1
set diff($top,leftLabel) "CT"
if {$noautodiff} {
enableRedo $top
} else {
after idle [list doDiff $top]
}
return
}
}
}
# No revision control. Is it a patch file?
set diff($top,leftDir) $fulldir
set diff($top,leftFile) $fullname
set diff($top,leftLabel) $fullname
set diff($top,leftOK) 1
if {[regexp {\.(diff|patch)$} $fullname]} {
set diff($top,mode) "patch"
set diff($top,patchFile) $fullname
set autobrowse 0
if {$noautodiff} {
enableRedo $top
} else {
after idle [list doDiff $top]
}
}
return
}
} elseif {$len >= 2} {
set fullname [file join [pwd] [lindex $files 0]]
set fulldir [file dirname $fullname]
set diff($top,leftDir) $fulldir
set diff($top,leftFile) $fullname
set diff($top,leftLabel) $fullname
|