1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
|
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
set ::eskil($top,cleanup) {}
if {$::eskil($top,mode) eq "rev"} {
prepareRev $top
lappend ::eskil($top,cleanup) "rev"
} elseif {$::eskil($top,mode) eq "conflict"} {
prepareConflict $top
lappend ::eskil($top,cleanup) "conflict"
}
# Autodetect separator before any plugin processing
if {$::eskil($top,view) eq "table" && $::eskil($top,separator) eq ""} {
set ch1 [open $::eskil($top,leftFile)]
gets $ch1 line1
close $ch1
# Any tab or comma?
if {[regsub -all "\t" $line1 "\t" _] >= 2} {
set ::eskil($top,separator) "\t"
# Make it look like it came from command line
lappend ::eskil(argv) -sep "\t"
} elseif {[regsub -all "," $line1 "," _] >= 2} {
set ::eskil($top,separator) ","
lappend ::eskil(argv) -sep ","
}
}
if {$::eskil($top,plugin) ne "" && \
[dict get $::eskil($top,pluginpinfo) file]} {
preparePlugin $top
set ::eskil($top,cleanup) "plugin $::eskil($top,cleanup)"
}
}
|
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
|
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
|
-
-
-
-
-
-
-
-
-
|
} else {
# First lines are equal, treat them as header
# Consume table header line
gets $ch1 line1
incr doingLine1
gets $ch2 line
incr doingLine2
if {$::eskil($top,separator) eq ""} {
# Autodetect separator
# Any tab?
if {[regsub -all "\t" $line1 "\t" _] >= 2} {
set ::eskil($top,separator) "\t"
} elseif {[regsub -all "," $line1 "," _] >= 2} {
set ::eskil($top,separator) ","
}
}
|