Eskil

Check-in [f96b0fd915]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fixed silly error from dirdiff refactoring. [da1ad24ee2]
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: f96b0fd91566a82501b4541d0024ac13725351bd
User & Date: peter 2014-11-07 20:04:19.014
Context
2014-11-07
21:41
Generalised plugin reader a bit. check-in: 27715e3307 user: peter tags: trunk
20:04
Fixed silly error from dirdiff refactoring. [da1ad24ee2] check-in: f96b0fd915 user: peter tags: trunk
19:43
Corrected win download check-in: 7aa427cf8f user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to Changes.



1
2
3
4
5
6
7



2014-10-27
 Bumped revision to 2.6.6

2014-10-27
 Store default prefs as comment in rc file

2014-08-12
>
>
>







1
2
3
4
5
6
7
8
9
10
2014-11-07
 Fixed silly error from dirdiff refactoring. [da1ad24ee2]

2014-10-27
 Bumped revision to 2.6.6

2014-10-27
 Store default prefs as comment in rc file

2014-08-12
Changes to src/dirdiff.tcl.
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
            $w.bl configure -state disabled
        }
    }

    # Compare two directories.
    method CompareDirs {dir1 dir2 node} {
        # Collect preferences to a dict.
        # FIXA: Maybe move this to a more cnetral place
        dict set prefsD incdirs $::Pref(dir,incdirs)
        dict set prefsD exdirs $::Pref(dir,exdirs)
        dict set prefsD incfiles $::Pref(dir,incfiles)
        dict set prefsD exfiles $::Pref(dir,exfiles)

        if {$dir1 eq ""} {
            set filesD1 {}







|







895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
            $w.bl configure -state disabled
        }
    }

    # Compare two directories.
    method CompareDirs {dir1 dir2 node} {
        # Collect preferences to a dict.
        # FIXA: Maybe move this to a more central place
        dict set prefsD incdirs $::Pref(dir,incdirs)
        dict set prefsD exdirs $::Pref(dir,exdirs)
        dict set prefsD incfiles $::Pref(dir,incfiles)
        dict set prefsD exfiles $::Pref(dir,exfiles)

        if {$dir1 eq ""} {
            set filesD1 {}
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
        set p1 0
        set p2 0
        set status_change 0
        set status_unknown 0
        while 1 {
            if {$p1 < $len1 && $p2 < $len2} {
                set fD1 [lindex $filesD1 $p1]
                set fD2 [lindex $filesD2 $p1]
                set apa [FStrCmp [dict get $fD1 tail] [dict get $fD1 tail]]
                if {$apa == 0} {
                    # Equal names, separate them if not the same type
                    set apa [expr {- [dict get $fD1 dir] \
                                   + [dict get $fD2 dir]}]
                }

                switch -- $apa {







|
|







922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
        set p1 0
        set p2 0
        set status_change 0
        set status_unknown 0
        while 1 {
            if {$p1 < $len1 && $p2 < $len2} {
                set fD1 [lindex $filesD1 $p1]
                set fD2 [lindex $filesD2 $p2]
                set apa [FStrCmp [dict get $fD1 tail] [dict get $fD2 tail]]
                if {$apa == 0} {
                    # Equal names, separate them if not the same type
                    set apa [expr {- [dict get $fD1 dir] \
                                   + [dict get $fD2 dir]}]
                }

                switch -- $apa {
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
                }
            } elseif {$p1 < $len1 && $p2 >= $len2} {
                set fD1 [lindex $filesD1 $p1]
                $self ListFiles $fD1 "" $node
                incr p1
                set status_change 1
            } elseif {$p1 >= $len1 && $p2 < $len2} {
                set fD2 [lindex $filesD2 $p1]
                $self ListFiles "" $fD2 $node
                incr p2
                set status_change 1
            } else {
                break
            }
        }







|







956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
                }
            } elseif {$p1 < $len1 && $p2 >= $len2} {
                set fD1 [lindex $filesD1 $p1]
                $self ListFiles $fD1 "" $node
                incr p1
                set status_change 1
            } elseif {$p1 >= $len1 && $p2 < $len2} {
                set fD2 [lindex $filesD2 $p2]
                $self ListFiles "" $fD2 $node
                incr p2
                set status_change 1
            } else {
                break
            }
        }