| ︙ | | |
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
|
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
|
+
-
+
+
+
+
|
global Pref
set ::diff($top,leftLabel) "Patch $::diff($top,patchFile): old"
set ::diff($top,rightLabel) "Patch $::diff($top,patchFile): new"
update idletasks
if {$::diff($top,patchFile) eq ""} {
if {$::diff($top,patchData) eq ""} {
set data [getFullPatch $top]
set data [getFullPatch $top]
} else {
set data $::diff($top,patchData)
}
} elseif {$::diff($top,patchFile) eq "-"} {
set data [read stdin]
} else {
set ch [open $::diff($top,patchFile) r]
set data [read $ch]
close $ch
}
|
| ︙ | | |
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
|
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
global Pref
if {[doOpenLeft $top]} {
set ::diff($top,mode) "patch"
set Pref(ignore) " "
set Pref(nocase) 0
set Pref(noempty) 0
set ::diff($top,patchFile) $::diff($top,leftFile)
set ::diff($top,patchData) ""
doDiff $top
}
}
# Get data from clipboard and display as a patch.
proc doPastePatch {top} {
if {[catch {::tk::GetSelection $top CLIPBOARD} sel]} {
tk_messageBox -icon error -title "Eskil Error" -parent $top \
-message "Could not retreive clipboard" -type ok
return
}
set ::diff($top,mode) "patch"
set ::Pref(ignore) " "
set ::Pref(nocase) 0
set ::Pref(noempty) 0
set ::diff($top,patchFile) ""
set ::diff($top,patchData) $sel
doDiff $top
}
proc openRev {top} {
if {[doOpenRight $top]} {
set rev [detectRevSystem $::diff($top,rightFile)]
if {$rev eq ""} {
tk_messageBox -icon error -title "Eskil Error" -message \
"Could not figure out which revison control system\
|
| ︙ | | |
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
|
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
|
+
+
|
-command makeDirDiffWin
$top.m.mt add command -label "Clip Diff" -underline 0 \
-command makeClipDiffWin
$top.m.mt add command -label "Merge" -underline 0 \
-command [list makeMergeWin $top] -state disabled
$top.m.mt add command -label "Edit Mode" -underline 0 \
-command [list allowEdit $top] -state disabled
$top.m.mt add command -label "Paste Patch" -underline 0 \
-command [list doPastePatch $top]
$top.m.mt add command -label "Clear Align" \
-command [list clearAlign $top] -state disabled
set ::widgets($top,enableAlignCmd) [list \
$top.m.mt entryconfigure "Clear Align" -state normal]
set ::widgets($top,disableAlignCmd) [list \
$top.m.mt entryconfigure "Clear Align" -state disabled]
|
| ︙ | | |
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
|
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
|
+
|
$::widgets($top,rev2) xview end
if {$doreview} {
set rev [detectRevSystem "" $preferedRev]
set ::diff($top,modetype) $rev
set ::diff($top,mode) "patch"
set ::diff($top,patchFile) ""
set ::diff($top,patchData) ""
set ::diff($top,reviewFiles) $files
set ::Pref(toolbar) 1
after idle [list doDiff $top]
return $top
}
if {$len == 1 || $foreach} {
set ReturnAfterLoop 0
|
| ︙ | | |
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
|
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
|
+
|
set ::diff($top,leftLabel) $fullname
set ::diff($top,leftOK) 1
if {$dopatch || \
[regexp {\.(diff|patch)$} $fullname] || \
$fullname eq "-"} {
set ::diff($top,mode) "patch"
set ::diff($top,patchFile) $fullname
set ::diff($top,patchData) ""
set autobrowse 0
if {$noautodiff} {
enableRedo $top
} else {
after idle [list doDiff $top]
}
set ReturnAfterLoop 1
|
| ︙ | | |