- cl-darcs-cvs@lists.common-lisp.net - mailman3.common-lisp.net

[Cl-darcs-cvs] r57 - cl-darcs/tags/0.1.0
by mhenoch＠common-lisp.net 14 Oct '06

14 Oct '06

Author: mhenoch Date: Sat Oct 14 17:06:38 2006 New Revision: 57 Added: cl-darcs/tags/0.1.0/ - copied from r56, cl-darcs/trunk/ Log: Tag 0.1.0

1 0

[Cl-darcs-cvs] r56 - cl-darcs/trunk
by mhenoch＠common-lisp.net 12 Oct '06

12 Oct '06

Author: mhenoch Date: Thu Oct 12 08:38:14 2006 New Revision: 56 Modified: cl-darcs/trunk/README Log: List dependencies in README. Modified: cl-darcs/trunk/README ============================================================================== --- cl-darcs/trunk/README (original) +++ cl-darcs/trunk/README Thu Oct 12 08:38:14 2006 @@ -56,6 +56,18 @@ SBCL as well. Users of non-Unix systems probably need to change MAKE-TEMP-FILE-NAME in util.lisp. +* Dependencies + + - split-sequence: http://www.cl-user.net/asp/libs/split-sequence + - Portable AllegroServe: http://portableaserve.sourceforge.net/ + - trivial-gray-streams: + http://www.cl-user.net/asp/libs/trivial-gray-streams + - Ironclad: http://www.cl-user.net/asp/libs/ironclad + - CL-FAD: http://weitz.de/cl-fad/ + - For CLISP, you need SB-SHA1: http://www.cliki.net/sb-sha1 + +All of these are ASDF-INSTALLable. + * License cl-darcs is covered by the GPL, like the original darcs client.

1 0

[Cl-darcs-cvs] r55 - cl-darcs/trunk
by mhenoch＠common-lisp.net 12 Oct '06

12 Oct '06

Author: mhenoch Date: Thu Oct 12 08:30:05 2006 New Revision: 55 Modified: cl-darcs/trunk/README Log: Mention diff command in README Modified: cl-darcs/trunk/README ============================================================================== --- cl-darcs/trunk/README (original) +++ cl-darcs/trunk/README Thu Oct 12 08:30:05 2006 @@ -24,7 +24,10 @@ cl-darcs currently doesn't try to merge changes in your local tree with patches you pull; you have to do that manually if you want to -edit files. +edit files. For now, you need an external tool to find the local +changes, e.g: + +diff -x _darcs -ru _darcs/pristine/ . * Configuration

1 0

[Cl-darcs-cvs] r54 - cl-darcs/trunk
by mhenoch＠common-lisp.net 11 Oct '06

11 Oct '06

Author: mhenoch Date: Wed Oct 11 18:50:44 2006 New Revision: 54 Modified: cl-darcs/trunk/cl-darcs.asd Log: Add pristine.lisp to ASDF file Modified: cl-darcs/trunk/cl-darcs.asd ============================================================================== --- cl-darcs/trunk/cl-darcs.asd (original) +++ cl-darcs/trunk/cl-darcs.asd Wed Oct 11 18:50:44 2006 @@ -39,6 +39,7 @@ (:file "write-patch" :depends-on ("patch-core")) (:file "apply-patch" :depends-on ("patch-core")) (:file "invert-patch" :depends-on ("patch-core")) + (:file "pristine" :depends-on ("patch-core")) (:file "touching" :depends-on ("patch-core")) (:file "commute" :depends-on ("patch-core")) (:file "merge" :depends-on ("patch-core"))

1 0

[Cl-darcs-cvs] r53 - cl-darcs/trunk
by mhenoch＠common-lisp.net 06 Oct '06

06 Oct '06

Author: mhenoch Date: Fri Oct 6 16:20:15 2006 New Revision: 53 Modified: cl-darcs/trunk/README Log: More README hacking Modified: cl-darcs/trunk/README ============================================================================== --- cl-darcs/trunk/README (original) +++ cl-darcs/trunk/README Fri Oct 6 16:20:15 2006 @@ -9,24 +9,29 @@ At the REPL: (asdf:oos 'asdf:load-op :cl-darcs) -(in-package :cl-darcs) -(get-repo "http://path/to/repo" "/local/non-existent/directory/") +(darcs:get-repo "http://path/to/repo" "/local/non-existent/directory/") Or if you want to select which patches to apply: -(get-repo "http://path/to/repo" "/local/repo-dir/" :query t) +(darcs:get-repo "http://path/to/repo" "/local/repo-dir/" :query t) To pull new patches from a repo (the address from the remote repo is optional, as it defaults to where you got the tree from): -(pull "/local/repo-dir/") +(darcs:pull "/local/repo-dir/") or -(pull "/local/repo-dir/" "http://path/to/repo") +(darcs:pull "/local/repo-dir/" "http://path/to/repo") cl-darcs currently doesn't try to merge changes in your local tree with patches you pull; you have to do that manually if you want to edit files. +* Configuration + +cl-darcs can use an HTTP proxy: + +(setf darcs:*http-proxy* "proxy.example.com:3128") + * Known bugs and misfeatures Above all, cl-darcs is currently a read-only client. There is no

1 0

[Cl-darcs-cvs] r52 - cl-darcs/trunk
by mhenoch＠common-lisp.net 06 Oct '06

06 Oct '06

Author: mhenoch Date: Fri Oct 6 16:17:24 2006 New Revision: 52 Modified: cl-darcs/trunk/README Log: Update README Modified: cl-darcs/trunk/README ============================================================================== --- cl-darcs/trunk/README (original) +++ cl-darcs/trunk/README Fri Oct 6 16:17:24 2006 @@ -19,8 +19,29 @@ To pull new patches from a repo (the address from the remote repo is optional, as it defaults to where you got the tree from): +(pull "/local/repo-dir/") +or (pull "/local/repo-dir/" "http://path/to/repo") +cl-darcs currently doesn't try to merge changes in your local tree +with patches you pull; you have to do that manually if you want to +edit files. + +* Known bugs and misfeatures + +Above all, cl-darcs is currently a read-only client. There is no +support for generating diffs or committing patches. + +Some combinations of merger patches are not properly handled. You +should be able to get a tree with a real darcs client, and then use +cl-darcs for pulling new patches. + +Repositories can be fetched only from local files and HTTP. + +Tags are not faithfully reproduced. + +Checkpoints are not used. + * Compatibility I primarily develop cl-darcs on CLISP, but try to keep it working on @@ -36,7 +57,8 @@ * Links Project page: http://common-lisp.net/project/cl-darcs/ -(the place to look for mailing lists) +Mailing list: cl-darcs-devel(a)common-lisp.net + http://common-lisp.net/cgi-bin/mailman/listinfo/cl-darcs-devel The original darcs: http://www.darcs.net/

1 0

[Cl-darcs-cvs] r51 - cl-darcs/trunk
by mhenoch＠common-lisp.net 06 Oct '06

06 Oct '06

Author: mhenoch Date: Fri Oct 6 15:55:15 2006 New Revision: 51 Added: cl-darcs/trunk/pristine.lisp Modified: cl-darcs/trunk/get.lisp cl-darcs/trunk/pull.lisp Log: Add functions for keeping a pristine. Use it when getting and pulling. Modified: cl-darcs/trunk/get.lisp ============================================================================== --- cl-darcs/trunk/get.lisp (original) +++ cl-darcs/trunk/get.lisp Fri Oct 6 15:55:15 2006 @@ -64,6 +64,8 @@ ;; What happens when adding patches one by one? (append-inventory outname patchinfo) (format t "."))) + (format t "~&Creating pristine") + (create-pristine-from-tree outname) (format t "~&All done")))) (defun select-some-patches (patchinfo-list) Added: cl-darcs/trunk/pristine.lisp ============================================================================== --- (empty file) +++ cl-darcs/trunk/pristine.lisp Fri Oct 6 15:55:15 2006 @@ -0,0 +1,28 @@ +;;; Copyright (C) 2006 Magnus Henoch +;;; +;;; This program is free software; you can redistribute it and/or +;;; modify it under the terms of the GNU General Public License as +;;; published by the Free Software Foundation; either version 2 of the +;;; License, or (at your option) any later version. +;;; +;;; This program is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;; General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with this program; if not, write to the Free Software +;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +(in-package :darcs) + +(defun create-pristine-from-tree (repodir) + "Copy the checked-out tree at REPODIR to get a pristine tree." + (let* ((darcs-dir (upath-subdir repodir '("_darcs"))) + (pristine-dir (upath-subdir darcs-dir '("pristine")))) + (make-dir pristine-dir) + (copy-directory repodir pristine-dir :excluding (list darcs-dir)))) + +(defun apply-patch-to-pristine (patch repodir) + "Apply PATCH to the pristine tree in REPODIR." + (apply-patch patch (upath-subdir repodir '("_darcs" "pristine")))) Modified: cl-darcs/trunk/pull.lisp ============================================================================== --- cl-darcs/trunk/pull.lisp (original) +++ cl-darcs/trunk/pull.lisp Fri Oct 6 15:55:15 2006 @@ -49,11 +49,32 @@ (make-instance 'composite-patch :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")))

1 0

[Cl-darcs-cvs] r50 - cl-darcs/trunk
by mhenoch＠common-lisp.net 06 Oct '06

06 Oct '06

Author: mhenoch Date: Fri Oct 6 15:50:49 2006 New Revision: 50 Modified: cl-darcs/trunk/cl-darcs.asd Log: Load write-patch.lisp in ASDF file Modified: cl-darcs/trunk/cl-darcs.asd ============================================================================== --- cl-darcs/trunk/cl-darcs.asd (original) +++ cl-darcs/trunk/cl-darcs.asd Fri Oct 6 15:50:49 2006 @@ -36,6 +36,7 @@ (:file "patch-core" :depends-on ("util")) (:file "read-patch" :depends-on ("patch-core")) + (:file "write-patch" :depends-on ("patch-core")) (:file "apply-patch" :depends-on ("patch-core")) (:file "invert-patch" :depends-on ("patch-core")) (:file "touching" :depends-on ("patch-core"))

1 0

[Cl-darcs-cvs] r49 - cl-darcs/trunk
by mhenoch＠common-lisp.net 06 Oct '06

06 Oct '06

Author: mhenoch Date: Fri Oct 6 15:50:11 2006 New Revision: 49 Modified: cl-darcs/trunk/write-patch.lisp Log: Write newline after { when writing composite patches Modified: cl-darcs/trunk/write-patch.lisp ============================================================================== --- cl-darcs/trunk/write-patch.lisp (original) +++ cl-darcs/trunk/write-patch.lisp Fri Oct 6 15:50:11 2006 @@ -43,6 +43,7 @@ (defmethod write-patch ((patch composite-patch) stream) (write-as-byte #\{ stream) + (write-byte 10 stream) (dolist (part (patches patch)) (write-patch part stream)) (write-as-byte #\} stream)

1 0

[Cl-darcs-cvs] r48 - cl-darcs/trunk
by mhenoch＠common-lisp.net 06 Oct '06

06 Oct '06

Author: mhenoch Date: Fri Oct 6 15:49:46 2006 New Revision: 48 Modified: cl-darcs/trunk/write-patch.lisp Log: Use compress-file in write-patch-to-repo Modified: cl-darcs/trunk/write-patch.lisp ============================================================================== --- cl-darcs/trunk/write-patch.lisp (original) +++ cl-darcs/trunk/write-patch.lisp Fri Oct 6 15:49:46 2006 @@ -17,14 +17,16 @@ (in-package :darcs) (defun write-patch-to-repo (patch repo) - "Write the named patch PATCH to REPO, under correct filename." + "Write the named patch PATCH to REPO, compressed, under correct filename." (let ((filename (upath-subdir repo '("_darcs" "patches") (patchinfo-make-filename (named-patch-patchinfo patch))))) - (with-open-file (out filename :direction :output :element-type '(unsigned-byte 8) - :if-exists :error) - (write-patch patch out)))) + (with-temp-file-name tmp-file + (with-open-file (out tmp-file :direction :output :element-type '(unsigned-byte 8) + :if-exists :error) + (write-patch patch out)) + (compress-file tmp-file filename)))) (defgeneric write-patch (patch stream) (:documentation "Write PATCH to STREAM, in darcs patch format.

1 0