October 2006 - cl-darcs-cvs@lists.common-lisp.net

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

22 Oct '06

Author: mhenoch Date: Sun Oct 22 08:51:15 2006 New Revision: 61 Modified: cl-darcs/trunk/write-patch.lisp Log: Add WRITE-PATCH method for MERGER-PATCH Modified: cl-darcs/trunk/write-patch.lisp ============================================================================== --- cl-darcs/trunk/write-patch.lisp (original) +++ cl-darcs/trunk/write-patch.lisp Sun Oct 22 08:51:15 2006 @@ -150,3 +150,12 @@ (patch-move-to patch))) stream) (write-byte 10 stream)) +(defmethod write-patch ((patch merger-patch) stream) + (write-as-bytes "merger " stream) + (write-as-bytes (merger-version patch) stream) + (write-as-bytes " (" stream) + (write-byte 10 stream) + (write-patch (merger-first patch) stream) + (write-patch (merger-second patch) stream) + (write-as-byte #\) stream) + (write-byte 10 stream))

1 0

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

22 Oct '06

Author: mhenoch Date: Sun Oct 22 08:38:57 2006 New Revision: 60 Modified: cl-darcs/trunk/apply-patch.lisp cl-darcs/trunk/prefs.lisp Log: Add has-prefs-dir. Don't apply CHANGE-PREF-PATCHes unless there is a prefs directory. Modified: cl-darcs/trunk/apply-patch.lisp ============================================================================== --- cl-darcs/trunk/apply-patch.lisp (original) +++ cl-darcs/trunk/apply-patch.lisp Sun Oct 22 08:38:57 2006 @@ -89,15 +89,18 @@ (apply-patch-list (patches patch) repodir)) (defmethod apply-patch ((patch change-pref-patch) repodir) - (with-accessors ((pref change-pref-which) - (from change-pref-from) - (to change-pref-to)) patch - (let ((old-value (or (get-pref repodir pref) ""))) - (unless (string= from old-value) - (warn - "While changing pref ~S to ~S, expected old value to be ~S, but it was ~S." - pref to from old-value)) - (set-pref repodir pref to)))) + ;; Maybe we're applying the patch to a pristine directory, in which + ;; case we don't care about preferences. + (when (has-prefs-dir repodir) + (with-accessors ((pref change-pref-which) + (from change-pref-from) + (to change-pref-to)) patch + (let ((old-value (or (get-pref repodir pref) ""))) + (unless (string= from old-value) + (warn + "While changing pref ~S to ~S, expected old value to be ~S, but it was ~S." + pref to from old-value)) + (set-pref repodir pref to))))) (defmethod apply-patch ((patch add-file-patch) repodir) "Create a file in REPODIR, by PATCH." Modified: cl-darcs/trunk/prefs.lisp ============================================================================== --- cl-darcs/trunk/prefs.lisp (original) +++ cl-darcs/trunk/prefs.lisp Sun Oct 22 08:38:57 2006 @@ -16,6 +16,13 @@ (in-package :darcs) +(defun has-prefs-dir (repo) + "Return true if REPO has a _darcs/prefs subdirectory." + ;; This is currently only used for checking whether we should write + ;; preferences, so it doesn't matter that this implementation + ;; doesn't work for HTTP. + (fad:directory-exists-p (upath-subdir repo '("_darcs" "prefs")))) + (defun read-prefs (upath) "Read all preferences from repository at UPATH. Return an alist with strings."

1 0

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

22 Oct '06

Author: mhenoch Date: Sun Oct 22 08:26:30 2006 New Revision: 59 Modified: cl-darcs/trunk/write-patch.lisp Log: Use write-as-bytes instead of write-sequence in WRITE-PATCH for CHANGE-PREF-PATCH. Modified: cl-darcs/trunk/write-patch.lisp ============================================================================== --- cl-darcs/trunk/write-patch.lisp (original) +++ cl-darcs/trunk/write-patch.lisp Sun Oct 22 08:26:30 2006 @@ -134,9 +134,9 @@ (write-as-bytes "changepref " stream) (write-as-bytes (change-pref-which patch) stream) (write-byte 10 stream) - (write-sequence (change-pref-from patch) stream) + (write-as-bytes (change-pref-from patch) stream) (write-byte 10 stream) - (write-sequence (change-pref-to patch) stream) + (write-as-bytes (change-pref-to patch) stream) (write-byte 10 stream)) (defmethod write-patch ((patch move-patch) stream)

1 0

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

16 Oct '06

Author: mhenoch Date: Mon Oct 16 04:39:52 2006 New Revision: 58 Modified: cl-darcs/trunk/patch-core.lisp cl-darcs/trunk/unreadable-stream.lisp Log: Use print-unreadable-object. Modified: cl-darcs/trunk/patch-core.lisp ============================================================================== --- cl-darcs/trunk/patch-core.lisp (original) +++ cl-darcs/trunk/patch-core.lisp Mon Oct 16 04:39:52 2006 @@ -24,10 +24,8 @@ :documentation "List of patches making up the composite patch."))) (defmethod print-object ((patch composite-patch) stream) - (if *print-readably* - (call-next-method) - (format stream "#<~A: ~W>" - (type-of patch) (patches patch)))) + (print-unreadable-object (patch stream :type t) + (write (patches patch) :stream stream))) (defclass split-patch (patch) ((patches :accessor patches :initarg :patches :initform ()))) @@ -37,8 +35,8 @@ (:documentation "Base class for patches affecting a single file.")) (defmethod print-object ((patch file-patch) stream) - (if *print-readably* (call-next-method) - (format stream "#<~A: ~A>" (type-of patch) (patch-filename patch)))) + (print-unreadable-object (patch stream :type t) + (princ (patch-filename patch) stream))) (defclass hunk-patch (file-patch) ((line-number :accessor hunk-line-number :initarg :line-number @@ -50,12 +48,12 @@ (:documentation "A single patch \"hunk\".")) (defmethod print-object ((patch hunk-patch) stream) - (if *print-readably* (call-next-method) - (format stream "#<~A: ~A ~A~[~:;~:*-~A~]~[~:;~:*+~A~]>" - (type-of patch) (patch-filename patch) - (hunk-line-number patch) - (length (hunk-old-lines patch)) - (length (hunk-new-lines patch))))) + (print-unreadable-object (patch stream :type t) + (format stream "~A ~A~[~:;~:*-~A~]~[~:;~:*+~A~]" + (patch-filename patch) + (hunk-line-number patch) + (length (hunk-old-lines patch)) + (length (hunk-new-lines patch))))) (defclass add-file-patch (file-patch) () @@ -81,18 +79,19 @@ (:documentation "A patch that replaces one token with another.")) (defmethod print-object ((patch token-replace-patch) stream) - (if *print-readably* (call-next-method) - (format stream "#<~A: ~A: s/~A/~A/ (~S)>" (type-of patch) (patch-filename patch) - (old-token patch) (new-token patch) - (token-regexp patch)))) + (print-unreadable-object (patch stream :type t) + (format stream "~A: s/~A/~A/ (~S)" + (patch-filename patch) + (old-token patch) (new-token patch) + (token-regexp patch)))) (defclass directory-patch (patch) ((directory :accessor patch-directory :initarg :directory)) (:documentation "Base class for patches affecting a directory.")) (defmethod print-object ((patch directory-patch) stream) - (if *print-readably* (call-next-method) - (format stream "#<~A: ~A>" (type-of patch) (patch-directory patch)))) + (print-unreadable-object (patch stream :type t) + (princ (patch-directory patch) stream))) (defclass add-dir-patch (directory-patch) () @@ -112,14 +111,12 @@ (:documentation "A named patch.")) ;XXX: what does that mean? (defmethod print-object ((patch named-patch) stream) - (if *print-readably* - (call-next-method) - (let ((patchinfo (named-patch-patchinfo patch))) - (format stream "#<~A: ~A ~A: ~<~W~:>>" - (type-of patch) - (patchinfo-date patchinfo) - (patchinfo-name patchinfo) - (named-patch-patch patch))))) + (print-unreadable-object (patch stream :type t) + (let ((patchinfo (named-patch-patchinfo patch))) + (format stream "~A ~A: ~<~W~:>" + (patchinfo-date patchinfo) + (patchinfo-name patchinfo) + (named-patch-patch patch))))) (defclass change-pref-patch (patch) ((pref :initarg :pref :accessor change-pref-which) @@ -128,13 +125,11 @@ (:documentation "A patch for changing a preference.")) (defmethod print-object ((patch change-pref-patch) stream) - (if *print-readably* - (call-next-method) - (format stream "#<~A: ~A: s/~S/~S/>" - (type-of patch) - (change-pref-which patch) - (change-pref-from patch) - (change-pref-to patch)))) + (print-unreadable-object (patch stream :type t) + (format stream "~A: s/~S/~S/" + (change-pref-which patch) + (change-pref-from patch) + (change-pref-to patch)))) (defclass move-patch (patch) ((from :initarg :from :accessor patch-move-from) @@ -142,12 +137,10 @@ (:documentation "A patch that moves a file.")) (defmethod print-object ((patch move-patch) stream) - (if *print-readably* - (call-next-method) - (format stream "#<~A: ~A -> ~A>" - (type-of patch) - (patch-move-from patch) - (patch-move-to patch)))) + (print-unreadable-object (patch stream :type t) + (format stream "~A -> ~A" + (patch-move-from patch) + (patch-move-to patch)))) ;; XXX: this class is probably incorrect and insufficient. (defclass merger-patch (patch) @@ -159,14 +152,12 @@ (unwindings :initarg :unwindings :accessor merger-unwindings))) (defmethod print-object ((patch merger-patch) stream) - (if *print-readably* - (call-next-method) - (format stream "#<~A ~:[(inverted) ~;~]~A: ~A ~A>" - (type-of patch) - (merger-inverted patch) - (merger-version patch) - (merger-first patch) - (merger-second patch)))) + (print-unreadable-object (patch stream :type t) + (format stream "~:[(inverted) ~;~]~A: ~A ~A" + (merger-inverted patch) + (merger-version patch) + (merger-first patch) + (merger-second patch)))) ;; There are more kinds of patches... let's implement them when need ;; arises. Modified: cl-darcs/trunk/unreadable-stream.lisp ============================================================================== --- cl-darcs/trunk/unreadable-stream.lisp (original) +++ cl-darcs/trunk/unreadable-stream.lisp Mon Oct 16 04:39:52 2006 @@ -190,5 +190,5 @@ (push (list 0 (length line) line :line) buffer)))) (defmethod print-object ((object unreadable-stream) stream) - (if *print-readably* (call-next-method) - (format stream "#<~A ~A ~A>" (type-of object) (slot-value object 'buffer) (slot-value object 'stream)))) + (print-unreadable-object (object stream :type t) + (format stream "~A ~A" (slot-value object 'buffer) (slot-value object 'stream))))

1 0

[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