Changeset 96

Timestamp:

02/19/07 21:39:30 (18 years ago)

Author:

Magnus Henoch

Message:

Allow selecting which patches to pull

File:

• cl-darcs/trunk/pull.lisp (modified) (1 diff)

cl-darcs/trunk/pull.lisp ¶

@@ -38 +38 @@
       (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)