| ︙ | | | ︙ | |
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
#-----------------------------------------------
# $Revision$
#-----------------------------------------------
# the next line restarts using wish \
exec wish "$0" "$@"
set debug 1
set diffver "Version 1.9.4b 2002-04-12"
set tmpcnt 0
set tmpfiles {}
set thisscript [file join [pwd] [info script]]
set thisdir [file dirname $thisscript]
set ::diff(cvsExists) [expr {![string equal [auto_execok cvs] ""]}]
set ::diff(diffexe) diff
|
|
|
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
#-----------------------------------------------
# $Revision$
#-----------------------------------------------
# the next line restarts using wish \
exec wish "$0" "$@"
set debug 1
set diffver "Version 1.9.4b 2002-04-24"
set tmpcnt 0
set tmpfiles {}
set thisscript [file join [pwd] [info script]]
set thisdir [file dirname $thisscript]
set ::diff(cvsExists) [expr {![string equal [auto_execok cvs] ""]}]
set ::diff(diffexe) diff
|
| ︙ | | | ︙ | |
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
|
while {$t1 < $size1 || $t2 < $size2} {
if {$t1 < $size1} {
set r $result($t1)
if {$r < $t2 || $t2 >= $size2} {
lappend apa $dsym
incr t1
} elseif {$r == $t2} {
lappend apa "c"
incr t1
incr t2
} else {
lappend apa $asym
incr t2
}
} else {
|
>
>
>
>
>
>
>
>
>
>
|
>
|
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
|
while {$t1 < $size1 || $t2 < $size2} {
if {$t1 < $size1} {
set r $result($t1)
if {$r < $t2 || $t2 >= $size2} {
lappend apa $dsym
incr t1
} elseif {$r == $t2} {
#if {[string match Wm* [lindex $block2 $t2]]} {
# puts "Left : [lindex $block1 $t1]"
# puts "Right: [lindex $block2 $t2]"
# puts "Score: $scores($t1,$t2)"
#}
# If the score is too bad, don't do line parsing.
if {$scores($t1,$t2) < 0} {
lappend apa "C"
} else {
lappend apa "c"
}
incr t1
incr t2
} else {
lappend apa $asym
incr t2
}
} else {
|
| ︙ | | | ︙ | |
675
676
677
678
679
680
681
682
683
684
685
686
687
688
|
foreach c $apa {
if {$c == "c"} {
set textline1 [lindex $block1 $t1]
set textline2 [lindex $block2 $t2]
insertMatchingLines $textline1 $textline2
incr t1
incr t2
}
if {$c == "d"} {
set bepa [lindex $block1 $t1]
.ft1.tl insert end [myforml $doingLine1] \
"hl$::HighLightCount change"
.ft1.tt insert end "$bepa\n" new1
emptyline 2
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
|
foreach c $apa {
if {$c == "c"} {
set textline1 [lindex $block1 $t1]
set textline2 [lindex $block2 $t2]
insertMatchingLines $textline1 $textline2
incr t1
incr t2
}
if {$c == "C"} {
set textline1 [lindex $block1 $t1]
set textline2 [lindex $block2 $t2]
.ft1.tl insert end [myforml $doingLine1] \
"hl$::HighLightCount change"
.ft1.tt insert end "$textline1\n" new1
.ft2.tl insert end [myforml $doingLine2] \
"hl$::HighLightCount change"
.ft2.tt insert end "$textline2\n" new2
incr doingLine1
incr doingLine2
incr t1
incr t2
}
if {$c == "d"} {
set bepa [lindex $block1 $t1]
.ft1.tl insert end [myforml $doingLine1] \
"hl$::HighLightCount change"
.ft1.tt insert end "$bepa\n" new1
emptyline 2
|
| ︙ | | | ︙ | |
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
|
menu .md.m
if {$tcl_platform(platform) == "windows"} {
.md.m add checkbutton -label Console -variable consolestate \
-onvalue show -offvalue hide \
-command {console $consolestate}
.md.m add separator
}
.md.m add checkbutton -label Wrap -variable wrapstate -onvalue char\
-offvalue none -command {.ft1.tt configure -wrap $wrapstate ;\
.ft2.tt configure -wrap $wrapstate}
.md.m add command -label "Merge" -command {makeMergeWin}
.md.m add command -label "Stack trace" -command {bgerror Debug}
.md.m add separator
.md.m add command -label "Reread Source" -command {source $thisscript}
|
>
>
>
>
>
|
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
|
menu .md.m
if {$tcl_platform(platform) == "windows"} {
.md.m add checkbutton -label Console -variable consolestate \
-onvalue show -offvalue hide \
-command {console $consolestate}
.md.m add separator
}
.md.m add radiobutton -label "Context 2" -variable ::Pref(context) -value 2
.md.m add radiobutton -label "Context 5" -variable ::Pref(context) -value 5
.md.m add radiobutton -label "Context 10" -variable ::Pref(context) -value 10
.md.m add radiobutton -label "Context 20" -variable ::Pref(context) -value 20
.md.m add separator
.md.m add checkbutton -label Wrap -variable wrapstate -onvalue char\
-offvalue none -command {.ft1.tt configure -wrap $wrapstate ;\
.ft2.tt configure -wrap $wrapstate}
.md.m add command -label "Merge" -command {makeMergeWin}
.md.m add command -label "Stack trace" -command {bgerror Debug}
.md.m add separator
.md.m add command -label "Reread Source" -command {source $thisscript}
|
| ︙ | | | ︙ | |