aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-10-05 00:08:49 +0000
committerDan Nicolaescu2008-10-05 00:08:49 +0000
commit11b4001c8ffddf9cdde106409287f2387fd2cd83 (patch)
treeba68714f81d0ba8f79b85537096659ebb1cafbcd
parent97b69a575ab1c737a5a578d06bf29ddc6893ee06 (diff)
downloademacs-11b4001c8ffddf9cdde106409287f2387fd2cd83.tar.gz
emacs-11b4001c8ffddf9cdde106409287f2387fd2cd83.zip
(vc-bzr-after-dir-status): Parse the output for non
existent files. (vc-bzr-dir-status-files): New function.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/vc-bzr.el10
2 files changed, 16 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 550d787c753..3144a000500 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12008-10-05 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * vc-bzr.el (vc-bzr-after-dir-status): Parse the output for non
4 existent files.
5 (vc-bzr-dir-status-files): New function.
6
12008-10-04 Glenn Morris <rgm@gnu.org> 72008-10-04 Glenn Morris <rgm@gnu.org>
2 8
3 * files.el (make-temp-file): Handle empty `prefix'. (Bug#1081) 9 * files.el (make-temp-file): Handle empty `prefix'. (Bug#1081)
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 45269e5eed9..2fa1ee2509b 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -611,6 +611,9 @@ stream. Standard error output is discarded."
611 ("? " . unregistered) 611 ("? " . unregistered)
612 ;; No such state, but we need to distinguish this case. 612 ;; No such state, but we need to distinguish this case.
613 ("R " . renamed) 613 ("R " . renamed)
614 ;; For a non existent file FOO, the output is:
615 ;; bzr: ERROR: Path(s) do not exist: FOO
616 ("bzr" . not-found)
614 ;; Ignore "P " and "P." for pending patches. 617 ;; Ignore "P " and "P." for pending patches.
615 )) 618 ))
616 (translated nil) 619 (translated nil)
@@ -640,6 +643,8 @@ stream. Standard error output is discarded."
640 (old-name (match-string 1))) 643 (old-name (match-string 1)))
641 (push (list new-name 'edited 644 (push (list new-name 'edited
642 (vc-bzr-create-extra-fileinfo old-name)) result))) 645 (vc-bzr-create-extra-fileinfo old-name)) result)))
646 ;; do nothing for non existent files
647 ((eq translated 'not-found))
643 (t 648 (t
644 (push (list (buffer-substring-no-properties 649 (push (list (buffer-substring-no-properties
645 (+ (point) 4) 650 (+ (point) 4)
@@ -654,6 +659,11 @@ stream. Standard error output is discarded."
654 (vc-exec-after 659 (vc-exec-after
655 `(vc-bzr-after-dir-status (quote ,update-function)))) 660 `(vc-bzr-after-dir-status (quote ,update-function))))
656 661
662(defun vc-bzr-dir-status-files (dir files default-state update-function)
663 "Return a list of conses (file . state) for DIR."
664 (apply 'vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S" files)
665 (vc-exec-after
666 `(vc-bzr-after-dir-status (quote ,update-function))))
657;;; Revision completion 667;;; Revision completion
658 668
659(defun vc-bzr-revision-completion-table (files) 669(defun vc-bzr-revision-completion-table (files)