Eskil

Check-in [bd1e62dc68]
Login

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

Overview
Comment:Avoid duplicated .-files in dirdiff
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: bd1e62dc68a931007f119a572afdff0aa5746ae0
User & Date: peter 2014-11-17 16:59:55.281
Context
2014-11-17
17:01
Read all from a pipe before closing. check-in: 84e4b8cf0e user: peter tags: trunk
16:59
Avoid duplicated .-files in dirdiff check-in: bd1e62dc68 user: peter tags: trunk
00:14
Pass read channel directly to vfs check-in: 6a2afdf1ab user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/dirdiff.tcl.
︙︙
164
165
166
167
168
169
170
171







172
173
174
175
176
177
178


# Returns the contents of a directory as a sorted list of full file paths.
proc DirContents {dir} {
    if {$::tcl_platform(platform) eq "windows"} {
        # .-files are not treated specially on windows. * is enough to get all
        set files [glob -directory $dir -nocomplain *]
    } else {
        set files [glob -directory $dir -nocomplain * {.[a-zA-Z]*}]







    }

    if {$::Pref(dir,onlyrev)} {
        # FIXA: move to rev and make general for other systems
        set entries [file join $dir CVS Entries]
        if {[file exists $entries]} {
            set ch [open $entries r]








|
>
>
>
>
>
>
>








164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185


# Returns the contents of a directory as a sorted list of full file paths.
proc DirContents {dir} {
    if {$::tcl_platform(platform) eq "windows"} {
        # .-files are not treated specially on windows. * is enough to get all
        set files [glob -directory $dir -nocomplain *]
    } else {
        set files [glob -directory $dir -nocomplain *]
        # Handle .-files and make sure no duplicates are generated
        set files2 [glob -directory $dir -nocomplain {.[a-zA-Z]*}]
        foreach file $files2 {
            if {$file ni $files} {
                lappend files $file
            }
        }
    }

    if {$::Pref(dir,onlyrev)} {
        # FIXA: move to rev and make general for other systems
        set entries [file join $dir CVS Entries]
        if {[file exists $entries]} {
            set ch [open $entries r]
︙︙