Changeset 178

Timestamp:

03/24/08 00:08:39 (17 years ago)

Author:

Magnus Henoch

Message:

GET-COMMON-AND-UNCOMMON returns patchinfo in correct order

File:

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

cl-darcs/trunk/repo.lisp ¶

@@ -168 +168 @@
   ;; Of course, there are possible optimizations here, in particular
   ;; regarding tags, but this will do for now.
-  (let ((ours-list (apply #'append (reverse ours)))
-        (theirs-list (apply #'append (reverse theirs))))
-    (values (intersection ours-list theirs-list :test #'equalp)
-            (set-difference ours-list theirs-list :test #'equalp)
-            (set-difference theirs-list ours-list :test #'equalp))))
+  (setf ours (apply #'append (reverse ours)))
+  (setf theirs (apply #'append (reverse theirs)))
+  (let (common-patches our-patches their-patches)
+    (loop
+       for ou on ours and th on theirs
+       while (equalp (car ou) (car th))
+       collect (car ou) into common
+       finally
+         (setf common-patches common
+               our-patches ou
+               their-patches th))
+    (values common-patches our-patches their-patches)))
+