Fossil SCM
Fix typo in comment and add more tests of file name transformation methods.
Commit
9b41960e82af52614d966002373a217e51428204
Parent
c2df31dae8ad1b0…
2 files changed
+1
-1
+31
+1
-1
| --- src/file.c | ||
| +++ src/file.c | ||
| @@ -1112,11 +1112,11 @@ | ||
| 1112 | 1112 | ** COMMAND: test-tree-name |
| 1113 | 1113 | ** |
| 1114 | 1114 | ** Test the operation of the tree name generator. |
| 1115 | 1115 | ** |
| 1116 | 1116 | ** Options: |
| 1117 | -** --absolute Return an absolute path intead of a relative one. | |
| 1117 | +** --absolute Return an absolute path instead of a relative one. | |
| 1118 | 1118 | ** --case-sensitive B Enable or disable case-sensitive filenames. B is |
| 1119 | 1119 | ** a boolean: "yes", "no", "true", "false", etc. |
| 1120 | 1120 | */ |
| 1121 | 1121 | void cmd_test_tree_name(void){ |
| 1122 | 1122 | int i; |
| 1123 | 1123 |
| --- src/file.c | |
| +++ src/file.c | |
| @@ -1112,11 +1112,11 @@ | |
| 1112 | ** COMMAND: test-tree-name |
| 1113 | ** |
| 1114 | ** Test the operation of the tree name generator. |
| 1115 | ** |
| 1116 | ** Options: |
| 1117 | ** --absolute Return an absolute path intead of a relative one. |
| 1118 | ** --case-sensitive B Enable or disable case-sensitive filenames. B is |
| 1119 | ** a boolean: "yes", "no", "true", "false", etc. |
| 1120 | */ |
| 1121 | void cmd_test_tree_name(void){ |
| 1122 | int i; |
| 1123 |
| --- src/file.c | |
| +++ src/file.c | |
| @@ -1112,11 +1112,11 @@ | |
| 1112 | ** COMMAND: test-tree-name |
| 1113 | ** |
| 1114 | ** Test the operation of the tree name generator. |
| 1115 | ** |
| 1116 | ** Options: |
| 1117 | ** --absolute Return an absolute path instead of a relative one. |
| 1118 | ** --case-sensitive B Enable or disable case-sensitive filenames. B is |
| 1119 | ** a boolean: "yes", "no", "true", "false", etc. |
| 1120 | */ |
| 1121 | void cmd_test_tree_name(void){ |
| 1122 | int i; |
| 1123 |
+31
| --- test/file1.test | ||
| +++ test/file1.test | ||
| @@ -33,10 +33,28 @@ | ||
| 33 | 33 | fossil test-relative-name --chdir $subdir $path |
| 34 | 34 | test relative-name-$testname.$i {$::RESULT==$result} |
| 35 | 35 | incr i |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | + | |
| 39 | +proc relative-tree-name {testname args} { | |
| 40 | + set i 1 | |
| 41 | + foreach {subdir path result} $args { | |
| 42 | + fossil test-tree-name --chdir $subdir $path | |
| 43 | + test relative-tree-name-$testname.$i {$::RESULT==$result} | |
| 44 | + incr i | |
| 45 | + } | |
| 46 | +} | |
| 47 | + | |
| 48 | +proc absolute-tree-name {testname args} { | |
| 49 | + set i 1 | |
| 50 | + foreach {subdir path result} $args { | |
| 51 | + fossil test-tree-name --chdir $subdir --absolute $path | |
| 52 | + test absolute-tree-name-$testname.$i {$::RESULT==$result} | |
| 53 | + incr i | |
| 54 | + } | |
| 55 | +} | |
| 38 | 56 | |
| 39 | 57 | simplify-name 100 . . .// . .. .. ..///// .. |
| 40 | 58 | simplify-name 101 {} {} / / ///////// / ././././ . |
| 41 | 59 | simplify-name 102 x x /x /x ///x //x |
| 42 | 60 | simplify-name 103 a/b a/b /a/b /a/b a///b a/b ///a///b///// //a/b |
| @@ -55,8 +73,21 @@ | ||
| 55 | 73 | file mkdir test1/test2 |
| 56 | 74 | |
| 57 | 75 | relative-name 100 . . . test1 [pwd] .. test1 [pwd]/ .. test1 [pwd]/test ../test |
| 58 | 76 | relative-name 101 test1/test2 [pwd] ../.. test1/test2 [pwd]/ ../.. test1/test2 [pwd]/test ../../test |
| 59 | 77 | relative-name 102 test1 [pwd]/test ../test . [pwd]/file1 ./file1 . [pwd]/file1/file2 ./file1/file2 |
| 78 | +relative-name 103 . [pwd] . | |
| 79 | + | |
| 80 | +relative-tree-name 100 . . file1 test1 [pwd] file1 test1 [pwd]/ file1 test1 [pwd]/test file1/test | |
| 81 | +relative-tree-name 101 test1/test2 [pwd] file1 test1/test2 [pwd]/ file1 test1/test2 [pwd]/test file1/test | |
| 82 | +relative-tree-name 102 test1 [pwd]/test file1/test . [pwd]/file1 file1/file1 . [pwd]/file1/file2 file1/file1/file2 | |
| 83 | +relative-tree-name 103 . [pwd] file1 | |
| 84 | + | |
| 85 | +set dirname [file normalize [file dirname [pwd]]] | |
| 86 | + | |
| 87 | +absolute-tree-name 100 . . $dirname test1 [pwd] [pwd] test1 [pwd]/ $dirname/file1 test1 [pwd]/test $dirname/file1/test | |
| 88 | +absolute-tree-name 101 test1/test2 [pwd] $dirname/file1 test1/test2 [pwd]/ $dirname/file1 test1/test2 [pwd]/test $dirname/file1/test | |
| 89 | +absolute-tree-name 102 test1 [pwd]/test $dirname/file1/test . [pwd]/file1 $dirname/file1/file1 . [pwd]/file1/file2 $dirname/file1/file1/file2 | |
| 90 | +absolute-tree-name 103 . [pwd] $dirname/file1 | |
| 60 | 91 | |
| 61 | 92 | catch {file delete test1/test2} |
| 62 | 93 | catch {file delete test1} |
| 63 | 94 |
| --- test/file1.test | |
| +++ test/file1.test | |
| @@ -33,10 +33,28 @@ | |
| 33 | fossil test-relative-name --chdir $subdir $path |
| 34 | test relative-name-$testname.$i {$::RESULT==$result} |
| 35 | incr i |
| 36 | } |
| 37 | } |
| 38 | |
| 39 | simplify-name 100 . . .// . .. .. ..///// .. |
| 40 | simplify-name 101 {} {} / / ///////// / ././././ . |
| 41 | simplify-name 102 x x /x /x ///x //x |
| 42 | simplify-name 103 a/b a/b /a/b /a/b a///b a/b ///a///b///// //a/b |
| @@ -55,8 +73,21 @@ | |
| 55 | file mkdir test1/test2 |
| 56 | |
| 57 | relative-name 100 . . . test1 [pwd] .. test1 [pwd]/ .. test1 [pwd]/test ../test |
| 58 | relative-name 101 test1/test2 [pwd] ../.. test1/test2 [pwd]/ ../.. test1/test2 [pwd]/test ../../test |
| 59 | relative-name 102 test1 [pwd]/test ../test . [pwd]/file1 ./file1 . [pwd]/file1/file2 ./file1/file2 |
| 60 | |
| 61 | catch {file delete test1/test2} |
| 62 | catch {file delete test1} |
| 63 |
| --- test/file1.test | |
| +++ test/file1.test | |
| @@ -33,10 +33,28 @@ | |
| 33 | fossil test-relative-name --chdir $subdir $path |
| 34 | test relative-name-$testname.$i {$::RESULT==$result} |
| 35 | incr i |
| 36 | } |
| 37 | } |
| 38 | |
| 39 | proc relative-tree-name {testname args} { |
| 40 | set i 1 |
| 41 | foreach {subdir path result} $args { |
| 42 | fossil test-tree-name --chdir $subdir $path |
| 43 | test relative-tree-name-$testname.$i {$::RESULT==$result} |
| 44 | incr i |
| 45 | } |
| 46 | } |
| 47 | |
| 48 | proc absolute-tree-name {testname args} { |
| 49 | set i 1 |
| 50 | foreach {subdir path result} $args { |
| 51 | fossil test-tree-name --chdir $subdir --absolute $path |
| 52 | test absolute-tree-name-$testname.$i {$::RESULT==$result} |
| 53 | incr i |
| 54 | } |
| 55 | } |
| 56 | |
| 57 | simplify-name 100 . . .// . .. .. ..///// .. |
| 58 | simplify-name 101 {} {} / / ///////// / ././././ . |
| 59 | simplify-name 102 x x /x /x ///x //x |
| 60 | simplify-name 103 a/b a/b /a/b /a/b a///b a/b ///a///b///// //a/b |
| @@ -55,8 +73,21 @@ | |
| 73 | file mkdir test1/test2 |
| 74 | |
| 75 | relative-name 100 . . . test1 [pwd] .. test1 [pwd]/ .. test1 [pwd]/test ../test |
| 76 | relative-name 101 test1/test2 [pwd] ../.. test1/test2 [pwd]/ ../.. test1/test2 [pwd]/test ../../test |
| 77 | relative-name 102 test1 [pwd]/test ../test . [pwd]/file1 ./file1 . [pwd]/file1/file2 ./file1/file2 |
| 78 | relative-name 103 . [pwd] . |
| 79 | |
| 80 | relative-tree-name 100 . . file1 test1 [pwd] file1 test1 [pwd]/ file1 test1 [pwd]/test file1/test |
| 81 | relative-tree-name 101 test1/test2 [pwd] file1 test1/test2 [pwd]/ file1 test1/test2 [pwd]/test file1/test |
| 82 | relative-tree-name 102 test1 [pwd]/test file1/test . [pwd]/file1 file1/file1 . [pwd]/file1/file2 file1/file1/file2 |
| 83 | relative-tree-name 103 . [pwd] file1 |
| 84 | |
| 85 | set dirname [file normalize [file dirname [pwd]]] |
| 86 | |
| 87 | absolute-tree-name 100 . . $dirname test1 [pwd] [pwd] test1 [pwd]/ $dirname/file1 test1 [pwd]/test $dirname/file1/test |
| 88 | absolute-tree-name 101 test1/test2 [pwd] $dirname/file1 test1/test2 [pwd]/ $dirname/file1 test1/test2 [pwd]/test $dirname/file1/test |
| 89 | absolute-tree-name 102 test1 [pwd]/test $dirname/file1/test . [pwd]/file1 $dirname/file1/file1 . [pwd]/file1/file2 $dirname/file1/file1/file2 |
| 90 | absolute-tree-name 103 . [pwd] $dirname/file1 |
| 91 | |
| 92 | catch {file delete test1/test2} |
| 93 | catch {file delete test1} |
| 94 |