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

[mhenoch at common-lisp.net]

Author: mhenoch
Date: Mon Feb 19 16:39:30 2007
New Revision: 96

Modified:
   cl-darcs/trunk/pull.lisp
Log:
Allow selecting which patches to pull


Modified: cl-darcs/trunk/pull.lisp
==============================================================================
--- cl-darcs/trunk/pull.lisp	(original)
+++ cl-darcs/trunk/pull.lisp	Mon Feb 19 16:39:30 2007
@@ -37,12 +37,14 @@
       (format t "~&Found these new patches:")
       (dolist (p only-theirs)
 	(format t "~& - ~A" p))
-      ;; XXX: This is where we pick which of their patches we want to
-      ;; pull.
-      (let* ((their-patches
+      (let* ((all-their-patches
 	      (mapcar (lambda (patchinfo)
 			(read-patch-from-repo theirrepo patchinfo))
 		      only-theirs))
+	     (their-patches
+	      (if (y-or-n-p "Pull all patches?")
+		  all-their-patches
+		  (select-patches all-their-patches)))
 	     (our-patches
 	      (mapcar (lambda (patchinfo)
 			(read-patch-from-repo ourrepo patchinfo))