Fossil SCM
Added a bit of path normalization, stripping of a trailing slash from the path to the cvs repository. Before such a slash could break a later coming fileutil::stripPath.
Commit
9f3fd3ec4b65c657d5c42422d2a110df9f6c0c11
Parent
1527954d87e2e53…
2 files changed
+3
-1
+6
-1
| --- tools/cvs2fossil/lib/c2f_option.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_option.tcl | ||
| @@ -20,10 +20,11 @@ | ||
| 20 | 20 | |
| 21 | 21 | package require Tcl 8.4 ; # Required runtime. |
| 22 | 22 | package require snit ; # OO system. |
| 23 | 23 | package require vc::tools::trouble ; # Error reporting. |
| 24 | 24 | package require vc::tools::log ; # User feedback. |
| 25 | +package require vc::tools::misc ; # Misc. path reformatting. | |
| 25 | 26 | package require vc::fossil::import::cvs::pass ; # Pass management |
| 26 | 27 | package require vc::fossil::import::cvs::pass::collar ; # Pass I. |
| 27 | 28 | package require vc::fossil::import::cvs::repository ; # Repository management |
| 28 | 29 | package require vc::fossil::import::cvs::state ; # State storage |
| 29 | 30 | |
| @@ -80,11 +81,11 @@ | ||
| 80 | 81 | } |
| 81 | 82 | } |
| 82 | 83 | |
| 83 | 84 | if {[llength $arguments] > 1} Usage |
| 84 | 85 | if {[llength $arguments] < 1} { Usage $nocvs } |
| 85 | - repository base [lindex $arguments 0] | |
| 86 | + repository base [striptrailingslash [lindex $arguments 0]] | |
| 86 | 87 | |
| 87 | 88 | Validate |
| 88 | 89 | return |
| 89 | 90 | } |
| 90 | 91 | |
| @@ -189,10 +190,11 @@ | ||
| 189 | 190 | namespace eval ::vc::fossil::import::cvs { |
| 190 | 191 | namespace export option |
| 191 | 192 | namespace eval option { |
| 192 | 193 | namespace import ::vc::tools::trouble |
| 193 | 194 | namespace import ::vc::tools::log |
| 195 | + namespace import ::vc::tools::misc::striptrailingslash | |
| 194 | 196 | namespace import ::vc::fossil::import::cvs::pass |
| 195 | 197 | namespace import ::vc::fossil::import::cvs::pass::collar |
| 196 | 198 | namespace import ::vc::fossil::import::cvs::repository |
| 197 | 199 | namespace import ::vc::fossil::import::cvs::state |
| 198 | 200 | } |
| 199 | 201 |
| --- tools/cvs2fossil/lib/c2f_option.tcl | |
| +++ tools/cvs2fossil/lib/c2f_option.tcl | |
| @@ -20,10 +20,11 @@ | |
| 20 | |
| 21 | package require Tcl 8.4 ; # Required runtime. |
| 22 | package require snit ; # OO system. |
| 23 | package require vc::tools::trouble ; # Error reporting. |
| 24 | package require vc::tools::log ; # User feedback. |
| 25 | package require vc::fossil::import::cvs::pass ; # Pass management |
| 26 | package require vc::fossil::import::cvs::pass::collar ; # Pass I. |
| 27 | package require vc::fossil::import::cvs::repository ; # Repository management |
| 28 | package require vc::fossil::import::cvs::state ; # State storage |
| 29 | |
| @@ -80,11 +81,11 @@ | |
| 80 | } |
| 81 | } |
| 82 | |
| 83 | if {[llength $arguments] > 1} Usage |
| 84 | if {[llength $arguments] < 1} { Usage $nocvs } |
| 85 | repository base [lindex $arguments 0] |
| 86 | |
| 87 | Validate |
| 88 | return |
| 89 | } |
| 90 | |
| @@ -189,10 +190,11 @@ | |
| 189 | namespace eval ::vc::fossil::import::cvs { |
| 190 | namespace export option |
| 191 | namespace eval option { |
| 192 | namespace import ::vc::tools::trouble |
| 193 | namespace import ::vc::tools::log |
| 194 | namespace import ::vc::fossil::import::cvs::pass |
| 195 | namespace import ::vc::fossil::import::cvs::pass::collar |
| 196 | namespace import ::vc::fossil::import::cvs::repository |
| 197 | namespace import ::vc::fossil::import::cvs::state |
| 198 | } |
| 199 |
| --- tools/cvs2fossil/lib/c2f_option.tcl | |
| +++ tools/cvs2fossil/lib/c2f_option.tcl | |
| @@ -20,10 +20,11 @@ | |
| 20 | |
| 21 | package require Tcl 8.4 ; # Required runtime. |
| 22 | package require snit ; # OO system. |
| 23 | package require vc::tools::trouble ; # Error reporting. |
| 24 | package require vc::tools::log ; # User feedback. |
| 25 | package require vc::tools::misc ; # Misc. path reformatting. |
| 26 | package require vc::fossil::import::cvs::pass ; # Pass management |
| 27 | package require vc::fossil::import::cvs::pass::collar ; # Pass I. |
| 28 | package require vc::fossil::import::cvs::repository ; # Repository management |
| 29 | package require vc::fossil::import::cvs::state ; # State storage |
| 30 | |
| @@ -80,11 +81,11 @@ | |
| 81 | } |
| 82 | } |
| 83 | |
| 84 | if {[llength $arguments] > 1} Usage |
| 85 | if {[llength $arguments] < 1} { Usage $nocvs } |
| 86 | repository base [striptrailingslash [lindex $arguments 0]] |
| 87 | |
| 88 | Validate |
| 89 | return |
| 90 | } |
| 91 | |
| @@ -189,10 +190,11 @@ | |
| 190 | namespace eval ::vc::fossil::import::cvs { |
| 191 | namespace export option |
| 192 | namespace eval option { |
| 193 | namespace import ::vc::tools::trouble |
| 194 | namespace import ::vc::tools::log |
| 195 | namespace import ::vc::tools::misc::striptrailingslash |
| 196 | namespace import ::vc::fossil::import::cvs::pass |
| 197 | namespace import ::vc::fossil::import::cvs::pass::collar |
| 198 | namespace import ::vc::fossil::import::cvs::repository |
| 199 | namespace import ::vc::fossil::import::cvs::state |
| 200 | } |
| 201 |
+6
-1
| --- tools/cvs2fossil/lib/misc.tcl | ||
| +++ tools/cvs2fossil/lib/misc.tcl | ||
| @@ -57,16 +57,21 @@ | ||
| 57 | 57 | set list [lreplace $list $pos $pos] |
| 58 | 58 | return |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | # Delete item from list by name |
| 62 | + | |
| 63 | + proc striptrailingslash {path} { | |
| 64 | + # split and rejoin gets rid of a traling / character. | |
| 65 | + return [eval [linsert [file split $path] 0 file join]] | |
| 66 | + } | |
| 62 | 67 | |
| 63 | 68 | # # ## ### ##### ######## ############# |
| 64 | 69 | } |
| 65 | 70 | |
| 66 | 71 | namespace eval ::vc::tools::misc { |
| 67 | - namespace export sp nsp max ldelete | |
| 72 | + namespace export sp nsp max ldelete striptrailingslash | |
| 68 | 73 | } |
| 69 | 74 | |
| 70 | 75 | # ----------------------------------------------------------------------------- |
| 71 | 76 | # Ready |
| 72 | 77 | |
| 73 | 78 |
| --- tools/cvs2fossil/lib/misc.tcl | |
| +++ tools/cvs2fossil/lib/misc.tcl | |
| @@ -57,16 +57,21 @@ | |
| 57 | set list [lreplace $list $pos $pos] |
| 58 | return |
| 59 | } |
| 60 | |
| 61 | # Delete item from list by name |
| 62 | |
| 63 | # # ## ### ##### ######## ############# |
| 64 | } |
| 65 | |
| 66 | namespace eval ::vc::tools::misc { |
| 67 | namespace export sp nsp max ldelete |
| 68 | } |
| 69 | |
| 70 | # ----------------------------------------------------------------------------- |
| 71 | # Ready |
| 72 | |
| 73 |
| --- tools/cvs2fossil/lib/misc.tcl | |
| +++ tools/cvs2fossil/lib/misc.tcl | |
| @@ -57,16 +57,21 @@ | |
| 57 | set list [lreplace $list $pos $pos] |
| 58 | return |
| 59 | } |
| 60 | |
| 61 | # Delete item from list by name |
| 62 | |
| 63 | proc striptrailingslash {path} { |
| 64 | # split and rejoin gets rid of a traling / character. |
| 65 | return [eval [linsert [file split $path] 0 file join]] |
| 66 | } |
| 67 | |
| 68 | # # ## ### ##### ######## ############# |
| 69 | } |
| 70 | |
| 71 | namespace eval ::vc::tools::misc { |
| 72 | namespace export sp nsp max ldelete striptrailingslash |
| 73 | } |
| 74 | |
| 75 | # ----------------------------------------------------------------------------- |
| 76 | # Ready |
| 77 | |
| 78 |