481
482
483
484
485
486
487
488
489
490
491
492
493
494
|
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
}
set apa [compareBlocks $block1 $block2]
# Fine grained changes means that each line is considered its own
# chunk. This is used for merging better to avoid the same decision
# for an entire block.
set finegrain [expr {$::Pref(finegrainchunks) && $details}]
if {$finegrain && $::diff($top,ancestorFile) ne ""} {
# Avoid fine grain depending on relation to ancestor
set leftChange 0
set leftChangeOrAdd 0
for {set t $line1} {$t < $line1 + $n1} {incr t} {
if {[info exists ::diff($top,ancestorLeft,$t)]} {
set leftChangeOrAdd 1
if {$::diff($top,ancestorLeft,$t) eq "c"} {
set leftChange 1
break
}
}
}
set rightChange 0
set rightChangeOrAdd 0
for {set t $line2} {$t < $line2 + $n2} {incr t} {
if {[info exists ::diff($top,ancestorRight,$t)]} {
set rightChangeOrAdd 1
if {$::diff($top,ancestorRight,$t) eq "c"} {
set rightChange 1
break
}
}
}
# Avoid fine grain if either side has no changes against ancestor
if {!$leftChangeOrAdd || !$rightChangeOrAdd} {
set finegrain 0
}
# Avoid fine grain if both sides have at most additions
if {!$leftChange && !$rightChange} {
set finegrain 0
}
}
set t1 0
set t2 0
foreach c $apa {
if {$c eq "c"} {
set textline1 [lindex $block1 $t1]
set textline2 [lindex $block2 $t2]
|
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
|
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
|
-
-
-
-
-
-
|
# Get one update when the screen has been filled.
# Show the first diff.
if {$firstview && $::diff($top,mapMax) > 100} {
set firstview 0
showDiff $top 0
update idletasks
}
if {0 && [incr t] >= 10} {
update idletasks
$::widgets($top,wLine2) see end
update idletasks
set t 0
}
|
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
|
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
|
+
+
|
package require Tk
tk appname Eskil
}
} elseif {$arg eq "-o"} {
set nextArg mergeFile
} elseif {$arg eq "-a"} {
set nextArg ancestorFile
# Default is no ignore on three-way merge
set Pref(ignore) " "
} elseif {$arg eq "-fine"} {
set Pref(finegrainchunks) 1
} elseif {$arg eq "-r"} {
set nextArg revision
} elseif {$arg eq "-debug"} {
set ::eskil(debug) 1
} elseif {$arg eq "-svn"} {
|