SHA1 Hash:	ed13b28b13e139d0438d5ff54ddc4029373ecafb
Date:	2008-01-30 03:10:57
User:	aku
Comment:	Fixed the names for the case-sensitive file operations.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified tools/cvs2fossil/lib/c2f_pcollar.tcl from [08c3ec353c] to [e182265703].

@@ -115,12 +115,12 @@
 		set usr [UserPath $rcs isattic]
 		if {[IsSuperceded $base $rcs $usr $isattic]} continue
 
 		# XXX Checkme: not sure if this will still fail in the case where a directory does conflict with a file XXX
 		if {
-		    [fileexists_ci $base/$usr] &&
-		    [fileisdir_ci  $base/$usr]
+		    [fileexists_cs $base/$usr] &&
+		    [fileisdir_cs  $base/$usr]
 		} {
 		    trouble fatal "Directory name conflicts with filename."
 		    trouble fatal "Please remove or rename one of the following:"
 		    trouble fatal "    $base/$usr"
 		    trouble fatal "    $base/$rcs"
@@ -220,11 +220,11 @@
 
     proc IsSuperceded {base rcs usr isattic} {
 	::variable myignore
 
 	if {!$isattic}                     {return 0}
-	if {![fileexists_ci $base/$usr,v]} {return 0}
+	if {![fileexists_cs $base/$usr,v]} {return 0}
 
 	# We have a regular archive and an Attic archive refering to
 	# the same user visible file. Ignore the file in the Attic.
 	#
 	# By default this is a problem causing an abort after the pass

Modified tools/cvs2fossil/lib/misc.tcl from [c7b90ad47b] to [85ff794a48].

@@ -98,47 +98,47 @@
 	# We use glob to get the list of files (with proper case in
 	# the names) to perform our own, case-sensitive matching. WE
 	# use 8.5 features where possible, for clarity.
 
 	if {[package vsatisfies [package present Tcl] 8.5]} {
-	    proc fileexists_ci {path} {
+	    proc fileexists_cs {path} {
 		set dir  [::file dirname $path]
 		set file [::file tail    $path]
 		return [expr {$file in [glob -nocomplain -tail -directory $dir *]}]
 	    }
 
-	    proc fileisdir_ci {path} {
+	    proc fileisdir_cs {path} {
 		set dir  [::file dirname $path]
 		set file [::file tail    $path]
 		return [expr {$file in [glob -nocomplain -types d -tail -directory $dir *]}]
 	    }
 	} else {
-	    proc fileexists_ci {path} {
+	    proc fileexists_cs {path} {
 		set dir  [::file dirname $path]
 		set file [::file tail    $path]
 		return [expr {[lsearch [glob -nocomplain -tail -directory $dir *] $file] >= 0}]
 	    }
 
-	    proc fileisdir_ci {path} {
+	    proc fileisdir_cs {path} {
 		set dir  [::file dirname $path]
 		set file [::file tail    $path]
 		return [expr {[lsearch [glob -nocomplain -types d -tail -directory $dir *] $file] >= 0}]
 	    }
 	}
     } else {
-	proc fileexists_ci {path} { return [file exists      $path] }
-	proc fileisdir_ci  {path} { return [file isdirectory $path] }
+	proc fileexists_cs {path} { return [file exists      $path] }
+	proc fileisdir_cs  {path} { return [file isdirectory $path] }
     }
 
     # # ## ### ##### ######## #############
 }
 
 namespace eval ::vc::tools::misc {
     namespace export sp nsp max min max2 min2 ldelete
-    namespace export striptrailingslash fileexists_ci fileisdir_ci
+    namespace export striptrailingslash fileexists_cs fileisdir_cs
 }
 
 # -----------------------------------------------------------------------------
 # Ready
 
 package provide vc::tools::misc 1.0
 return