[Cl-darcs-cvs] r130 - cl-darcs/trunk

[mhenoch at common-lisp.net]

Author: mhenoch
Date: Fri Aug 24 13:20:35 2007
New Revision: 130

Modified:
   cl-darcs/trunk/pending.lisp
Log:
Fix ADD-FILE existing file test


Modified: cl-darcs/trunk/pending.lisp
==============================================================================
--- cl-darcs/trunk/pending.lisp	(original)
+++ cl-darcs/trunk/pending.lisp	Fri Aug 24 13:20:35 2007
@@ -49,7 +49,8 @@
 	    (error "~A is not a relative pathname going strictly down." file))
 	  (setf type (if (fad:directory-pathname-p file) :directory :file)))
 	(progn
-	  (setf type (if (fad:directory-exists-p (fad:pathname-as-directory file))
+	  (setf type (if (fad:directory-exists-p 
+			  (fad:pathname-as-directory (merge-pathnames file repo)))
 			 :directory 
 			 :file))
 	  (setf file (sanitize-filename file :type type))))
@@ -64,6 +65,7 @@
 		     (fad:file-exists-p working-file)
 		     (fad:directory-exists-p working-file)))
 	(error "~A does not exist in the working directory." (pathname-to-string file))))
+    ;; XXX: check that all parent directories exist, either in pristine or in pending
 
     (add-to-pending
      repo