Changeset 51

Timestamp:

10/06/06 19:55:15 (19 years ago)

Author:

Magnus Henoch

Message:

Add functions for keeping a pristine. Use it when getting and pulling.

Location:

cl-darcs/trunk

Files:

• get.lisp (modified) (1 diff)
• pristine.lisp (added)
• pull.lisp (modified) (1 diff)

cl-darcs/trunk/get.lisp ¶

@@ -65 +65 @@
           (append-inventory outname patchinfo)
           (format t ".")))
+      (format t "~&Creating pristine")
+      (create-pristine-from-tree outname)
       (format t "~&All done"))))
 

cl-darcs/trunk/pull.lisp ¶

@@ -50 +50 @@
                                                             :patches our-patches)))))
         (format t "~&Applying patches")
-        (dolist (p merged-patches)
-          (apply-patch p ourrepo)
-          ;; If this is not a named patch, our assumptions are
-          ;; challenged.
-          (append-inventory ourrepo (named-patch-patchinfo p))
-          (write-patch-to-repo p ourrepo)
-          (format t ".")))))
-  (format t "~&All done"))
+        (let ((applying-to-source t)
+              (source-and-pristine-differ nil))
+          (dolist (p merged-patches)
+            ;; First, copy the modified patch to the repository.
+            (write-patch-to-repo p ourrepo)
+            ;; Then, apply it to the pristine copy.  This couldn't
+            ;; possibly fail.
+            (apply-patch-to-pristine p ourrepo)
+            ;; Note the patch in the inventory.
+            (append-inventory ourrepo (named-patch-patchinfo p))
+            ;; And finally apply the patch to the real source.  This
+            ;; could fail if the source has been modified.  Deal with
+            ;; that in a crude way.  XXX: it is wasteful to apply
+            ;; patches twice.
+            (when applying-to-source
+              (restart-case
+                  (apply-patch p ourrepo)
+                (skip-this ()
+                    :report "Don't apply this patch to the source tree (it was applied to the pristine tree)"
+                    (setf source-and-pristine-differ t))
+                (skip-all ()
+                    :report "Stop trying to apply patches to the source tree (they will be applied to the pristine tree)"
+                    (setf source-and-pristine-differ t)
+                    (setf applying-to-source nil))))
+            (format t "."))
+          (when source-and-pristine-differ
+            (format t "~&~<Some patches could not be applied to the source tree.~
+You should manually merge changes from the pristine tree in _darcs/pristine/.~:@>")))))
+    (format t "~&All done")))