3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
|
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
|
+
+
|
set ::eskil(ignorenewline) 1
} elseif {$arg eq "-nonewline+"} {
set ::eskil(ignorenewline) 2
} elseif {$arg eq "-close"} {
set ::eskil(autoclose) 1
} elseif {$arg eq "-conflict"} {
set opts(mode) "conflict"
# Conflict implies foreach
set foreach 1
} elseif {$arg eq "-print" || $arg eq "-printpdf"} {
set nextArg printFile
} elseif {$arg in {-printHeaderSize -printCharsPerLine -printPaper \
-printColorChange -printColorOld -printColorNew}} {
set nextArg [string range $arg 1 end]
} elseif {$arg eq "-server"} {
if {$::tcl_platform(platform) eq "windows"} {
|
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
|
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
|
+
+
+
+
+
+
+
+
+
+
|
set ::diff($top,$item) $val
}
# It is preferable to see the end if the rev string is too long
$::widgets($top,rev1) xview end
$::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,reviewFiles) $files
#set ::Pref(toolbar) 1
after idle [list doDiff $top]
return
}
if {$len == 1 || $foreach} {
set ReturnAfterLoop 0
set first 1
foreach file $files {
if {$first} {
set first 0
} else {
|
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
|
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
|
-
-
-
-
-
-
-
-
|
set ::diff($top,rightOK) 1
if {$noautodiff} {
enableRedo $top
} else {
after idle [list doDiff $top]
}
}
if {$doreview} {
set rev [detectRevSystem "" $preferedRev]
set ::diff($top,modetype) $rev
set ::diff($top,mode) "patch"
set ::diff($top,patchFile) ""
after idle [list doDiff $top]
return
}
|