April 2008 - cl-darcs-cvs@lists.common-lisp.net

[Cl-darcs-cvs] r195 - cl-darcs/trunk
by mhenoch＠common-lisp.net 02 Apr '08

02 Apr '08

Author: mhenoch Date: Wed Apr 2 16:32:07 2008 New Revision: 195 Added: cl-darcs/trunk/dump-clisp.lisp cl-darcs/trunk/dump-sbcl.lisp Log: Commit dump scripts Added: cl-darcs/trunk/dump-clisp.lisp ============================================================================== --- (empty file) +++ cl-darcs/trunk/dump-clisp.lisp Wed Apr 2 16:32:07 2008 @@ -0,0 +1,35 @@ +;;; Copyright (C) 2007, 2008 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 + +;; Use this file to create a "darcs" executable using CLISP. + +(let* ((src-dir (make-pathname :name nil :type nil :defaults *load-truename*)) + (asdf:*central-registry* (cons src-dir asdf:*central-registry*))) + (asdf:oos 'asdf:load-op :cl-darcs)) + +(in-package :darcs) + +(defun run-with-clisp () + (ext:quit (handle-command-line ext:*args*))) + +(ext:saveinitmem "darcs" + :executable t + :norc t + :quiet t + :init-function #'run-with-clisp + :start-package :darcs) + +(ext:quit) Added: cl-darcs/trunk/dump-sbcl.lisp ============================================================================== --- (empty file) +++ cl-darcs/trunk/dump-sbcl.lisp Wed Apr 2 16:32:07 2008 @@ -0,0 +1,34 @@ +;;; Copyright (C) 2007, 2008 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 + +;; Use this file to create a "darcs" executable using SBCL: +;; sbcl --disable-debugger --load dump-sbcl.lisp + +(let* ((src-dir (make-pathname :name nil :type nil :defaults *load-truename*)) + (asdf:*central-registry* (cons src-dir asdf:*central-registry*))) + (asdf:oos 'asdf:load-op :cl-darcs)) + +(in-package :darcs) + +(defun run-with-sbcl () + (sb-ext:quit :unix-status (handle-command-line (cdr sb-ext:*posix-argv*)))) + +(proclaim '(optimize debug)) +(sb-ext:save-lisp-and-die "darcs" + :executable t + :toplevel #'run-with-sbcl) + +(sb-ext:quit)

1 0

[Cl-darcs-cvs] r194 - in cl-darcs/trunk: . doc
by mhenoch＠common-lisp.net 02 Apr '08

02 Apr '08

Author: mhenoch Date: Wed Apr 2 16:14:08 2008 New Revision: 194 Modified: cl-darcs/trunk/cl-darcs.asd cl-darcs/trunk/doc/cl-darcs.texi Log: Update version number Modified: cl-darcs/trunk/cl-darcs.asd ============================================================================== --- cl-darcs/trunk/cl-darcs.asd (original) +++ cl-darcs/trunk/cl-darcs.asd Wed Apr 2 16:14:08 2008 @@ -7,7 +7,7 @@ (defsystem cl-darcs :description "Darcs client" - :version "0.2.0" + :version "0.3.0" :licence "GPL" :author "Magnus Henoch <henoch(a)dtek.chalmers.se>" :depends-on (:split-sequence Modified: cl-darcs/trunk/doc/cl-darcs.texi ============================================================================== --- cl-darcs/trunk/doc/cl-darcs.texi (original) +++ cl-darcs/trunk/doc/cl-darcs.texi Wed Apr 2 16:14:08 2008 @@ -1,11 +1,11 @@ \input texinfo @setfilename cl-darcs.info -@settitle cl-darcs 0.2.0 manual +@settitle cl-darcs 0.3.0 manual @copying -This is the manual for cl-darcs, version 0.2.0. +This is the manual for cl-darcs, version 0.3.0. -Copyright @copyright{} 2007 Magnus Henoch +Copyright @copyright{} 2007, 2008 Magnus Henoch @quotation Permission is granted to make and distribute verbatim copies or @@ -15,7 +15,7 @@ @end copying @titlepage -@title cl-darcs 0.2.0 +@title cl-darcs 0.3.0 @subtitle a darcs client in Common Lisp @author Magnus Henoch

1 0

[Cl-darcs-cvs] r193 - in cl-darcs/trunk: . doc
by mhenoch＠common-lisp.net 02 Apr '08

02 Apr '08

Author: mhenoch Date: Wed Apr 2 15:55:19 2008 New Revision: 193 Added: cl-darcs/trunk/Makefile.am cl-darcs/trunk/configure.ac cl-darcs/trunk/doc/Makefile.am Removed: cl-darcs/trunk/Makefile Log: Autoconfiscate Added: cl-darcs/trunk/Makefile.am ============================================================================== --- (empty file) +++ cl-darcs/trunk/Makefile.am Wed Apr 2 15:55:19 2008 @@ -0,0 +1,12 @@ +bin_PROGRAMS = darcs +darcs_SOURCES = cl-darcs.asd apply-patch.lisp cmdline.lisp commute.lisp condition.lisp diff.lisp display-patch.lisp dump-clisp.lisp dump-sbcl.lisp equal.lisp get.lisp getopt.lisp ifstar.lisp inflate.lisp invert-patch.lisp merge.lisp packages.lisp patch-core.lisp patchinfo.lisp pending.lisp prefs.lisp pristine.lisp pull.lisp read-patch.lisp record.lisp repo.lisp revert.lisp send.lisp touching.lisp unreadable-stream.lisp unwind.lisp upath.lisp util.lisp write-patch.lisp + +SUBDIRS=doc + +darcs: build_with_@my_lisp@ + +build_with_clisp: + @CLISP@ @CLISP_FLAGS@ @srcdir@/dump-clisp.lisp + +build_with_sbcl: + @SBCL@ @SBCL_FLAGS@ --load @srcdir@/dump-sbcl.lisp Added: cl-darcs/trunk/configure.ac ============================================================================== --- (empty file) +++ cl-darcs/trunk/configure.ac Wed Apr 2 15:55:19 2008 @@ -0,0 +1,56 @@ +AC_INIT([cl-darcs], [0.3.0], [cl-darcs-devel(a)common-lisp.net] +AM_INIT_AUTOMAKE([no-dependencies foreign]) + +my_lisp="" + +AC_ARG_WITH(clisp, [AS_HELP_STRING([--with-clisp], [use clisp])], + [my_lisp=$my_lisp"clisp"], []) +AC_ARG_WITH(clisp-flags, [AS_HELP_STRING([--with-clisp-flags], [clisp flags (default -i ~/.clisprc)])], + [], + [with_clisp_flags="-i ~/.clisprc"]) + +AC_ARG_WITH(sbcl, [AS_HELP_STRING([--with-sbcl], [use sbcl])], + [my_lisp=$my_lisp"sbcl"], []) +AC_ARG_WITH(sbcl-flags, [AS_HELP_STRING([--with-sbcl-flags], [sbcl flags (default --disable-debugger)])], + [], + [with_sbcl_flags="--disable-debugger"]) + +dnl First, try to find clisp +if test -z "$my_lisp" -o "$my_lisp" = clisp; then + if test -z "$CLISP"; then + AC_CHECK_PROG(CLISP, clisp, clisp, []) + fi + if test -n "$CLISP"; then + my_lisp=clisp + AC_MSG_CHECKING([for clisp flags]) + CLISP_FLAGS=$with_clisp_flags + AC_MSG_RESULT($CLISP_FLAGS) + fi +fi + +dnl Then, try to find sbcl +if test -z "$my_lisp" -o "$my_lisp" = sbcl; then + if test -z "$SBCL"; then + AC_CHECK_PROG(SBCL, sbcl, sbcl, []) + fi + if test -n "$SBCL"; then + my_lisp=sbcl + AC_MSG_CHECKING([for sbcl flags]) + SBCL_FLAGS=$with_sbcl_flags + AC_MSG_RESULT($SBCL_FLAGS) + fi +fi + +dnl Did we find any lisp? +if test -z "$my_lisp"; then + AC_MSG_ERROR([no lisp found]) +fi + +AC_SUBST(my_lisp) +AC_SUBST(CLISP) +AC_SUBST(CLISP_FLAGS) +AC_SUBST(SBCL) +AC_SUBST(SBCL_FLAGS) + +AC_CONFIG_FILES([Makefile doc/Makefile]) +AC_OUTPUT Added: cl-darcs/trunk/doc/Makefile.am ============================================================================== --- (empty file) +++ cl-darcs/trunk/doc/Makefile.am Wed Apr 2 15:55:19 2008 @@ -0,0 +1 @@ +info_TEXINFOS=cl-darcs.texi

1 0

[Cl-darcs-cvs] r192 - cl-darcs/trunk
by mhenoch＠common-lisp.net 02 Apr '08

02 Apr '08

Author: mhenoch Date: Wed Apr 2 13:08:20 2008 New Revision: 192 Modified: cl-darcs/trunk/README Log: Mention Lispworks compatibility Modified: cl-darcs/trunk/README ============================================================================== --- cl-darcs/trunk/README (original) +++ cl-darcs/trunk/README Wed Apr 2 13:08:20 2008 @@ -32,10 +32,11 @@ * Compatibility -cl-darcs works on CLISP and SBCL on Unix-like systems. Getting it to -work on other Lisp implementations should be simple; grep the code for -#+clisp or #+sbcl. For other operating systems, modify -MAKE-TEMP-FILE-NAME in util.lisp accordingly. +cl-darcs works on CLISP and SBCL on Unix-like systems; it has also +been reported to work on Lispworks. Getting it to work on other Lisp +implementations should be simple; grep the code for #+clisp or #+sbcl. +For other operating systems, modify MAKE-TEMP-FILE-NAME in util.lisp +accordingly. * Dependencies

1 0

[Cl-darcs-cvs] r191 - cl-darcs/trunk
by mhenoch＠common-lisp.net 02 Apr '08

02 Apr '08

Author: mhenoch Date: Wed Apr 2 13:06:41 2008 New Revision: 191 Modified: cl-darcs/trunk/README Log: Mention CL-DIFFLIB in README Modified: cl-darcs/trunk/README ============================================================================== --- cl-darcs/trunk/README (original) +++ cl-darcs/trunk/README Wed Apr 2 13:06:41 2008 @@ -47,6 +47,7 @@ - FLEXI-STREAMS: http://weitz.de/flexi-streams/ - CL-FAD: http://weitz.de/cl-fad/ - CL-PPCRE: http://weitz.de/cl-ppcre/ + - CL-DIFFLIB: http://www.cliki.net/CL-DIFFLIB All of these are ASDF-INSTALLable.

1 0

[Cl-darcs-cvs] r190 - cl-darcs/trunk
by mhenoch＠common-lisp.net 02 Apr '08

02 Apr '08

Author: mhenoch Date: Wed Apr 2 13:03:02 2008 New Revision: 190 Removed: cl-darcs/trunk/binary-text.lisp Modified: cl-darcs/trunk/cl-darcs.asd Log: Remove unused binary-text.lisp Modified: cl-darcs/trunk/cl-darcs.asd ============================================================================== --- cl-darcs/trunk/cl-darcs.asd (original) +++ cl-darcs/trunk/cl-darcs.asd Wed Apr 2 13:03:02 2008 @@ -29,7 +29,7 @@ (:file "condition" :depends-on ("packages")) (:file "util" :depends-on ("packages" "condition" #-allegro "inflate")) (:file "unreadable-stream" :depends-on ("packages")) - (:file "upath" :depends-on ("util" #|"binary-text"|#)) + (:file "upath" :depends-on ("util")) (:file "patchinfo" :depends-on ("util")) (:file "get" :depends-on ("util"))

1 0

[Cl-darcs-cvs] r189 - cl-darcs/trunk
by mhenoch＠common-lisp.net 02 Apr '08

02 Apr '08

Author: mhenoch Date: Tue Apr 1 19:23:06 2008 New Revision: 189 Modified: cl-darcs/trunk/cmdline.lisp Log: Fix typo Modified: cl-darcs/trunk/cmdline.lisp ============================================================================== --- cl-darcs/trunk/cmdline.lisp (original) +++ cl-darcs/trunk/cmdline.lisp Tue Apr 1 19:23:06 2008 @@ -368,8 +368,8 @@ (typecase from ;; If we have a local pathname, use the last component. (pathname - (or (pathname-name pathname) - (car (last (pathname-directory pathname))))) + (or (pathname-name from) + (car (last (pathname-directory from))))) ;; Otherwise, use the part from the last slash. (t (let* ((s (upath-to-string from))

1 0

[Cl-darcs-cvs] r188 - cl-darcs/trunk
by mhenoch＠common-lisp.net 01 Apr '08

01 Apr '08

Author: mhenoch Date: Tue Apr 1 18:50:52 2008 New Revision: 188 Modified: cl-darcs/trunk/cmdline.lisp Log: Remove superfluous documentation for 'darcs init' Modified: cl-darcs/trunk/cmdline.lisp ============================================================================== --- cl-darcs/trunk/cmdline.lisp (original) +++ cl-darcs/trunk/cmdline.lisp Tue Apr 1 18:50:52 2008 @@ -226,10 +226,7 @@ (diff-repo-display (find-repo))) (define-darcs-command init (repodir) () - "Initialize a darcs repository in the current directory. - -Options: ---repodir=DIRECTORY Use DIRECTORY instead of current directory" + "Initialize a darcs repository in the current directory." (let ((repodir (or repodir *default-pathname-defaults*))) (format t "Creating repo in ~A...~%" repodir)

1 0

[Cl-darcs-cvs] r187 - cl-darcs/trunk
by mhenoch＠common-lisp.net 01 Apr '08

01 Apr '08

Author: mhenoch Date: Tue Apr 1 18:37:24 2008 New Revision: 187 Modified: cl-darcs/trunk/cmdline.lisp Log: Generate documentation for all command arguments Modified: cl-darcs/trunk/cmdline.lisp ============================================================================== --- cl-darcs/trunk/cmdline.lisp (original) +++ cl-darcs/trunk/cmdline.lisp Tue Apr 1 18:37:24 2008 @@ -70,7 +70,7 @@ (defun command-usage (command) "Print longer documentation for COMMAND." - (format *error-output* "~&~A~%" (documentation (command-function command) 'function))) + (format *error-output* "~&~A~%" (get (command-function command) 'darcs-documentation))) (defmacro define-darcs-command (name options operands docstring &body body) "Define a darcs command called NAME. @@ -98,7 +98,35 @@ `(,o (cdr (assoc (option-keyword ,(option-symbol o)) ,options-sym)))) options) (destructuring-bind ,operands ,operands-sym - ,@body)))))))) + ,@body)))) + (setf (get ',function 'darcs-documentation) + ,(if (null options) + docstring + `(format nil + "~A~%~%~:{~A~30,5T~A~%~}" + ,docstring + (mapcar + (lambda (opt) + (list + (cond + ((and (option-short opt) + (option-long opt)) + (format nil "--~A~@[=~A~], -~C" + (option-long opt) + (option-arg opt) + (option-short opt))) + ((option-short opt) + (format nil "-~C~@[ ~A~]" + (option-short opt) + (option-arg opt))) + ((option-long opt) + (format nil "--~A~@[=~A~]" + (option-long opt) + (option-arg opt))) + (t + (error "Option ~A has neither short nor long argument form." (option-keyword opt)))) + (option-help opt))) + (list ,@(mapcar #'option-symbol options)))))))))) (defparameter opt-repodir (make-option

1 0

[Cl-darcs-cvs] r186 - cl-darcs/trunk
by mhenoch＠common-lisp.net 01 Apr '08

01 Apr '08

Author: mhenoch Date: Tue Apr 1 17:01:29 2008 New Revision: 186 Modified: cl-darcs/trunk/cmdline.lisp Log: "darcs get" Modified: cl-darcs/trunk/cmdline.lisp ============================================================================== --- cl-darcs/trunk/cmdline.lisp (original) +++ cl-darcs/trunk/cmdline.lisp Tue Apr 1 17:01:29 2008 @@ -324,6 +324,33 @@ ;; Change the default repository. (when (first from-repositories) - (set-default-repo ourrepo (upath-to-string (first from-repositories)))) + (set-default-repo ourrepo (upath-to-string (first from-repositories) :truename t))) 0)) + +(define-darcs-command get + (repodir) + (from) + "Get a copy of a repository." + (setf from (make-upath from)) + (let* ((to (or + ;; Either there is an explicit repodir... + repodir + ;; ...or we make one relative to the current directory. + (make-pathname + :directory + (list :relative + (typecase from + ;; If we have a local pathname, use the last component. + (pathname + (or (pathname-name pathname) + (car (last (pathname-directory pathname))))) + ;; Otherwise, use the part from the last slash. + (t + (let* ((s (upath-to-string from)) + (last-slash (position #\/ s :from-end t))) + (if last-slash + (subseq s (1+ last-slash)) + s))))))))) + (get-repo from to)) + 0)

1 0