Eskil

Check-in [1a2b919d38]
Login

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

Overview
Comment:Cleanup after GIT import
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1a2b919d384e4e7d9369d5a8bcc77e5ab98587a0
User & Date: peter.spjuth@gmail.com 2010-04-27 20:30:35.000
Context
2010-04-27
21:06
Moved packages pstools and psballoon into GIT repository. check-in: 51939a3dd4 user: peter.spjuth@gmail.com tags: trunk
20:30
Cleanup after GIT import check-in: 1a2b919d38 user: peter.spjuth@gmail.com tags: trunk
19:29
Update path to kit. check-in: c19a334194 user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Added eskil.vfs/COPYING. 




>

1

../COPYING
Added eskil.vfs/doc. 




>

1

../doc
Added eskil.vfs/examples. 




>

1

../examples
Added eskil.vfs/plugins. 




>

1

../plugins
Added eskil.vfs/src/clip.tcl. 




>

1

../../src/clip.tcl
Added eskil.vfs/src/compare.tcl. 




>

1

../../src/compare.tcl
Added eskil.vfs/src/dirdiff.tcl. 




>

1

../../src/dirdiff.tcl
Added eskil.vfs/src/eskil.tcl. 




>

1

../../src/eskil.tcl
Added eskil.vfs/src/help.tcl. 




>

1

../../src/help.tcl
Added eskil.vfs/src/map.tcl. 




>

1

../../src/map.tcl
Added eskil.vfs/src/merge.tcl. 




>

1

../../src/merge.tcl
Added eskil.vfs/src/plugin.tcl. 




>

1

../../src/plugin.tcl
Added eskil.vfs/src/print.tcl. 




>

1

../../src/print.tcl
Added eskil.vfs/src/printobj.tcl. 




>

1

../../src/printobj.tcl
Added eskil.vfs/src/registry.tcl. 




>

1

../../src/registry.tcl
Added eskil.vfs/src/rev.tcl. 




>

1

../../src/rev.tcl
Changes to tests/print.test.
︙︙
18
19
20
21
22
23
24


25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49

    # Create big files with differences at five-digit line numbers
    set f1 [tcltest::makeFile {} _test1]
    set f2 [tcltest::makeFile {} _test2]
    set f3 [tcltest::makeFile {} _test3]
    set ch1 [open $f1 w]
    set ch2 [open $f2 w]
    set data [string repeat xx\n 12345]


    puts $ch1 $data
    puts $ch2 $data
    puts $ch1 "Diffline1.1"
    puts $ch2 "Diffline1.2"
    puts $ch1 $data
    puts $ch2 $data
    puts $ch1 "Diffline2.1"
    puts $ch2 "Diffline2.2"
    puts $ch1 $data
    puts $ch2 $data
    close $ch1
    close $ch2
} -body {
    set res [exec ./eskil.kit -context 5 -printpdf $f3 $f1 $f2]
    puts $res
    set ch [open $f3 r]
    set data [read $ch]
    close $ch
    # Check that line numbers take up 7 chars
    string match "*(    3: )*(24689: )*" $data
} -cleanup {
    tcltest::removeFile {} _test1
    tcltest::removeFile {} _test2
    tcltest::removeFile {} _test3
} -result {1}








>
>



















|






18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51

    # Create big files with differences at five-digit line numbers
    set f1 [tcltest::makeFile {} _test1]
    set f2 [tcltest::makeFile {} _test2]
    set f3 [tcltest::makeFile {} _test3]
    set ch1 [open $f1 w]
    set ch2 [open $f2 w]
    set data [string repeat xx\n 12345]
    puts $ch1 "Diffline0.1"
    puts $ch2 "Diffline0.2"
    puts $ch1 $data
    puts $ch2 $data
    puts $ch1 "Diffline1.1"
    puts $ch2 "Diffline1.2"
    puts $ch1 $data
    puts $ch2 $data
    puts $ch1 "Diffline2.1"
    puts $ch2 "Diffline2.2"
    puts $ch1 $data
    puts $ch2 $data
    close $ch1
    close $ch2
} -body {
    set res [exec ./eskil.kit -context 5 -printpdf $f3 $f1 $f2]
    puts $res
    set ch [open $f3 r]
    set data [read $ch]
    close $ch
    # Check that line numbers take up 7 chars
    string match "*(    3: )*(24690: )*" $data
} -cleanup {
    tcltest::removeFile {} _test1
    tcltest::removeFile {} _test2
    tcltest::removeFile {} _test3
} -result {1}
Changes to tests/rev.test.
︙︙
17
18
19
20
21
22
23



24
25
26
27
28
29
30

            }
            if {[lindex $args 1] eq "pwv"} {
                return $::ct_pwv
            }
            if {[lindex $args 1] eq "ls"} {
                return $::ct_ls
            }



            return
        }
        cvs {
            # cvs -z3 update -p ?-r rev? $filename > $outfile
            return
        }
        co {








>
>
>








17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33

            }
            if {[lindex $args 1] eq "pwv"} {
                return $::ct_pwv
            }
            if {[lindex $args 1] eq "ls"} {
                return $::ct_ls
            }
            if {[lindex $args 1] eq "describe"} {
                return $::ct_describe
            }
            return
        }
        cvs {
            # cvs -z3 update -p ?-r rev? $filename > $outfile
            return
        }
        co {
︙︙
56
57
58
59
60
61
62



63
64
65
66
67
68
69

        }
        default {
            eval _stub_exec $args
        }
    }
}




test rev-1.1 {
    ClearCase revisions
} -body {
    set ::ct_ls @@/Bepa/5
    eskil::rev::CT::ParseRevs filename 2
} -result {/Bepa/2}









>
>
>








59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75

        }
        default {
            eval _stub_exec $args
        }
    }
}

# Do not detect git
set ::auto_execs(git) ""

test rev-1.1 {
    ClearCase revisions
} -body {
    set ::ct_ls @@/Bepa/5
    eskil::rev::CT::ParseRevs filename 2
} -result {/Bepa/2}
︙︙
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115

    set ::ct_ls @@/Apa/Bepa/12
    eskil::rev::CT::ParseRevs filename ""
} -result {/Apa/Bepa/12}

test rev-1.7 {
    ClearCase revisions
} -body {
    set ::ct_ls @@/Apa/Bepa/7
    eskil::rev::CT::ParseRevs filename -1
} -result {/Apa/Bepa/11}

test rev-1.8 {
    ClearCase revisions
} -body {
    set ::ct_ls @@/Apa/Bepa/7








|








107
108
109
110
111
112
113
114
115
116
117
118
119
120
121

    set ::ct_ls @@/Apa/Bepa/12
    eskil::rev::CT::ParseRevs filename ""
} -result {/Apa/Bepa/12}

test rev-1.7 {
    ClearCase revisions
} -body {
    set ::ct_describe /Apa/Bepa/11
    eskil::rev::CT::ParseRevs filename -1
} -result {/Apa/Bepa/11}

test rev-1.8 {
    ClearCase revisions
} -body {
    set ::ct_ls @@/Apa/Bepa/7
︙︙
123
124
125
126
127
128
129

130
131
132
133
134
135
136
137
138
139
140
141

142
143
144
145
146
147
148

    eskil::rev::CT::ParseRevs filename -5
} -result {/Apa/Cepa/0}

test rev-2.1 {
    Detecting, CVS
} -body {
    set f [tcltest::makeFile {} _rev2_1]

    detectRevSystem $f
} -cleanup {
    tcltest::removeFile {} _rev2_1
} -result {CVS}

test rev-2.2 {
    Detecting, CVS
} -body {
    set ::auto_execs(cvs) ""
    set f [tcltest::makeFile {} _rev2_2]
    detectRevSystem $f
} -cleanup {

    tcltest::removeFile {} _rev2_2
} -result {}

test rev-2.3 {
    Detecting, RCS
} -body {
    set f [tcltest::makeFile {} _rev2_3]








>












>








129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156

    eskil::rev::CT::ParseRevs filename -5
} -result {/Apa/Cepa/0}

test rev-2.1 {
    Detecting, CVS
} -body {
    set f [tcltest::makeFile {} _rev2_1]
    file mkdir CVS
    detectRevSystem $f
} -cleanup {
    tcltest::removeFile {} _rev2_1
} -result {CVS}

test rev-2.2 {
    Detecting, CVS
} -body {
    set ::auto_execs(cvs) ""
    set f [tcltest::makeFile {} _rev2_2]
    detectRevSystem $f
} -cleanup {
    file delete -force CVS
    tcltest::removeFile {} _rev2_2
} -result {}

test rev-2.3 {
    Detecting, RCS
} -body {
    set f [tcltest::makeFile {} _rev2_3]
︙︙
209
210
211
212
213
214
215

216
217
218
219
220
221
222

    if {!$apa} {
        file mkdir .git
    }
    set res [detectRevSystem $f]
    if {!$apa} {
        file delete .git
    }

    set res
} -cleanup {
    tcltest::removeFile {} _rev2_8
} -result {GIT}

test rev-2.9 {
    Detecting, HG








>








217
218
219
220
221
222
223
224
225
226
227
228
229
230
231

    if {!$apa} {
        file mkdir .git
    }
    set res [detectRevSystem $f]
    if {!$apa} {
        file delete .git
    }
    set ::auto_execs(git) ""
    set res
} -cleanup {
    tcltest::removeFile {} _rev2_8
} -result {GIT}

test rev-2.9 {
    Detecting, HG
︙︙