Eskil

Check-in [9d15692c0d]
Login

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

Overview
Comment:Clean up after dir diff fixes
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 9d15692c0d82d0584d7e6bdd9c5aebd4bba749ab9b233fd9f671431b81db97a1
User & Date: peter 2018-01-14 20:17:23.930
Context
2018-01-14
20:19
Removed support for old RCS style -rREV command line. check-in: 9f7997d307 user: peter tags: trunk
20:17
Clean up after dir diff fixes check-in: 9d15692c0d user: peter tags: trunk
20:02
Process directory diff in a nicer order. check-in: 82b33e1506 user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/eskil.syntax.
︙︙
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114

# This is the annotation needed for this object definition

##nagelfar syntax DirCompareTree dc=_obj,DirCompareTree p*
##nagelfar option DirCompareTree -leftdirvariable -rightdirvariable -statusvar
##nagelfar return DirCompareTree _obj,DirCompareTree
##nagelfar subcmd+ _obj,DirCompareTree text newLine

##nagelfar implicitvarns snit::widget::DirCompareTree self\ _obj,DirCompareTree hull win self tree hsb vsb options AfterId PauseBgProcessing IdleQueue IdleQueueArr leftMark rightMark leftDir rightDir protect ScheduledRestart img AfterTime

# This is the annotation needed for this object definition

##nagelfar syntax ttk::entryX dc=_obj,entryX p*
##nagelfar option ttk::entryX -width -textvariable -style
##nagelfar option ttk::entryX\ -textvariable n
##nagelfar return ttk::entryX _obj,entryX








|








100
101
102
103
104
105
106
107
108
109
110
111
112
113
114

# This is the annotation needed for this object definition

##nagelfar syntax DirCompareTree dc=_obj,DirCompareTree p*
##nagelfar option DirCompareTree -leftdirvariable -rightdirvariable -statusvar
##nagelfar return DirCompareTree _obj,DirCompareTree
##nagelfar subcmd+ _obj,DirCompareTree text newLine

##nagelfar implicitvarns snit::widget::DirCompareTree self\ _obj,DirCompareTree hull win self tree hsb vsb options AfterId PauseBgProcessing IdleQueue IdleQueueArr leftMark rightMark leftDir rightDir protect ScheduledRestart img AfterTime DebugCh DebugTime

# This is the annotation needed for this object definition

##nagelfar syntax ttk::entryX dc=_obj,entryX p*
##nagelfar option ttk::entryX -width -textvariable -style
##nagelfar option ttk::entryX\ -textvariable n
##nagelfar return ttk::entryX _obj,entryX
︙︙
Changes to tests/dir.test. 
1
2
3
4
5
6
7

8
9
10
11
12
13
14

#------------------------------------------------------------*- tcl -*-
# Tests for comparing directories.
#----------------------------------------------------------------------

set ::Pref(dir,ignorekey) 0
set ::Pref(dir,comparelevel) 1
set ::eskil(.dirdiff,plugin) ""


proc testCompareFiles {text1 text2 {sametime 0}} {
    set ch [open _f1_ w]
    puts -nonewline $ch $text1
    close $ch

    set ch [open _f2_ w]








>








1
2
3
4
5
6
7
8
9
10
11
12
13
14
15

#------------------------------------------------------------*- tcl -*-
# Tests for comparing directories.
#----------------------------------------------------------------------

set ::Pref(dir,ignorekey) 0
set ::Pref(dir,comparelevel) 1
set ::eskil(.dirdiff,plugin) ""
set ::eskil(.dirdiff,dirPlugin) 0

proc testCompareFiles {text1 text2 {sametime 0}} {
    set ch [open _f1_ w]
    puts -nonewline $ch $text1
    close $ch

    set ch [open _f2_ w]
︙︙
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129

} -body {
    set ::Pref(dir,comparelevel) 0
    set res [testCompareFiles "abab" "baba"]
    # Different size
    append res [testCompareFiles "abab" "babax"]
    set ::Pref(dir,comparelevel) 1
    append res [testCompareFiles "abab" "baba"]
    # Same time
    append res [testCompareFiles "abab" "baba" 1]
} -result {11000011}

test dir-5.1 {
    CompareFiles, directories
} -body {
    touch _f1_
    file mkdir _d1_
    file mkdir _d2_








|

|








114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130

} -body {
    set ::Pref(dir,comparelevel) 0
    set res [testCompareFiles "abab" "baba"]
    # Different size
    append res [testCompareFiles "abab" "babax"]
    set ::Pref(dir,comparelevel) 1
    append res [testCompareFiles "abab" "baba"]
    # Same time is not enough anymore
    append res [testCompareFiles "abab" "baba" 1]
} -result {11000000}

test dir-5.1 {
    CompareFiles, directories
} -body {
    touch _f1_
    file mkdir _d1_
    file mkdir _d2_
︙︙