addfile ./vc-darcs-dired.el
hunk ./vc-darcs-dired.el 1
+(require 'vc-darcs)
+(require 'dired)
+
+(defvar darcs--dired-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "tl" 'vc-darcs-print-log)
+    map))
+
+(defvar darcs-dired-do-changes nil
+  "If this is true, run 'tla changes' and integrate the result
+into the dired output.  This may take some time.")
+
+(defvar darcs-dired-changes-list nil
+  "List of changes for the directory.  This is made buffer local
+before it is modified.")
+
+(defun darcs--set-mode-line ()
+  (setq mode-name "DARCS"))
+
+(defun darcs--make-tag (file elem changed)
+  (message (format "elem: %S" elem))
+  (let* ((typ (cdr elem)))
+    (cond ((string= file "_darcs") "control")
+	  ((equal typ '("a")) "precious")
+	  ((equal typ '("A")) "added")
+	  ((equal typ '("M")) "modified")
+	  ((null typ) "")
+	  (t (concat "unknown: " (prin1-to-string typ))))))
+
+(defun darcs--inventory (directory)
+  (let* ((manifest
+	  (progn
+	    (with-current-buffer "*vc*" (erase-buffer))
+	    (vc-darcs-command "query" nil 0 nil "manifest")
+	    (with-current-buffer "*vc*" (split-string (buffer-string) "\n"))))
+	 (whatsnew
+	  (progn
+	    (with-current-buffer "*vc*" (erase-buffer))
+	    (vc-darcs-command "whatsnew" nil 0 nil "-l" "-s" "--boring")
+	    (with-current-buffer "*vc*"
+	      (mapcar (lambda (s)
+			(let* ((name (substring s 2))
+			       (end (string-match "[0-9+-][ 0-9+-]+$" name))
+			       (name2 (if (null end) name (substring name 0 (- end 1))))
+			       (end2 (string-match "/$" name2))
+			       (name3 (if (null end2) name2 (substring name2 0 end2))))
+			  (list name3 (substring s 0 1)))) (split-string (buffer-string) "\n"))))))
+    ;; Merge the manifest and whatsnew to get an inventory
+    (merge-inventory whatsnew manifest)
+    ))
+
+(defun merge-inventory (whatsnew manifest)
+  (cond ((null manifest) whatsnew)
+	((null (assoc (car manifest) whatsnew))
+	 (merge-inventory (cons (list (car manifest)) whatsnew) (cdr manifest)))
+	(t (merge-inventory whatsnew (cdr manifest)))))	 
+
+;(file-name-directory (directory-file-name (vc-darcs-_darcs-dir (dired-current-directory))))
+
+(defun darcs--dired-hook ()
+  "This hook is called every time a file or directory is read, with
+the buffer narrowed to the affected listings.  The function reformats
+the listings to reflect arch version control"
+  (message "Getting directory DARCS info ... ")
+  (darcs--set-mode-line)
+  (use-local-map darcs--dired-mode-map)
+  (let* ((directory (dired-current-directory))
+;	 (inventory-alist
+;	  (mapcar 
+;	   (lambda (elem) (cons (nth 2 elem) elem))
+;	   (darcs--inventory directory)))
+	 ;; Not an alist yet, just a list
+	 (_darcs (vc-darcs-_darcs-dir directory))
+	 (top (file-name-directory (directory-file-name _darcs)))
+	 (subdir (concat "./" (drop-prefix top directory)))
+	 (inventory-alist (darcs--inventory directory))
+	 (changes (if darcs-dired-do-changes (darcs--changes) darcs-dired-changes-list)))
+    (if darcs-dired-do-changes
+	(set (make-local-variable 'darcs-dired-changes-list) changes))
+    (toggle-read-only -1)
+    (goto-char 0)
+    (dired-goto-next-file)
+    (while (dired-move-to-filename)
+      (darcs--edit-dired-line top subdir inventory-alist changes)
+      (dired-next-line 1))
+    (toggle-read-only 1)
+    (message "Getting directory DARCS info ... done")
+    ))
+
+(defun darcs--edit-dired-line (top subdir inventory-alist changes)
+  (let* ((file (dired-get-filename 'no-dir))
+	 (elem (assoc (concat subdir file) inventory-alist))
+	 (changed (assoc file changes))
+	 (mark (darcs--make-tag file elem changed)))
+    (beginning-of-line)
+    (forward-char 12)
+    (let* ((beg (point))
+	   (end (- (re-search-forward "[ ]+[^ ]+[ ]+[^ ]+[ ]+[^ ]+[ ]") 1))
+	   (fmt (format "%%-%ds" (- end beg))))
+      (delete-region beg (- (point) 1))
+      (insert (format fmt (or mark ""))))))
+
+(define-derived-mode darcs-dired-mode
+  dired-mode "DARCS"
+  "Major mode derived from dired-mode for managing DARCS project
+directories.  Several normal bindings are overridden, and other
+bindings starting with 't' are added (see below.)
+
+\\{darcs--dired-mode-map}"
+  ;(message "entering darcs-dired-mode")
+  (set-keymap-parent darcs--dired-mode-map dired-mode-map)
+  (make-local-hook 'dired-after-readin-hook)
+  (add-hook 'dired-after-readin-hook 'darcs--dired-hook nil t)
+  (setq darcs-dired-mode t)
+  ;(message "finished darcs-dired-mode")
+  )
+
+(defun darcs--dired-before-readin-hook ()
+  "If this is a darcs directory prepare to go into DARCS mode."
+  (if (and (vc-darcs-_darcs-dir default-directory)
+	   (not (string= major-mode 'darcs-dired-mode)))
+      (darcs-dired-mode)))
+
+(add-hook 'dired-before-readin-hook 'darcs--dired-before-readin-hook nil nil)
addfile ./vc-darcs.el
addfile ./README
hunk ./README 1
-
+The file vc-darcs.el comes from
+http://www.loveshack.ukfsn.org/emacs/vc-darcs.el and is unmodified.
+The file vc-darcs-dired.el
hunk ./vc-darcs-dired.el 4
+(defun vc-darcs-dired-whatsnew ()
+  "Run \"darcs whatsnew -u\"."
+  (interactive)
+  (vc-darcs-command "whatsnew" nil 0 (dired-current-directory) "-u")
+  (with-current-buffer "*vc*" (goto-char 0))
+  (display-buffer "*vc*"))
+
+(defun vc-darcs-dired-print-log (arg)
+  "Run \"darcs changes\"."
+  (interactive "P")
+  (if arg
+      (vc-darcs-command "changes" nil 0 nil "--verbose")
+    (vc-darcs-command "changes" nil 0 nil))
+  (with-current-buffer "*vc*" (goto-char 0))
+  (display-buffer "*vc*"))
+
hunk ./vc-darcs-dired.el 22
-    (define-key map "tl" 'vc-darcs-print-log)
+    (define-key map "tl" 'vc-darcs-dired-print-log)
+    (define-key map "t=" 'vc-darcs-dired-whatsnew)
hunk ./vc-darcs-dired.el 38
-  (message (format "elem: %S" elem))
+  ;(message (format "elem: %S" elem))
hunk ./vc-darcs-dired.el 89
-	 ;; Not an alist yet, just a list
hunk ./vc-darcs-dired.el 140
+(defun darcs--look-for-buffer (path)
+  "Avoid creating new buffers for a directory when one already exits."
+  (dired-find-buffer-nocreate (file-name-as-directory path) 'darcs-dired-mode))
+
+(if (not (memq 'darcs--look-for-buffer find-directory-functions))
+    (setq find-directory-functions
+	  (cons 'darcs--look-for-buffer find-directory-functions)))
+
hunk ./vc-darcs.el 1
+;;; vc-darcs.el --- VC backend for the darcs revision control system
+
+;; Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
+
+;; Author: Dave Love <fx@gnu.org>
+;; Keywords: tools
+;; Created: June 2004
+;; $Revision: 1.47 $
+;; URL: http://www.loveshack.ukfsn.org/emacs
+
+;; This file 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, or (at your option)
+;; any later version.
+
+;; This file 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 GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; See <URL:http://www.abridgegame.org/darcs/> concerning darcs.
+
+;; Load this library to register darcs support in VC.
+
+;; There's another implementation like this
+;; <URL:http://www.pps.jussieu.fr/~jch/software/repos/vc-darcs>, but
+;; it doesn't have a copyright assignment for inclusion in Emacs.  See
+;; See <URL:http://chneukirchen.org/repos/darcsum> (which still needs
+;; some work) for a more PCL-CVS-like interface more appropriate for a
+;; patch-based system.
+
+;; This doesn't deal with revisions in most commands, since darcs is
+;; patch-based.  The `diff' and `checkout' handlers (currently) do
+;; deal with revision specs -- see the doc of `vc-darcs-rev-to-flags'.
+;; However, the VC framework can't deal well with this -- at least
+;; avoid slashes in anything specified as a revision name.  There are
+;; plenty of loose ends: see the Fixmes below.  VC and log-view need
+;; other changes to work more sanely with this darcs stuff -- they
+;; still tend to assume RCS/CVS-like features.
+
+;; The package protect-files.el can be used to avoid backup and
+;; autosave files in _darcs (see darcs doc).
+
+;;; Code:
+
+;; The following (Emacs 22) VC operations aren't implemented and
+;; probably can't or shouldn't be:
+
+;; latest-on-branch-p, init-version [not relevant], receive-file,
+;; make-version-backups-p, repository-hostname [the default repo isn't
+;; relevant for VC commands], check-headers [doesn't expand headers],
+;; clear-headers [likewise], find-file-hook, find-file-not-found-hook,
+;; cancel-version [darcs obliterate isn't file-based], merge-news
+;; [probably not meant to do something like pull], steal-lock [no
+;; locking], state-heuristic [maybe should be], merge,
+;; comment-history, update-changelog, assign-name, retrieve-snapshot.
+
+;; Fixmes:
+;;
+;; * Figure out whether to attempt to do anything with coding
+;;   conversion of darcs i/o where relevant.  As far as I can tell,
+;;   darcs is currently unreliable with non-ASCII metadata (at least).
+;;
+;; * find-version is meant to be provided for Emacs 22 VC, rather than
+;;   checkout.
+;; 
+;; * Merge might be implemented as applying patch, but merging to a
+;;   single file presumably requires pulling to a scratch branch.
+;; 
+;; * Should retrieve-snapshot do darcs get?
+;; 
+;; * Implement update-changelog, but that requires convention for how
+;;   to deal with darcs comments.
+
+(eval-when-compile
+  (require 'vc))			; for vc-exec-after
+
+(defgroup vc-darcs nil
+  "VC darcs backend."
+;;   :version "22"
+  :group 'vc)
+
+(defcustom vc-darcs-program "darcs"
+  "*Name of the darcs command (excluding any arguments)."
+  :group 'vc-darcs
+  :type 'string)
+
+;; Fixme: there's probably no call for this.
+(defcustom vc-darcs-program-args nil
+  "*List of global arguments to pass to `vc-darcs-program'."
+  :group 'vc-darcs
+  :type '(repeat string))
+
+(defcustom vc-darcs-author (concat user-full-name " <" user-mail-address ">")
+  "Fallback value for author email address.
+See function `vc-darcs-author'."
+  :group 'vc-darcs
+  :type 'string)
+
+(defcustom vc-darcs-diff-switches nil
+  "*String/list of strings specifying extra switches for darcs diff under VC."
+  :type '(choice (const :tag "None" nil)
+		 (string :tag "Argument String")
+		 (repeat :tag "Argument List"
+			 :value ("")
+			 string))
+  :group 'vc-darcs)
+
+(defun vc-darcs-command (command buffer okstatus file &rest args)
+  "Wrapper round `vc-do-command' using `vc-darcs-program' as COMMAND."
+  (apply 'vc-do-command buffer okstatus vc-darcs-program
+	 ;; This doesn't appear actually to be necessary:
+	 (and file (file-name-nondirectory file))
+	 command (append vc-darcs-program-args args '("--"))))
+
+;; If we're only interested in messages like "No changes!", we only
+;; need to set LC_MESSAGES, and we might need finer control of this.
+;; Actually darcs isn't localized yet, so this is future-proof.
+(defmacro vc-darcs-with-c-locale (&rest body)
+  "Run BODY with LC_ALL=C in the process environment.
+This ensures that messages to be matched come out as expected."
+  `(let ((process-environment (cons "LC_ALL=C" process-environment)))
+     ,@body))
+
+(defun vc-darcs-_darcs-dir (file)
+  "Return the _darcs directory in the hierarchy above FILE.
+Return nil if there isn't one."
+  (or (vc-file-getprop file 'darcs-dir)
+      (let ((dir (if (file-directory-p (setq file (expand-file-name file)))
+		     file
+		   (file-name-directory file)))
+	    _darcs)
+	(vc-file-setprop
+	 file 'darcs-dir
+	 (catch 'found
+	   (while t
+	     (setq _darcs (expand-file-name "_darcs" dir))
+	     (if (file-directory-p _darcs)
+		 (throw 'found (file-name-as-directory _darcs)))
+	     (if (equal "" (file-name-nondirectory (directory-file-name dir)))
+		 (throw 'found nil)
+	       (setq dir (file-name-directory (directory-file-name dir))))))))))
+
+;; Fixme:  A repository can be created with --no-pristine.  Do
+;; something sensible with calls of this to account for that.
+(defun vc-darcs-current (file)
+  "Find the current version of FILE in _darcs/current or  _darcs/pristine."
+  (setq file (expand-file-name file))
+  (let* ((_darcs (vc-darcs-_darcs-dir file))
+	 (top (file-name-directory (directory-file-name _darcs)))
+	 (current (if _darcs
+		      (expand-file-name "current" _darcs))) ; old-style
+	 (current (if (and current (file-exists-p current))
+		      (file-name-as-directory current)
+		    (file-name-as-directory
+		     (expand-file-name "pristine" _darcs))))
+	 found)
+    (when (and (string-match (concat "\\`" (regexp-quote top) "\\(.*\\)\\'")
+			     file)
+	       (setq found (expand-file-name (match-string 1 file) current))
+	       (file-exists-p found))
+      found)))
+
+(defun vc-darcs-registered (file)
+  "Return non-nil if FILE is registered with darcs."
+  (let* ((_darcs (vc-darcs-_darcs-dir file))
+	 (top (and _darcs (file-name-directory (directory-file-name _darcs)))))
+    (and _darcs
+	 ;; Avoid deadlock with darcs invoking emacsclient.  When it
+	 ;; does this while doing a record, for instance, the
+	 ;; repository is locked, and that prevents `darcs query'
+	 ;; running in the repository.  The trouble is that the
+	 ;; temporary file that darcs uses for editing is
+	 ;; `.darcs-record' (or `.darcs-temp-mail',
+	 ;; `darcs-temp-mail-N') _in the repository_, so when the
+	 ;; server process tries to find it, it just hangs.
+	 ;; <URL:http://bugs.darcs.net/issue315>.  This shouldn't be
+	 ;; an issue as of darcs 1.0.9rc2.
+	 (not (string-match "^\\.darcs-\\|^darcs-temp-mail-" (file-name-nondirectory file)))
+	 (or (vc-darcs-current file)
+	     (with-temp-buffer
+	       (cd (file-name-directory file))
+	       (vc-darcs-command "query" t 0 nil "manifest")
+	       ;; Deal with (decimal) escapes, e.g. space in file
+	       ;; names is `\32\'.  Fixme:  What about non-ASCII?
+	       (goto-char 1)
+	       (while (re-search-forward "\\\\\\([0-9]+\\)\\\\" nil t)
+		 (replace-match (string (string-to-number (match-string 1)))))
+	       (goto-char 1)
+	       (setq file (regexp-quote (substring (expand-file-name file)
+						   (length top))))
+	       (let (case-fold-search)
+		 (re-search-forward (concat "^\\./" file "$") nil t)))))))
+
+(defcustom vc-darcs-state-check 'cmp
+  "How to check up-to-date state of darcs-controlled file.
+Possible values in order of speed are:
+`file-times': compare modification times of current and working files;
+`cmp': use cmp(1) to compare current and working files;
+`darcs'': up-to-date if `darcs whatsnew' says `no changes' -- usually too
+slow."
+  :group 'vc-darcs
+  :type '(choice (const :tag "Compare modification times" file-times)
+		 (const :tag "Use cmp(1)" cmp)
+		 (const :tag "Use `darcs whatsnew'" darcs)))
+
+(defun vc-darcs-state (file)
+  "Check state of FILE (edited or up-to-date).  See `vc-darcs-state-check'."
+  (if (eq 'darcs vc-darcs-state-check)	; proper, slow (?)
+      (with-temp-buffer
+	(vc-darcs-with-c-locale
+	 ;; Without -l it says no changes for unregistered file.
+	 (vc-darcs-command "whatsnew" t 1 file "-l"))
+	(goto-char (point-min))
+	(if (search-forward "No changes!\n" nil t)
+	    'up-to-date
+	  'edited))
+    ;; Fixme:  Sort out renames.
+    (let ((current (vc-darcs-current file)))
+      (if current
+	  (if (and (eq 'cmp vc-darcs-state-check) ; actually always correct?
+		   (executable-find "cmp"))
+	      (if (equal ""
+			 (shell-command-to-string
+			  (format "cmp %s %s" (shell-quote-argument file)
+				  (shell-quote-argument current))))
+		  'up-to-date
+		'edited)
+	    ;; Else conservative guess with mod times.
+	    (if (file-newer-than-file-p file current)
+		'edited
+	      'up-to-date))
+	'edited))))
+
+(defconst vc-darcs-working-name "<working>"
+  "Pseudo-revision used for the workfile version.")
+
+(defun vc-darcs-workfile-version (file)
+  "Return the supposed workfile version of FILE.
+Actually just returns a constant bogus (we hope) value."
+  vc-darcs-working-name)
+
+(defun vc-darcs-checkout-model (file)
+  'implicit)
+
+(defun vc-darcs-workfile-unchanged-p (file)
+  "Return non-nil if FILE has not changed since the last darcs checkout."
+  (eq 'up-to-date (vc-darcs-state file)))
+
+(defun vc-darcs-mode-line-string (file)
+  "Return mode line string for darcs-controlled FILE.
+This is `darcs/' followed by `*' if the file is edited and `-' otherwise."
+  (format "darcs:%c" (if (eq 'edited (vc-state file)) ?* ?-)))
+
+(defun vc-darcs-register (file &optional rev comment)
+  "Register FILE under darcs.
+Signal an error unless REV is nil or `vc-default-init-version'.
+COMMENT is ignored.
+If necessary, parent directories are also registered."
+  (if (and rev (not (equal rev vc-default-init-version)))
+      (error "Can't register explicit version with darcs"))
+  (if (vc-darcs-responsible-p file)
+      (unless (vc-darcs-could-register file) ; registered or is boring
+	(error "Can't register %s with darcs" file))
+    ;; Initialize directory and re-try.
+    (vc-darcs-command "initialize" nil 0 nil)
+    (unless (vc-darcs-could-register file)
+      (error "Initialized directory, but can't register %s with darcs" file)))
+  (vc-darcs-command "add" nil 0 file))
+
+;; Could run `darcs changes' in the directory and see if it succeeds,
+;; but that could be expensive with many changes.
+(defun vc-darcs-responsible-p (file)
+  "Return non-nil if FILE is (potentially) controlled by darcs.
+The criterion is that there is a `_darcs' directory in the same
+or a superior directory."
+  (and (vc-darcs-_darcs-dir file) t))
+
+(defun vc-darcs-could-register (file)
+  "Return non-nil if FILE could be registered under darcs."
+  (when (vc-darcs-responsible-p file)	; shortcut
+    (condition-case ()
+	(with-temp-buffer
+	  (vc-darcs-command "add" t 1 file "--dry-run")
+	  t)
+      (error))))
+
+(defun vc-darcs-unregister (file)
+  "Unregister FILE from darcs."
+  (vc-darcs-command "remove" nil 0 file))
+
+(defun vc-darcs-author (file)
+  "Return author information for FILE.
+Checks the prefs/author and ~/.darcs/author files, the DARCS_EMAIL
+and EMAIL environment variables, and finally `vc-darcs-author'."
+  (or (let ((author (expand-file-name
+		     "author"
+		     (file-name-as-directory
+		      (expand-file-name "prefs" (vc-darcs-_darcs-dir file))))))
+	(unless (file-exists-p author)
+	  (setq author "~/.darcs/author"))
+	(and (file-exists-p author)
+	     (with-temp-buffer
+	       (insert-file-contents author)
+	       (if (looking-at "[ \t]*\\([^ \t]+.*\\)$")
+		   (match-string 1)))))
+      (getenv "DARCS_EMAIL")
+      (getenv "EMAIL")
+      vc-darcs-author))
+
+(defun vc-darcs-checkin (file rev comment)
+  "Check FILE in to darcs with log message COMMENT.
+REV non-nil gets an error.
+The first line of COMMENT is used as the patch name.  If it is
+blank, the time string is used for the name.  Subsequent lines
+are used as the darcs `long comment'."
+  (if rev (error "Can't check in a specific version with darcs"))
+  (if (equal comment "*** empty log message ***")
+      (setq comment ""))
+  (let* ((time (format-time-string "%Y%m%d%H%M%S"))
+	 ;; Match comment as groups of first line (less trailing
+	 ;; newline) and the rest.
+	 (match (string-match "\\`\\([^\n]+\\)\\(\n\\(?:.\\|\n\\)*\\)?\\'"
+			      comment))
+	 (log (or (and match (match-string 2 comment))
+		  ""))
+	 (patch-name (if match
+			 (match-string 1 comment)
+		       time)))
+    (vc-darcs-command "record" nil 'async file "-a" "--pipe")
+    (with-current-buffer "*vc*"
+      (process-send-string nil (concat time "\n" (vc-darcs-author file)
+				       "\n" patch-name))
+      (process-send-string nil log)	; has leading newline
+      (unless (equal ?\n (aref log (1- (length log))))
+	(process-send-string nil "\n"))
+      (process-send-eof))))
+
+(defcustom vc-darcs-patch-program (or (bound-and-true-p ediff-patch-program)
+				      "patch")
+  "*Name of the program that applies patches."
+  :group 'vc-darcs
+  :type 'string)
+
+;; Fixme:  This fails for the initial patch since the diff for it is
+;; empty -- seems to be a darcs bug.  Actually this isn't the case if
+;; you record the two patches comprising the initial checkin
+;; separately, i.e. the addfile and the subsequent diff for the file
+;; contents.
+
+;; Fixme:  The VC level needs to be able to sanitize REV and mangle it
+;; (to a hash?), specially in the case of a rev like `date ... &
+;; author ...'.  See the advice below in the meantime.
+(defun vc-darcs-checkout (file &optional editable rev destfile)
+  "Checkout FILE from darcs.
+Actually just copies the current version of FILE to that name or
+to DESTFILE if that is non-nil.  EDITABLE is ignored.
+An error is signalled if REV is non-nil and not equal to
+`vc-darcs-working-name'."
+  (unless destfile (setq destfile file))
+  (let ((mode (file-modes file)))
+    (if (or (not rev) (string= rev vc-darcs-working-name))
+	(copy-file (vc-darcs-current file) destfile t t)
+      (let ((tmp (make-temp-file "darcs")))
+	(condition-case data
+	    (with-temp-buffer
+	      (copy-file (vc-darcs-current file) tmp t)
+	      (vc-darcs-diff file rev nil (current-buffer))
+	      (unless (equal 0
+			     (call-process-region 1 (point-max)
+						  vc-darcs-patch-program
+						  t t nil
+						  "-t" "-o" destfile tmp))
+		(signal 'error (list (buffer-string)))))
+	  (error (error "Patching failed: %S" data)))
+	(delete-file tmp)))
+    ;; We inherit read-only from the repository version -- fix
+    ;; permissions to be those of FILE.
+    (set-file-modes destfile mode)))
+
+;; Fixme: Just copy current file?
+(defun vc-darcs-revert (file &optional contents-done)
+  (unless contents-done
+    (vc-darcs-command "revert" nil 'async file "-a" file)
+    ;; Fixme:  Is/was this actually necessary?  Doesn't seem to be (now)
+    (with-current-buffer "*vc*"
+      (when (eq 'run (process-status nil)) ; needs input
+	(process-send-string nil "y\n")
+	(process-send-eof)))))
+
+(defcustom vc-darcs-print-log-summary nil
+  "*Non-nil means \\[vc-print-log] for darcs should print summary information.
+This shows the extent of changes to the (single) file."
+  :type 'boolean
+  :group 'vc-darcs)
+
+(eval-when-compile
+  (defvar log-view-message-re)
+  (defvar log-view-file-re)
+  (defvar log-view-font-lock-keywords)
+  (defvar log-view-current-tag-function))
+
+;; Grim hack to account for lack of an extension mechanism for
+;; log-view.  Should be fixed in VC...
+(defun vc-darcs-log-view-hook (&optional file)
+  "To be added to `log-view-mode-hook' to set variables for darcs o/p.
+Removes itself after running."
+  ;; Fixme:  Make `log-view-diff' work with darcs log format -- needs
+  ;; a handler for `log-view-current-tag' in log-view.el.  In the
+  ;; meantime, see the advice below.  Also, it needs some sort of
+  ;; handler to make it work with logs of patches so that diffing
+  ;; doesn't always work on two patches.
+  (remove-hook 'log-view-mode-hook 'vc-darcs-log-view-hook)
+  (require 'add-log)
+  (set (make-local-variable 'log-view-file-re)
+       "^Changes to \\(.+\\):$")
+  (set (make-local-variable 'log-view-message-re)
+       "^\\(?:\\S-+[ \t]+\\)\\{6\\}")
+  (set (make-local-variable 'log-view-font-lock-keywords)
+       `((,log-view-file-re (1 'log-view-file-face))
+	 (,log-view-message-re
+	  (0 'change-log-date-face)
+	  ;; Adapted from add-log.
+	  ;; Note that changes output can have prefixes `tagged ' and
+	  ;; `UNDO: ' as well as `* ', but these don't occur in the
+	  ;; output for a single file.  (I wonder if they should.)
+	  ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9.-]+\\)[>)]\
+\\|\\(.*$\\)"
+	   nil nil
+	   (1 'change-log-name-face nil t)
+	   (2 'change-log-email-face nil t)
+	   (3 'change-log-email-face nil t)))
+	 ("^  \\* \\(.*\\)$" (1 'log-view-message-face))))
+  (set (make-local-variable 'log-view-current-tag-function)
+       #'vc-darcs-log-view-current-tag)
+  (set (make-local-variable 'log-view-patch-based) t) ; for fixed log-view-diff
+  (vc-exec-after
+   '(when vc-darcs-print-log-summary
+      ;; Remove summary lines that don't refer to this file.
+      (save-excursion
+	(goto-char (point-min))
+	(let (case-fold-search)
+	  (while (re-search-forward "^    \\(?:[MAR] \\./\\| .+ -> \\)" nil t)
+	    (beginning-of-line)
+	    (unless (looking-at
+		     (concat ".+/" (regexp-quote (file-name-nondirectory
+						  (log-view-current-file)))
+			     "\\(?: \\|$\\)"))
+	      (delete-region (line-end-position -1) (line-end-position)))
+	    (end-of-line)))))))
+
+(defun vc-darcs-print-log (file &optional buffer) ; get buffer arg in Emacs 22
+  "Get darcs change log for FILE into specified BUFFER.
+See also `vc-darcs-print-log-summary'."
+  ;; Fixme: VC needs a hook to sort out the mode for the buffer, or at
+  ;; least set the regexps right.
+  (if vc-darcs-print-log-summary
+      (vc-darcs-command "changes" buffer 'async file "--summary")
+    (vc-darcs-command "changes" buffer 'async file))
+  (unless (fboundp 'vc-log-view-hook)	; proposed extension
+    (add-hook 'log-view-mode-hook 'vc-darcs-log-view-hook)))
+
+(eval-after-load "log-view"
+  '(unless (fboundp 'vc-default-log-view-current-tag-function)
+     (defvar log-view-current-tag-function nil)
+     (defadvice log-view-current-tag (around darcs activate)
+       "Add `log-view-current-tag-function' handler."
+       (if log-view-current-tag-function
+	   (setq ad-return-value
+		 (funcall log-view-current-tag-function (ad-get-arg 1)))
+	 ad-do-it))))
+
+(defun vc-darcs-log-view-current-tag (&optional where)
+  "Handler function for `log-view-current-tag' for darcs."
+  (save-excursion
+    (when where (goto-char where))
+    (forward-line 1)
+    (let ((pt (point)))
+      (when (re-search-backward log-view-message-re nil t)
+	(let* ((date (match-string-no-properties 0))
+	       (author (buffer-substring-no-properties (match-end 0)
+						       (line-end-position)))
+	       (log (buffer-substring-no-properties
+		     (+ (line-beginning-position 2) 4)
+		     (line-end-position 2)))
+	       tag)
+	  (if (string-match "\\`tagged " log)
+	      (setq tag (substring log 7)))
+	  (format "exact %S && date %S && author %S"
+		  (or tag log) date author))))))
+
+(defun vc-darcs-posix-to-re (re)
+  "Attempt to convert a POSIX-style regexp RE to an Emacs one."
+  ;; Fixme: is the editing complete and correct?  (It could at least go
+  ;; wrong in bracket expressions):
+  ;; \{\} -> {}, \(\) -> (), () -> \(\), | -> \|
+  (replace-regexp-in-string "\\\\[(){}]\\|[(){}|]"
+			    (lambda (match)
+			      (if (= 1 (length match))
+				  (concat "\\\\" match)
+				(substring match 1)))
+			    re))
+
+;; Fixme:  Fix for the current extended rev convention -- search for
+;; all components of date && author && exact-match.
+(defun vc-darcs-show-log-entry (version)
+  "Find entry for patch name VERSION in darcs change log buffer."
+  (goto-char (point-min))
+  (let (case-fold-search)
+    (if (re-search-forward
+	 (concat "^ *\\* .*(?:" (vc-darcs-posix-to-re version) ")") nil t)
+	(beginning-of-line)
+      (goto-char (point-min)))))
+
+(defun vc-darcs-wash-log (file)
+  (flush-lines "^\\S-")
+  (delete-char 1)			; blank line
+  (while (re-search-forward "^  \\* " nil t)
+    (replace-match ""))
+  (goto-char (point-min))
+  (while (re-search-forward "^ +" nil t)
+    (replace-match ""))) ; avoid RCS-style default version
+
+(defun vc-darcs-logentry-check ()
+  "Check the form of the log entry for darcs.
+The first line must be a patch name, which is forced to be at
+least two non-whitespace characters."
+  (save-excursion
+    (save-restriction
+      (widen)
+      (goto-char 1)
+      (unless (looking-at "^[ \t]*[^ \t\n]\\{2\\}")
+	(error "Need non-trivial patch name on first line of log")))))
+
+(autoload 'vc-diff-switches-list "vc" nil nil t)
+
+(defun vc-darcs-diff (file &optional rev1 rev2 buffer)
+  "VC darcs backend for diff.
+Special-case: if REV1 or REV2 is \"-\", show changes from single
+patch named by the other rev."
+  (let ((working (vc-darcs-workfile-version file)))
+    (if (and (equal rev1 working)
+	     (equal rev2 working)
+	     (vc-darcs-current file))
+	;; Use plain diff as optimization when diffing against
+	;; working.  Fixme:  Is this (now) worth it?
+	(apply #'vc-do-command (or buffer "*vc-diff*") nil diff-command file
+	       (append (vc-diff-switches-list darcs)
+		       (list (vc-darcs-current file))))
+      (apply #'vc-darcs-command "diff" (or buffer "*vc-diff*") 1 file
+	     "--diff-opts" (mapconcat 'identity
+				      (vc-diff-switches-list darcs)
+				      " ")
+	     (if (or (equal "-" rev1)
+		     (equal "-" rev2)
+		     (equal rev1 rev2))
+		 ;; Special case that we can't expose to the VC user
+		 ;; interface:  if either revision is "-", show
+		 ;; changes of single patch.
+		 (progn
+		   (if (or (equal rev1 vc-darcs-working-name)
+			   (equal rev2 vc-darcs-working-name))
+		       (error "Patch name not specified"))
+		 (vc-darcs-rev-to-flags (if (equal "-" rev2) rev1 rev2)))
+	       (append (if (and rev1 (not (equal rev1 working)))
+			   (vc-darcs-rev-to-flags rev1 'from))
+		       (if (and rev2 (not (equal rev2 working)))
+			   (vc-darcs-rev-to-flags rev2 'to))))))))
+
+(defun vc-darcs-rev-to-flags (rev &optional from/to)
+  "Derive an argument list specifying patch REV.
+
+If FROM/TO is `from', this is the start of a range; if it is `to',
+this is the end of a range; otherwise it is a single patch.
+
+The start of REV determines whether it is treated as a tag, a match
+specification, or a patch name match.  If the prefix of REV is `tag ',
+the suffix is taken as a tag name.  If its prefix is `(', `exact ',
+`name ', `hash ', `date ', or `author ', REV is taken as a
+`--match'-style specification.  Otherwise REV is taken as a
+`--patch'-style specification."
+  (setq from/to (cond ((eq 'from from/to)
+		       "from-")
+		      ((eq 'to from/to)
+		       "to-")))
+  (when rev
+    (let (case-fold-search)
+      (list
+       (cond
+	((string-match "^\\(?:\(\\|exact \\|name \\|hash \\|date \\|author \\)"
+		       rev)
+	 (concat "--" from/to "match"))
+	((string-match "^tag " rev)
+	 (setq rev (substring rev 4))
+	 (concat "--" from/to "tag"))
+	(t
+	 (concat "--" from/to "patch")))
+       rev))))
+
+;; This is typically too slow.
+;; At least with GNU utils we could do this iff we're at the top level,
+;; else adjust relative to top level.
+;;   diff -u -r _darcs/current .|grep -v ^Only
+
+(defun vc-darcs-diff-tree (backend dir rev1 rev2)
+  "List differences for all registered files at and below DIR.
+Revisions REV1 and REV2 are ignored."
+  (let ((default-directory dir))
+    (vc-darcs-diff "." rev1 rev2)))
+
+(autoload 'vc-snapshot-precondition "vc")
+
+(defun vc-darcs-create-snapshot (dir name branchp)
+  "Create snapshot for directory DIR.
+Actually tags it with tag NAME.  Gets an error if BRANCHP is non-nil."
+  (when branchp
+    (error "VC darcs backend does not support module branches"))
+  (let ((result (vc-snapshot-precondition dir)))
+    (if (stringp result)
+	(error "File %s is not up-to-date" result)
+      (vc-darcs-command "tag" nil 'async nil "--pipe")
+      (with-current-buffer "*vc*"
+	(process-send-string nil (format "%s\n%s\n%s\n"
+					 (format-time-string  "%Y%m%d%H%M%S")
+					 (vc-darcs-author dir) name))
+	(process-send-eof)))))
+
+(defun vc-darcs-dir-state (dir)
+  (with-temp-buffer
+    (cd dir)				; fixme:  necessary?
+    ;; Could use --ignore-times.
+    ;; NB. this also produces output for any higher-level directories in
+    ;; this darcs tree; I don't think that matters.
+    ;; Status 2 happens if we end up running this in a non-darcs directory.
+    (vc-darcs-command "whatsnew" t 2 nil "-l")
+    (goto-char (point-min))
+    (let (conflict file type case-fold-search)
+      ;; The possibilities for the leading tag are: `A'dded,
+      ;; `M'odified, `R'emoved.  A following `!' indicates a conflict.
+      ;; Can also have `a' for unregistered file.
+      ;; Fixme:  Sort out renames.
+      (while (re-search-forward "^\\([AMR]\\)\\(!\\)? " nil t)
+	(setq conflict (equal "!" (match-string 2))
+	      type (match-string 1))
+	(if (equal "M" type)
+	    ;; Beware of spaces in filename, though there's some
+	    ;; ambiguity.  There must be one or two trailing signed
+	    ;; integers.  Assume if there are two that the first isn't
+	    ;; part of the file name, e.g.
+	    ;; ./a -1 +1
+	    ;; is actually the file `./a', not `./a -1'.
+	    (progn (looking-at "\\(.+?\\)\\(?: [-+][0-9]+\\)\\{1,2\\}$")
+		   (setq file (match-string 1)))
+	  (setq file (buffer-substring (point) (line-end-position))))
+	(vc-file-setprop (expand-file-name file) 'vc-state 'edited)
+	;; Fixme:  We need more states for darcs -- see fixme on Emacs
+	;; 22 vc-state.  Lets use another property.
+	(vc-file-setprop (expand-file-name file) 'darcs-state
+			 (cond (conflict 'conflict)
+			       ((equal "A" type) 'added)
+			       ;; Won't actually get R files.
+			       ))))))
+
+;; The default has the uname instead of `modified'.
+(defun vc-darcs-dired-state-info (file)
+  "VC darcs backend for `dired-state-info'."
+  (when (eq 'edited (vc-state file))
+    (let ((state (vc-file-getprop file 'darcs-state)))
+      (cond ((equal state 'added) "(added)")
+	    ((equal state 'conflict) "(conflict)")
+	    (t "(modified)")))))
+
+;; The default versions currently lose with non-numeric-style
+;; versions.  Just make sure these return nil.
+(defalias 'vc-darcs-previous-version 'ignore)
+(defalias 'vc-darcs-next-version 'ignore)
+
+;; vc-previous-version doesn't support backend handlers in Emacs 21.
+;; (next-version doesn't exist there.)
+;; Fixme:  Can the advice be postponed somehow until needed?
+(unless (fboundp 'vc-default-previous-version)
+(defadvice vc-previous-version (around darcs nil activate)
+  "Allow for VC backend functions."
+  (let ((function (vc-find-backend-function (vc-backend (buffer-file-name))
+					    'previous-version)))
+    (if function
+	(setq ad-return-value
+	      ;; (Single-arg) handlers are defined in Emacs 21, even
+	      ;; though vc-previous-version doesn't use them.
+	      (funcall function (ad-get-arg 0)))
+      ad-do-it))))
+
+(defun vc-darcs-delete-file (file)
+  "Delete FILE and delete it in the darcs repository."
+  (condition-case ()
+      (delete-file file)
+    (file-error nil))
+  (vc-darcs-command "record" nil 0 file "-m" (concat file "deleted.") ))
+
+(defun vc-darcs-rename-file (old new)
+  "Rename file from OLD to NEW using `darcs mv'."
+  (vc-darcs-command "mv" nil 0 new old))
+
+;; Fixme:  Fix VC for this.
+(unless (fboundp 'vc-default-version-backup-file-name)
+(defadvice vc-version-backup-file-name (around darcs nil activate)
+  "Allow for VC backend functions."
+  (if (vc-find-backend-function (vc-backend (ad-get-arg 0))
+				'version-backup-file-name)
+      (setq ad-return-value
+	    (vc-call version-backup-file-name (ad-get-arg 0) (ad-get-arg 1)
+		     (ad-get-arg 2) (ad-get-arg 3)))
+    ad-do-it)))
+
+(autoload 'timezone-make-date-sortable "timezone")
+
+(defun vc-darcs-version-backup-file-name (file &optional rev manual regexp)
+  "VC darcs backend for `version-backup-file-name'.
+Ensure REV is shorter than 21 characters for sanity, hoping that will
+be unique.  If REV contains a date specification as from
+`log-view-current-tag', return the condensed version of that.
+Otherwise return the first 20 characters of REV's md5 hash."
+  (if regexp
+      ;; Can have anything between the ~s, c.f. CVS.
+      (concat (regexp-quote (file-name-nondirectory file))
+              "\\.~.+" (unless manual "\\.") "~\\'")
+    (unless rev (setq rev (vc-workfile-version file)))
+    (if (string-match "\\<date \\(\".+\"\\)" rev)
+	(setq rev
+	      (replace-regexp-in-string
+	       ":" ""
+	       ;; Returns "YYYYMMDDHH:MM:SS"
+	       (timezone-make-date-sortable (match-string 1 rev) nil "UTC")))
+      (when (> (length rev) 20)
+	(if (string-match "&&" rev)
+	    (setq rev (md5 rev)))	; for want of a better idea
+	(setq rev (substring rev 0 20)))
+      ;; Slashes in the revision name would screw us and tildas might
+      ;; cause confusion.
+      ;; Fixme:  Perhaps replace more characters.
+      (setq rev (replace-regexp-in-string "[/~]" "-" rev)))
+    (expand-file-name (concat (file-name-nondirectory file)
+                              ".~" (or rev (vc-workfile-version file))
+                              (unless manual ".") "~")
+                      (file-name-directory file))))
+
+(defvar vc-darcs-annotation-table nil
+  "Internal use.")
+(make-variable-buffer-local 'vc-darcs-annotation-table)
+
+;; Fixme:  Maybe use VERSION.
+(defun vc-darcs-annotate-command (file buffer &optional version)
+  "Prepare BUFFER for `vc-annotate' on FILE.
+Each line is tagged with a 14-digit time string YYYYMMDDHHMMSS which
+has a `help-echo' property containing author and revision name
+information."
+  (vc-darcs-command "annotate" buffer 0 file)
+  (with-current-buffer buffer
+    ;; Store the tags for the annotated source lines in a hash table
+    ;; to allow saving space by sharing the text properties.
+    (setq vc-darcs-annotation-table (make-hash-table :test 'equal))
+    (goto-char (point-min))
+    (while (re-search-forward "^# Following line added by [[]\\([^\n]*\\)
+# \\(.+\\)\\*\\*\\([^]\n]+\\)\\(]\\)? *$" nil t)
+      (let ((start (match-beginning 0))
+	    (name (match-string 1))
+	    (author (match-string 2))
+	    (time (match-string 3))
+	    (ended (match-beginning 4))
+	    (key (match-string 0))
+	    end tag)
+	(unless ended (re-search-forward "^] *" nil 'move))
+	(setq end (line-beginning-position 2)
+	      tag (gethash key vc-darcs-annotation-table))
+	(unless tag
+	  (unless (string-match "[0-9]\\{14\\}" time)
+	    ;; Older patches have rfc822-like date strings, not
+	    ;; YYYYMMDDHHMMSS.
+	    (setq time (replace-regexp-in-string
+			":" "" (timezone-make-date-sortable time))))
+	  (setq tag (propertize time 'help-echo (concat author ": " name)
+				'mouse-face 'highlight))
+	  (puthash key tag vc-darcs-annotation-table))
+	(delete-region start end)
+	(goto-char start)
+	(insert tag)))
+    (unless window-system
+      (add-hook (make-local-hook 'post-command-hook)
+		(lambda ()
+		  (let ((help-echo (get-text-property (point) 'help-echo)))
+		    (if help-echo (message "%s" help-echo))))))))
+
+;; Definition from Emacs 22
+(unless (fboundp 'vc-annotate-convert-time)
+(defun vc-annotate-convert-time (time)
+  "Convert a time value to a floating-point number of days.
+The argument TIME is a list as returned by `current-time' or
+`encode-time', only the first two elements of that list are considered."
+  (/ (+ (* (float (car time)) (lsh 1 16)) (cadr time)) 24 3600)))
+
+(defun vc-darcs-annotate-time ()
+  (when (re-search-forward "^\\([0-9]\\{14\\}\\) " nil t)
+    (let ((time (match-string 1)))
+      (vc-annotate-convert-time
+       (encode-time (string-to-number (substring time 12 14))
+		    (string-to-number (substring time 10 12))
+		    (string-to-number (substring time 8 10))
+		    (string-to-number (substring time 6 8))
+		    (string-to-number (substring time 4 6))
+		    (string-to-number (substring time 0 4)))))))
+
+(defun vc-darcs-annotate-extract-revision-at-line ()
+  "Return revision for current line of annoation buffer, or nil.
+The revision is of the form
+\"date <date> && author <author> && exact <name>\".
+Return nil if current line isn't annotated."
+  (save-excursion
+    (beginning-of-line)
+    (if (looking-at "[0-9]\\{14\\}")
+	(let ((date (match-string-no-properties 0))
+	      (help-echo (get-text-property (point) 'help-echo)))
+	  (if (and help-echo
+		   (string-match "\\`\\(.+\\): \\(.+\\)\\'" help-echo))
+	      (format "date %s && author %S && exact %S"
+		      date (match-string-no-properties 1 help-echo)
+		      (match-string-no-properties 2 help-echo)))))))
+
+;; Not needed for Emacs 22
+(defun vc-darcs-annotate-difference (point)
+  (let ((next-time (vc-darcs-annotate-time)))
+    (if next-time
+	(- (vc-annotate-convert-time (current-time)) next-time))))
+
+;; In case of just `(load "vc-darcs")', but that's probably the wrong
+;; way to do it.
+(add-to-list 'vc-handled-backends 'DARCS)
+
+(eval-after-load "vc"
+  '(add-to-list 'vc-directory-exclusion-list "_darcs" t))
+
+(defconst vc-darcs-unload-hook
+  (lambda ()
+    (ad-remove-advice 'log-view-current-tag 'around 'darcs)
+    (ad-remove-advice 'vc-previous-version 'around 'darcs)
+    (ad-remove-advice 'vc-version-backup-file-name 'around 'darcs)
+    (setq vc-handled-backends (delq 'DARCS vc-handled-backends))))
+
+(provide 'vc-darcs)
+;;; vc-darcs.el ends here
hunk ./README 3
-The file vc-darcs-dired.el
+
hunk ./vc-darcs-dired.el 7
-  (vc-darcs-command "whatsnew" nil 0 (dired-current-directory) "-u")
+  (vc-darcs-command "whatsnew" nil 1 (dired-current-directory) "-u")
hunk ./vc-darcs-dired.el 56
-	    (vc-darcs-command "whatsnew" nil 0 nil "-l" "-s" "--boring")
+	    (vc-darcs-command "whatsnew" nil 1 nil "-l" "-s" "--boring")
hunk ./vc-darcs-dired.el 105
+
+(defun drop-prefix (prefix string)
+  (cond ((> (length prefix) (length string)) string)
+	((string= prefix (substring string 0 (length prefix)))
+	 (substring string (length prefix)))
+	(t string)))
hunk ./README 4
+Copy .el files to ~/elisp if in use, otherwise /usr/local/share/emacs/site-lisp
+Usage:
+(load-library  'vc-darcs-dired)
+
hunk ./vc-darcs-dired.el 4
+(defun drop-prefix (prefix string)
+  (cond ((> (length prefix) (length string)) string)
+	((string= prefix (substring string 0 (length prefix)))
+	 (substring string (length prefix)))
+	(t string)))
+
hunk ./vc-darcs-dired.el 58
-	    (with-current-buffer "*vc*" (split-string (buffer-string) "\n"))))
+	    (with-current-buffer "*vc*" (remove-if (lambda (x) (or (string= x "") (string= x "No changes!")))
+						   (split-string (buffer-string) "\n")))))
hunk ./vc-darcs-dired.el 71
-			  (list name3 (substring s 0 1)))) (split-string (buffer-string) "\n"))))))
+			  (list name3 (substring s 0 1)))) (remove-if (lambda (x) (or (string= x "") (string= x "No changes!")))
+								      (split-string (buffer-string) "\n")))))))
hunk ./vc-darcs-dired.el 26
+(defun vc-darcs-dired-add-file ()
+  "Run \"darcs add\" on current file."
+  (interactive)
+  (vc-darcs-command "add" nil 0 (dired-get-filename))
+  (dired-relist-entry (dired-get-filename)))
+
+(defun vc-darcs-dired-remove-file ()
+  "Run \"darcs remove\" on current file."
+  (interactive)
+  (vc-darcs-command "remove" nil 0 (dired-get-filename))
+  (dired-relist-entry (dired-get-filename)))
+
hunk ./vc-darcs-dired.el 41
+    (define-key map "ta" 'vc-darcs-dired-add-file)
+    (define-key map "td" 'vc-darcs-dired-remove-file)
hunk ./vc-darcs-dired.el 63
+	  ((equal typ '("R")) "removed")
hunk ./vc-darcs-dired.el 69
-  (let* ((manifest
+  (let* ((buffer (get-buffer-create "*vc*"))
+	 (manifest
hunk ./vc-darcs-dired.el 72
-	    (with-current-buffer "*vc*" (erase-buffer))
+	    (with-current-buffer buffer (erase-buffer))
hunk ./vc-darcs-dired.el 74
-	    (with-current-buffer "*vc*" (remove-if (lambda (x) (or (string= x "") (string= x "No changes!")))
-						   (split-string (buffer-string) "\n")))))
+	    (with-current-buffer "*vc*" (split-string (buffer-string) "\n"))))
hunk ./vc-darcs-dired.el 74
-	    (with-current-buffer "*vc*" (split-string (buffer-string) "\n"))))
+	    (with-current-buffer buffer (remove-if (lambda (x) (or (string= x "") (string= x "No changes!")))
+						   (split-string (buffer-string) "\n")))))
hunk ./vc-darcs-dired.el 130
-(defun drop-prefix (prefix string)
-  (cond ((> (length prefix) (length string)) string)
-	((string= prefix (substring string 0 (length prefix)))
-	 (substring string (length prefix)))
-	(t string)))
-
hunk ./vc-darcs-dired.el 3
+(require 'dired-aux)
hunk ./vc-darcs-dired.el 79
-	    (with-current-buffer "*vc*" (erase-buffer))
+	    (with-current-buffer buffer (erase-buffer))
hunk ./vc-darcs-dired.el 81
-	    (with-current-buffer "*vc*"
+	    (with-current-buffer buffer
hunk ./vc-darcs-dired.el 161
-  (if (and (vc-darcs-_darcs-dir default-directory)
-	   (not (string= major-mode 'darcs-dired-mode)))
-      (darcs-dired-mode)))
+  (cond ((and (vc-darcs-_darcs-dir default-directory)
+	      (not (string= major-mode 'darcs-dired-mode)))
+	 (setq dired-listing-switches "-l")
+	 (darcs-dired-mode))))
hunk ./vc-darcs.el 151
+;(defun vc-darcs-_darcs-dir (file)
+;  "Return the _darcs directory in the hierarchy above FILE.
+;Return nil if there isn't one.  Also return nil if we are
+;inside the _darcs directory, or we are in a directory that
+;does not exist in the pristine tree."
+;  (or (vc-file-getprop file 'darcs-dir)
+;      (let ((dir (if (file-directory-p (setq file (expand-file-name file)))
+;		     file
+;		   (file-name-directory file)))
+;	    (loop (lambda (top sub) 
+;		    (
+;	    _darcs)
+;	(vc-file-setprop
+;	 file 'darcs-dir
+;	 (catch 'found
+;	   (while t
+;	     -- Set _darcs to the _darcs directory path if it exists here
+;	     (setq _darcs (expand-file-name "_darcs" dir))
+;	     (if (file-directory-p _darcs)
+;		 (throw 'found (file-name-as-directory _darcs)))
+;	     (if (equal "" (file-name-nondirectory (directory-file-name dir)))
+;		 (throw 'found nil)
+;	       (setq dir (file-name-directory (directory-file-name dir))))))))))
+
+
+(defun vc-darcs-_darcs-dir (file)
+  "Return the _darcs directory in the hierarchy above FILE.
+Return nil if there isn't one.  Also return nil if we are
+inside the _darcs directory, or we are in a directory that
+does not exist in the pristine tree."
+  (let* ((dir (if (file-directory-p (setq file (expand-file-name file)))
+		  file
+		(file-name-directory file)))
+	 (_darcs (search-for-_darcs file "")))
+    (if _darcs (vc-file-setprop file 'darcs-dir _darcs))
+    _darcs))
+
+(defun search-for-_darcs (top sub)
+  (cond 
+   ((equal (file-name-nondirectory (directory-file-name top)) "_darcs") nil)
+   ((and (file-directory-p (expand-file-name "_darcs" top))				;; Is there a _darcs directory here?
+	 (file-directory-p (expand-file-name (concat "_darcs/pristine" sub) top)))	;; Is the original directory in the _darcs repo?
+    (file-name-as-directory (expand-file-name "_darcs" top)))
+   ((equal top "/") nil)
+   (t (let ((newsub (file-name-nondirectory (directory-file-name top)))
+	    (newtop (file-name-directory (directory-file-name top))))
+	(search-for-_darcs newtop (concat "/" newsub sub))))))
+
+(vc-darcs-_darcs-dir "/home/dsf/darcs/ghc683/ghc6-6.8.3/compat")
+
hunk ./vc-darcs-dired.el 95
-  (cond ((null manifest) whatsnew)
-	((null (assoc (car manifest) whatsnew))
-	 (merge-inventory (cons (list (car manifest)) whatsnew) (cdr manifest)))
-	(t (merge-inventory whatsnew (cdr manifest)))))	 
+  "Merge the manifest and whatsnew to get an inventory."
+  (append whatsnew (mapcar 'list (my-filter (lambda (x) (not (member x (mapcar 'car whatsnew)))) manifest))))
+
+(defun my-filter (condp lst)
+  (delq nil (mapcar (lambda (x) (and (funcall condp x) x)) lst)))
addfile ./50vc-darcs.el
hunk ./50vc-darcs.el 1
+(setq load-path
+      (cons (concat "/usr/share/"
+		    "emacs" ; (symbol-name flavor)
+		    "/site-lisp/vc-darcs") load-path))
+
+(custom-set-variables
+ '(vc-dired-recurse nil)
+ '(vc-diff-switches "-b")
+ '(vc-cvs-stay-local t)
+ '(vc-dired-terse-display 'vc)
+ '(vc-cvs-diff-switches "-u"))
addfile ./Makefile
hunk ./Makefile 1
+EMACS = emacs -batch -q -no-site-file -L .
+
+all:
+	$(EMACS) -f batch-byte-compile *.el
+	rm -f 50vc-darcs.elc
+
+install:
+	mkdir -p $(PREFIX)/etc/emacs/site-start.d
+	mkdir -p $(PREFIX)/usr/share/emacs/site-lisp/
+	mkdir -p $(PREFIX)/usr/bin/
+	cp 50vc-darcs.el $(PREFIX)/etc/emacs/site-start.d
+	cp *.elc $(PREFIX)/usr/share/emacs/site-lisp/
+
+clean:
+	rm -f *.elc
hunk ./README 2
-http://www.loveshack.ukfsn.org/emacs/vc-darcs.el and is unmodified.
-
-Copy .el files to ~/elisp if in use, otherwise /usr/local/share/emacs/site-lisp
-Usage:
-(load-library  'vc-darcs-dired)
+http://www.loveshack.ukfsn.org/emacs/vc-darcs.el and is almost unmodified.
adddir ./debian
addfile ./debian/changelog
hunk ./debian/changelog 1
+vc-darcs (0.1) unstable; urgency=low
+
+  * New debianiation
+
+ -- David Fox <dsf@seereason.com>  Sun, 27 Jul 2008 09:37:38 -0700
+
addfile ./debian/control
hunk ./debian/control 1
+Source: vc-darcs
+Priority: optional
+Section: devel
+Maintainer: David Fox <dsf@seereason.com>
+Build-Depends: emacsen
+Standards-Version: 3.7.2.2
+
+Package: vc-darcs
+Architecture: all
+Section: devel
+Description: Emacs support for DARCS repository, with a dired add-on
addfile ./debian/rules
hunk ./debian/rules 1
+#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+binary-fixup/vc-darcs::
+	make all install PREFIX=debian/vc-darcs
hunk ./vc-darcs.el 191
-   ((and (file-directory-p (expand-file-name "_darcs" top))				;; Is there a _darcs directory here?
-	 (file-directory-p (expand-file-name (concat "_darcs/pristine" sub) top)))	;; Is the original directory in the _darcs repo?
+   ((and (file-directory-p (expand-file-name "_darcs" top))				;; Is
+	 ;; there a _darcs directory here?  BUG: This will make files
+	 ;; in un-recorded directories not appear to be darcs
+	 ;; controlled.  But omitting it means we spend a lot of time
+	 ;; trying to darcs whatsnew in non-darcs directories.
+	 (or (file-directory-p (expand-file-name (concat "_darcs/pristine" sub) top))
+	     ;; Is the original directory in the _darcs repo?
+	     (file-exists-p (expand-file-name "_darcs/tentative_pristine" top))
+	     ;; Or maybe there are directories that have been added but not recorded
+	     ))
addfile ./debian/compat
hunk ./debian/compat 1
+5
hunk ./debian/control 5
-Build-Depends: emacsen
+Build-Depends: emacsen, cdbs
hunk ./50vc-darcs.el 13
+(require 'vc-darcs-dired)
+
hunk ./Makefile 4
-	$(EMACS) -f batch-byte-compile *.el
+	$(EMACS) -f batch-byte-compile vc-darcs.el vc-darcs-dired.el
hunk ./vc-darcs-dired.el 4
+(require 'cl)
hunk ./vc-darcs-dired.el 177
+
+(provide 'vc-darcs-dired)
hunk ./vc-darcs.el 132
-(defun vc-darcs-_darcs-dir (file)
-  "Return the _darcs directory in the hierarchy above FILE.
-Return nil if there isn't one."
-  (or (vc-file-getprop file 'darcs-dir)
-      (let ((dir (if (file-directory-p (setq file (expand-file-name file)))
-		     file
-		   (file-name-directory file)))
-	    _darcs)
-	(vc-file-setprop
-	 file 'darcs-dir
-	 (catch 'found
-	   (while t
-	     (setq _darcs (expand-file-name "_darcs" dir))
-	     (if (file-directory-p _darcs)
-		 (throw 'found (file-name-as-directory _darcs)))
-	     (if (equal "" (file-name-nondirectory (directory-file-name dir)))
-		 (throw 'found nil)
-	       (setq dir (file-name-directory (directory-file-name dir))))))))))
+;(defun vc-darcs-_darcs-dir (file)
+;  "Return the _darcs directory in the hierarchy above FILE.
+;Return nil if there isn't one."
+;  (or (vc-file-getprop file 'darcs-dir)
+;      (let ((dir (if (file-directory-p (setq file (expand-file-name file)))
+;		     file
+;		   (file-name-directory file)))
+;	    _darcs)
+;	(vc-file-setprop
+;	 file 'darcs-dir
+;	 (catch 'found
+;	   (while t
+;	     (setq _darcs (expand-file-name "_darcs" dir))
+;	     (if (file-directory-p _darcs)
+;		 (throw 'found (file-name-as-directory _darcs)))
+;	     (if (equal "" (file-name-nondirectory (directory-file-name dir)))
+;		 (throw 'found nil)
+;	       (setq dir (file-name-directory (directory-file-name dir))))))))))
hunk ./debian/control 5
-Build-Depends: emacsen, cdbs
+Build-Depends: emacsen, cdbs, emacsen
hunk ./debian/control 5
-Build-Depends: emacsen, cdbs, emacsen
+Build-Depends: emacsen, cdbs, emacs22