1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
|
set ::diff($top,rightFile) $apa
set ::diff($top,rightLabel) $apa
set ::diff($top,rightOK) 1
return 1
}
return 0
}
proc openLeft {top} {
if {[doOpenLeft $top]} {
set ::diff($top,mode) ""
set ::diff($top,mergeFile) ""
doDiff $top
}
}
proc openRight {top} {
if {[doOpenRight $top]} {
set ::diff($top,mode) ""
set ::diff($top,mergeFile) ""
doDiff $top
}
}
proc openConflict {top} {
global Pref
if {[doOpenRight $top]} {
startConflictDiff $top $::diff($top,rightFile)
set ::diff($top,mergeFile) ""
doDiff $top
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
|
set ::diff($top,rightFile) $apa
set ::diff($top,rightLabel) $apa
set ::diff($top,rightOK) 1
return 1
}
return 0
}
proc doOpenAncestor {top} {
if {$::diff($top,ancestorFile) ne ""} {
set initDir [file dirname $::diff($top,ancestorFile)]
} elseif {[info exists ::diff($top,leftDir)]} {
set initDir $::diff($top,leftDir)
} elseif {[info exists ::diff($top,rightDir)]} {
set initDir $::diff($top,rightDir)
} else {
set initDir [pwd]
}
set apa [myOpenFile -title "Select ancestor file" -initialdir $initDir \
-parent $top]
if {$apa != ""} {
set ::diff($top,ancestorFile) $apa
return 1
}
return 0
}
proc openLeft {top} {
if {[doOpenLeft $top]} {
set ::diff($top,mode) ""
set ::diff($top,mergeFile) ""
doDiff $top
}
}
proc openRight {top} {
if {[doOpenRight $top]} {
set ::diff($top,mode) ""
set ::diff($top,mergeFile) ""
doDiff $top
}
}
proc openAncestor {top} {
if {[doOpenAncestor $top]} {
# Redo diff with ancestor
doDiff $top
}
}
proc openConflict {top} {
global Pref
if {[doOpenRight $top]} {
startConflictDiff $top $::diff($top,rightFile)
set ::diff($top,mergeFile) ""
doDiff $top
|
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
|
$top.m.mf add command -label "Open Both (forget)..." \
-command [list openBoth $top 1]
$top.m.mf add command -label "Open Left File..." \
-command [list openLeft $top]
$top.m.mf add command -label "Open Right File..." \
-command [list openRight $top]
$top.m.mf add separator
$top.m.mf add command -label "Open Conflict File..." \
-command [list openConflict $top]
$top.m.mf add command -label "Open Patch File..." \
-command [list openPatch $top]
$top.m.mf add command -label "Revision Diff..." -underline 0 \
-command [list openRev $top]
$top.m.mf add separator
|
>
>
|
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
|
$top.m.mf add command -label "Open Both (forget)..." \
-command [list openBoth $top 1]
$top.m.mf add command -label "Open Left File..." \
-command [list openLeft $top]
$top.m.mf add command -label "Open Right File..." \
-command [list openRight $top]
$top.m.mf add separator
$top.m.mf add command -label "Open Ancestor File..." \
-command [list openAncestor $top]
$top.m.mf add command -label "Open Conflict File..." \
-command [list openConflict $top]
$top.m.mf add command -label "Open Patch File..." \
-command [list openPatch $top]
$top.m.mf add command -label "Revision Diff..." -underline 0 \
-command [list openRev $top]
$top.m.mf add separator
|