Eskil

Diff
Login

Differences From Artifact [2ef9a7a279]:

To Artifact [ad0000f533]:


356
357
358
359
360
361
362


363
364
365

366
367
368

369
370
371
372
373
374
375
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379







+
+



+



+







    set row [expr {int([$w index @$x,$y]) - 1}]
    set lf [lindex $dirdiff(leftFiles) $row]
    set rf [lindex $dirdiff(rightFiles) $row]
    set i [lindex $dirdiff(infoFiles) $row]
    if {($i & 12) == 12} { # Both are dirs
        set dirdiff(leftDir) $lf
        set dirdiff(rightDir) $rf
        .dirdiff.e1 xview end
        .dirdiff.e2 xview end
        if {$Pref(autocompare)} doDirCompare
    } elseif {$i & 4} { # Left is dir
        set dirdiff(leftDir) $lf
        .dirdiff.e1 xview end
        if {$Pref(autocompare)} doDirCompare
    } elseif {$i & 8} { # Right is dir
        set dirdiff(rightDir) $rf
        .dirdiff.e2 xview end
        if {$Pref(autocompare)} doDirCompare
    } elseif {($i & 3) == 0} { # Both exists
        # Open a diff window for them
        newDiff $lf $rf
    }
}

485
486
487
488
489
490
491


492
493
494
495

496
497
498
499

500
501
502
503
504
505
506
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514







+
+




+




+







# 0 = both
proc UpDir {{n 0}} {
    global dirdiff Pref
    switch $n {
        0 {
            set dirdiff(leftDir) [file dirname $dirdiff(leftDir)]
            set dirdiff(rightDir) [file dirname $dirdiff(rightDir)]
            .dirdiff.e1 xview end
            .dirdiff.e2 xview end
            if {$Pref(autocompare)} doDirCompare
        }
        1 {
            set dirdiff(leftDir) [file dirname $dirdiff(leftDir)]
            .dirdiff.e1 xview end
            if {$Pref(autocompare)} doDirCompare
        }
        2 {
            set dirdiff(rightDir) [file dirname $dirdiff(rightDir)]
            .dirdiff.e2 xview end
            if {$Pref(autocompare)} doDirCompare
        }
    }
}

# Create directory diff window.
proc makeDirDiffWin {{redraw 0}} {