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

[mhenoch at common-lisp.net]

Author: mhenoch
Date: Wed Nov 22 15:34:51 2006
New Revision: 69

Modified:
   cl-darcs/trunk/diff.lisp
Log:
Skip binary files in diff-repo for now


Modified: cl-darcs/trunk/diff.lisp
==============================================================================
--- cl-darcs/trunk/diff.lisp	(original)
+++ cl-darcs/trunk/diff.lisp	Wed Nov 22 15:34:51 2006
@@ -74,22 +74,26 @@
 	 (modified-wild (merge-pathnames wild modified))
 	 patches)
     (dolist (original-pathname (fad:list-directory original))
-      (let ((relative-pathname 
-	     (translate-pathname original-pathname original-wild repo-wild))
+      (let ((pathname-string
+	     (pathname-to-string
+	      (translate-pathname original-pathname original-wild repo-wild)))
 	    (modified-pathname
 	     (translate-pathname original-pathname original-wild modified-wild)))
 	(cond
 	  ((fad:directory-pathname-p original-pathname)
-	   (format t "~&Skipping directory ~A for now" original-pathname)
+	   (format t "~&Skipping directory ~A for now" modified-pathname)
 	   ;; 	 (let ((last-element (car (last (pathname-directory original-pathname)))))
 	   ;; 	   (unless (file-boring-p repo last-element)
 	   ;; 	     ;; We have a non-boring subdirectory.
 	   )
+
+	  ((file-binary-p repo pathname-string)
+	   (format t "~&Skipping binary file ~A for now" modified-pathname))
+
 	  (t
 	   (setf patches (nconc patches 
 				(diff-file original-pathname
 					   modified-pathname
-					   :filename 
-					   (pathname-to-string relative-pathname))))))))
+					   :filename pathname-string)))))))
 
     patches))