Diff
Not logged in

Differences From:

File tools/cvs2fossil/lib/c2f_option.tcl part of check-in [3bde1a2e2f] - Added new option --trunk-only, state and processing. by aku on 2007-10-17 03:09:58. [view]

To:

File tools/cvs2fossil/lib/c2f_option.tcl part of check-in [9f3fd3ec4b] - 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. by aku on 2007-10-23 04:34:12. [view]

@@ -21,8 +21,9 @@
 package require Tcl 8.4                               ; # Required runtime.
 package require snit                                  ; # OO system.
 package require vc::tools::trouble                    ; # Error reporting.
 package require vc::tools::log                        ; # User feedback.
+package require vc::tools::misc                       ; # Misc. path reformatting.
 package require vc::fossil::import::cvs::pass         ; # Pass management
 package require vc::fossil::import::cvs::pass::collar ; # Pass I.
 package require vc::fossil::import::cvs::repository   ; # Repository management
 package require vc::fossil::import::cvs::state        ; # State storage
@@ -81,9 +82,9 @@
 	}
 
 	if {[llength $arguments] > 1} Usage
 	if {[llength $arguments] < 1} { Usage $nocvs }
-	repository base [lindex $arguments 0]
+	repository base [striptrailingslash [lindex $arguments 0]]
 
 	Validate
 	return
     }
@@ -190,8 +191,9 @@
     namespace export option
     namespace eval option {
 	namespace import ::vc::tools::trouble
 	namespace import ::vc::tools::log
+	namespace import ::vc::tools::misc::striptrailingslash
 	namespace import ::vc::fossil::import::cvs::pass
 	namespace import ::vc::fossil::import::cvs::pass::collar
 	namespace import ::vc::fossil::import::cvs::repository
 	namespace import ::vc::fossil::import::cvs::state