Eskil

Diff
Login

Differences From Artifact [ea0747f657]:

To Artifact [a2801c184a]:


895
896
897
898
899
900
901
902

903
904
905
906
907
908
909
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
        # 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
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]]
                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
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]
                set fD2 [lindex $filesD2 $p2]
                $self ListFiles "" $fD2 $node
                incr p2
                set status_change 1
            } else {
                break
            }
        }