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

[Cl-darcs-cvs] r84 - cl-darcs/trunk
by mhenoch＠common-lisp.net 28 Nov '06

28 Nov '06

Author: mhenoch Date: Mon Nov 27 20:36:54 2006 New Revision: 84 Modified: cl-darcs/trunk/packages.lisp Log: Export record-changes instead of record-patches Modified: cl-darcs/trunk/packages.lisp ============================================================================== --- cl-darcs/trunk/packages.lisp (original) +++ cl-darcs/trunk/packages.lisp Mon Nov 27 20:36:54 2006 @@ -5,4 +5,4 @@ (:nicknames :cl-darcs) (:export #:get-repo #:pull #:diff-repo #:*http-proxy* - #:record-patches #:create-repo)) + #:record-changes #:create-repo))

1 0

[Cl-darcs-cvs] r83 - cl-darcs/trunk
by mhenoch＠common-lisp.net 28 Nov '06

28 Nov '06

Author: mhenoch Date: Mon Nov 27 20:36:32 2006 New Revision: 83 Modified: cl-darcs/trunk/get.lisp cl-darcs/trunk/packages.lisp Log: Add and export create-repo Modified: cl-darcs/trunk/get.lisp ============================================================================== --- cl-darcs/trunk/get.lisp (original) +++ cl-darcs/trunk/get.lisp Mon Nov 27 20:36:32 2006 @@ -16,6 +16,12 @@ (in-package :darcs) +(defun create-repo (repodir) + "Create an empty repository." + (setf repodir (fad:pathname-as-directory repodir)) + (prepare-new-repo repodir) + (create-pristine-from-tree repodir)) + ;; get_cmd in Get.lhs (defun get-repo (inrepodir outname &key (partial nil) (query nil)) (setf outname (fad:pathname-as-directory outname)) Modified: cl-darcs/trunk/packages.lisp ============================================================================== --- cl-darcs/trunk/packages.lisp (original) +++ cl-darcs/trunk/packages.lisp Mon Nov 27 20:36:32 2006 @@ -5,4 +5,4 @@ (:nicknames :cl-darcs) (:export #:get-repo #:pull #:diff-repo #:*http-proxy* - #:record-patches)) + #:record-patches #:create-repo))

1 0

[Cl-darcs-cvs] r82 - cl-darcs/trunk
by mhenoch＠common-lisp.net 28 Nov '06

28 Nov '06

Author: mhenoch Date: Mon Nov 27 19:29:54 2006 New Revision: 82 Modified: cl-darcs/trunk/record.lisp Log: Display patches before asking whether to record them. Handle recording with empty log message. Modified: cl-darcs/trunk/record.lisp ============================================================================== --- cl-darcs/trunk/record.lisp (original) +++ cl-darcs/trunk/record.lisp Mon Nov 27 19:29:54 2006 @@ -33,7 +33,8 @@ (format nil "~4,'0d~2,'0d~2,'0d~2,'0d~2,'0d~2,'0d" year month date hour minute second)) date) - :log (split-sequence:split-sequence #\Newline log))) + :log (when log + (split-sequence:split-sequence #\Newline log)))) (patch (make-instance 'named-patch :patchinfo patchinfo :dependencies nil @@ -60,6 +61,7 @@ (loop while (setf patches (remove nil patches)) do ;; Should we include this patch? + (display-patch (car patches) *query-io*) (if (y-or-n-p "Record patch ~A?" (car patches)) (progn ;; Yes, just add it to the list and go on.

1 0

[Cl-darcs-cvs] r81 - cl-darcs/trunk
by mhenoch＠common-lisp.net 28 Nov '06

28 Nov '06

Author: mhenoch Date: Mon Nov 27 19:15:21 2006 New Revision: 81 Added: cl-darcs/trunk/display-patch.lisp Modified: cl-darcs/trunk/cl-darcs.asd Log: Add display-patch.lisp Modified: cl-darcs/trunk/cl-darcs.asd ============================================================================== --- cl-darcs/trunk/cl-darcs.asd (original) +++ cl-darcs/trunk/cl-darcs.asd Mon Nov 27 19:15:21 2006 @@ -45,6 +45,7 @@ (:file "write-patch" :depends-on ("patch-core")) (:file "apply-patch" :depends-on ("patch-core")) (:file "invert-patch" :depends-on ("patch-core")) + (:file "display-patch" :depends-on ("patch-core")) (:file "pristine" :depends-on ("patch-core")) (:file "touching" :depends-on ("patch-core")) (:file "commute" :depends-on ("patch-core")) Added: cl-darcs/trunk/display-patch.lisp ============================================================================== --- (empty file) +++ cl-darcs/trunk/display-patch.lisp Mon Nov 27 19:15:21 2006 @@ -0,0 +1,36 @@ +;;; 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) + +(defgeneric display-patch (patch stream) + (:documentation + "Print an elaborate and readable description of PATCH to STREAM.")) + +(defmethod display-patch ((patch patch) stream) + "When no display method is defined, write a terse description." + (print patch stream)) + +(defmethod display-patch ((patch hunk-patch) stream) + (format stream "~&~A: ~A~[~:;~:*-~A~]~[~:;~:*+~A~]" + (patch-filename patch) + (hunk-line-number patch) + (length (hunk-old-lines patch)) + (length (hunk-new-lines patch))) + (dolist (old (hunk-old-lines patch)) + (format stream "~&-~A" (bytes-to-string old))) + (dolist (new (hunk-new-lines patch)) + (format stream "~&+~A" (bytes-to-string new))))

1 0

[Cl-darcs-cvs] r80 - cl-darcs/trunk
by mhenoch＠common-lisp.net 27 Nov '06

27 Nov '06

Author: mhenoch Date: Mon Nov 27 18:48:08 2006 New Revision: 80 Modified: cl-darcs/trunk/README Log: Mention record-changes in README Modified: cl-darcs/trunk/README ============================================================================== --- cl-darcs/trunk/README (original) +++ cl-darcs/trunk/README Mon Nov 27 18:48:08 2006 @@ -22,12 +22,19 @@ or (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. For now, you need an external tool to find the local -changes, e.g: +When pulling, the new patches will be applied on top of any unrecorded +changes, which has a good chance of not working. -diff -x _darcs -ru _darcs/pristine/ . +To record your own changes: + +(darcs:record-changes "/local/repo-dir/" + "Short patch description" + "my-address(a)example.com" + :now + "Longer, possibly multi-line, description. +Or just NIL.") + +You will be asked about which changes should be recorded. * Configuration

1 0

[Cl-darcs-cvs] r79 - cl-darcs/trunk
by mhenoch＠common-lisp.net 27 Nov '06

27 Nov '06

Author: mhenoch Date: Mon Nov 27 18:31:58 2006 New Revision: 79 Modified: cl-darcs/trunk/packages.lisp Log: Export record-patches Modified: cl-darcs/trunk/packages.lisp ============================================================================== --- cl-darcs/trunk/packages.lisp (original) +++ cl-darcs/trunk/packages.lisp Mon Nov 27 18:31:58 2006 @@ -4,4 +4,5 @@ (:use :cl) (:nicknames :cl-darcs) (:export - #:get-repo #:pull #:diff-repo #:*http-proxy*)) + #:get-repo #:pull #:diff-repo #:*http-proxy* + #:record-patches))

1 0

[Cl-darcs-cvs] r78 - cl-darcs/trunk
by mhenoch＠common-lisp.net 27 Nov '06

27 Nov '06

Author: mhenoch Date: Mon Nov 27 18:31:02 2006 New Revision: 78 Modified: cl-darcs/trunk/record.lisp Log: Add select-patches and use it Modified: cl-darcs/trunk/record.lisp ============================================================================== --- cl-darcs/trunk/record.lisp (original) +++ cl-darcs/trunk/record.lisp Mon Nov 27 18:31:02 2006 @@ -51,4 +51,47 @@ (unless patches (error "Nothing to record.")) - (record-patches repo name author date log patches))) + (record-patches repo name author date log (select-patches patches)))) + +(defun select-patches (patches) + "Ask the user to select some of PATCHES. +Do the necessary commutation and dependency elimination." + (let (patches-to-record) + (loop while (setf patches (remove nil patches)) + do + ;; Should we include this patch? + (if (y-or-n-p "Record patch ~A?" (car patches)) + (progn + ;; Yes, just add it to the list and go on. + (push (car patches) patches-to-record) + (setf patches (cdr patches))) + ;; No, we need to commute it through the rest of the patches. + (loop for commute-patches on (cdr patches) + ;; Try to commute it with the next patch in line. + do (let ((commute-result (commute (car commute-patches) (car patches)))) + (if commute-result + ;; Commutation succeeded; use the altered patches. + (destructuring-bind (commuted-current commuted-future) commute-result + (setf (car patches) commuted-current) + (setf (car commute-patches) commuted-future)) + ;; Commutation failed; (car commute-patches) depends on (car patches). + ;; Try to commute them together. + (progn + ;; Turn the patch we are commuting through + ;; the list into a composite patch, unless it is + ;; one already. Append the dependency. + (etypecase (car patches) + (composite-patch + (nconc (patches (car patches)) + (list (car commute-patches)))) + (patch + (setf (car patches) + (make-instance 'composite-patch + :patches (list + (car patches) + (car commute-patches)))))) + ;; Drop the dependency from the list of + ;; patches to consider. + (setf (car commute-patches) nil)))) + finally (setf patches (cdr patches))))) + (nreverse patches-to-record)))

1 0

[Cl-darcs-cvs] r77 - cl-darcs/trunk
by mhenoch＠common-lisp.net 27 Nov '06

27 Nov '06

Author: mhenoch Date: Mon Nov 27 17:50:51 2006 New Revision: 77 Added: cl-darcs/trunk/record.lisp Modified: cl-darcs/trunk/cl-darcs.asd Log: Add record.lisp Modified: cl-darcs/trunk/cl-darcs.asd ============================================================================== --- cl-darcs/trunk/cl-darcs.asd (original) +++ cl-darcs/trunk/cl-darcs.asd Mon Nov 27 17:50:51 2006 @@ -38,6 +38,7 @@ (:file "prefs" :depends-on ("util")) (:file "repo" :depends-on ("util")) (:file "diff" :depends-on ("util")) + (:file "record" :depends-on ("util")) (:file "patch-core" :depends-on ("util")) (:file "read-patch" :depends-on ("patch-core")) Added: cl-darcs/trunk/record.lisp ============================================================================== --- (empty file) +++ cl-darcs/trunk/record.lisp Mon Nov 27 17:50:51 2006 @@ -0,0 +1,54 @@ +;;; 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 record-patches (repo name author date log patches) + "Record PATCHES in REPO. +NAME is the name of the patch, a description of one line. +AUTHOR is the e-mail address (or other identifier) of the author. +DATE is the date in YYYYMMDDHHMMSS format, or the keyword :NOW. +LOG is either NIL or a possibly multi-line description of the patch. +PATCHES is a list of patches that make up the change." + (let* ((patchinfo + (make-patchinfo + :name name :author author + :date (if (eql date :now) + (multiple-value-bind + (second minute hour date month year) + (get-decoded-time) + (format nil "~4,'0d~2,'0d~2,'0d~2,'0d~2,'0d~2,'0d" + year month date hour minute second)) + date) + :log (split-sequence:split-sequence #\Newline log))) + (patch (make-instance 'named-patch + :patchinfo patchinfo + :dependencies nil + :patch + (make-instance 'composite-patch + :patches patches)))) + (write-patch-to-repo patch repo) + (apply-patch-to-pristine patch repo) + (append-inventory repo patchinfo))) + +(defun record-changes (repo name author date log) + "Record changes in REPO. +Arguments as to `record-patches'." + (let ((patches (diff-repo repo))) + (unless patches + (error "Nothing to record.")) + + (record-patches repo name author date log patches)))

1 0

[Cl-darcs-cvs] r76 - cl-darcs/trunk
by mhenoch＠common-lisp.net 27 Nov '06

27 Nov '06

Author: mhenoch Date: Mon Nov 27 17:26:00 2006 New Revision: 76 Modified: cl-darcs/trunk/diff.lisp Log: Darcs line numbers start at 1. Modified: cl-darcs/trunk/diff.lisp ============================================================================== --- cl-darcs/trunk/diff.lisp (original) +++ cl-darcs/trunk/diff.lisp Mon Nov 27 17:26:00 2006 @@ -77,7 +77,7 @@ (push (make-instance 'hunk-patch :filename filename - :line-number (difflib:opcode-j1 opcode) + :line-number (1+ (difflib:opcode-j1 opcode)) :old (subseq original-lines (difflib:opcode-i1 opcode) (difflib:opcode-i2 opcode))

1 0

[Cl-darcs-cvs] r75 - cl-darcs/trunk
by mhenoch＠common-lisp.net 27 Nov '06

27 Nov '06

Author: mhenoch Date: Mon Nov 27 16:42:25 2006 New Revision: 75 Modified: cl-darcs/trunk/cl-darcs.asd Log: Include diff.lisp in ASDF file Modified: cl-darcs/trunk/cl-darcs.asd ============================================================================== --- cl-darcs/trunk/cl-darcs.asd (original) +++ cl-darcs/trunk/cl-darcs.asd Mon Nov 27 16:42:25 2006 @@ -37,6 +37,7 @@ (:file "init" :depends-on ("util")) (:file "prefs" :depends-on ("util")) (:file "repo" :depends-on ("util")) + (:file "diff" :depends-on ("util")) (:file "patch-core" :depends-on ("util")) (:file "read-patch" :depends-on ("patch-core"))

1 0