(vc-bzr-after-dir-status): Parse the output for non

existent files.
(vc-bzr-dir-status-files): New function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 550d787c753cd967e4febff7825f702621b52b82..3144a000500b936b52d52a3a2b02756ba1e949de 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-05  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc-bzr.el (vc-bzr-after-dir-status): Parse the output for non
+       existent files.
+       (vc-bzr-dir-status-files): New function.
+
 2008-10-04  Glenn Morris  <rgm@gnu.org>
 
        * files.el (make-temp-file): Handle empty `prefix'.  (Bug#1081)

diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 45269e5eed92f3a12bacaf4ee1f40e8fc40f6660..2fa1ee2509b6587f0ee0be754371a5e9a85e2b42 100644 (file)
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -611,6 +611,9 @@ stream.  Standard error output is discarded."
                       ("?  " . unregistered)
                       ;; No such state, but we need to distinguish this case.
                       ("R  " . renamed)
+                      ;; For a non existent file FOO, the output is:
+                      ;; bzr: ERROR: Path(s) do not exist: FOO
+                      ("bzr" . not-found)
                        ;; Ignore "P " and "P." for pending patches.
                        ))
        (translated nil)
@@ -640,6 +643,8 @@ stream.  Standard error output is discarded."
                (old-name (match-string 1)))
            (push (list new-name 'edited
                      (vc-bzr-create-extra-fileinfo old-name)) result)))
+        ;; do nothing for non existent files
+        ((eq translated 'not-found))
         (t
          (push (list (buffer-substring-no-properties
                       (+ (point) 4)
@@ -654,6 +659,11 @@ stream.  Standard error output is discarded."
   (vc-exec-after
    `(vc-bzr-after-dir-status (quote ,update-function))))
 
+(defun vc-bzr-dir-status-files (dir files default-state update-function)
+  "Return a list of conses (file . state) for DIR."
+  (apply 'vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S" files)
+  (vc-exec-after
+   `(vc-bzr-after-dir-status (quote ,update-function))))
 ;;; Revision completion
 
 (defun vc-bzr-revision-completion-table (files)