Author: mhenoch Date: Thu Feb 15 20:04:53 2007 New Revision: 90 Modified: cl-darcs/trunk/diff.lisp cl-darcs/trunk/util.lisp Log: Ignore boring files when diffing. Enable debug output from diff. Add diff-repo-display. Modified: cl-darcs/trunk/diff.lisp ============================================================================== --- cl-darcs/trunk/diff.lisp (original) +++ cl-darcs/trunk/diff.lisp Thu Feb 15 20:04:53 2007 @@ -159,23 +159,28 @@ (merge-pathnames file repo)) (pathname-string (pathname-to-string file))) - (cond - ((fad:directory-pathname-p file) - (unless (file-boring-p repo pathname-string) - ;; We have a non-boring subdirectory. + (unless (file-boring-p repo pathname-string) + (cond + ((fad:directory-pathname-p file) (setf patches (nconc patches - (diff-repo repo original-pathname modified-pathname))))) + (diff-repo repo original-pathname modified-pathname)))) - ((file-binary-p repo pathname-string) - (setf patches (nconc patches - (diff-binary-file original-pathname - modified-pathname - :filename pathname-string)))) + ((file-binary-p repo pathname-string) + (setf patches (nconc patches + (diff-binary-file original-pathname + modified-pathname + :filename pathname-string)))) - (t - (setf patches (nconc patches - (diff-file original-pathname - modified-pathname - :filename pathname-string))))))) + (t + (setf patches (nconc patches + (diff-file original-pathname + modified-pathname + :filename pathname-string)))))))) patches)))) + +(defun diff-repo-display (repo) + "Find changes in REPO and print them to *STANDARD-OUTPUT*." + (dolist (patch (diff-repo repo)) + (display-patch patch *standard-output*))) + Modified: cl-darcs/trunk/util.lisp ============================================================================== --- cl-darcs/trunk/util.lisp (original) +++ cl-darcs/trunk/util.lisp Thu Feb 15 20:04:53 2007 @@ -17,7 +17,7 @@ (in-package :darcs) (eval-when (:compile-toplevel :load-toplevel :execute) - (defparameter +debugged-modules+ '(get #|read-patch patchinfo|# apply-patch #|init upath|# util) + (defparameter +debugged-modules+ '(get #|read-patch patchinfo|# apply-patch #|init upath|# util diff) "Modules emitting debug output.")) (defvar *http-proxy* nil