comparison lisp/vc-bzr.el @ 94003:2ecb2ea8d5b5

Change `dir-status' to not take (and pass) status-buffer. (vc-status-create-fileinfo): Make `extra' optional. (vc-status-busy): New fun. (vc-status-menu-map): Use it. (vc-status-crt-marked): Remove. (vc-status-update): Rename from vc-status-add-entries. Add argument so as to prevent addition of entries. Rewrite. (vc-update-vc-status-buffer): Remove. (vc-status-refresh): Don't remove old entries, set them to up-to-date instead. Also do it after the update is complete. (vc-status-marked-files): ¦Ç-reduce.

94002:bae1479690d4

                                     'edited)) ")")
    ;; else fall back to default vc.el representation
    (vc-default-dired-state-info 'Bzr file)))

;; XXX: this needs testing, it's probably incomplete. 
(defun vc-bzr-after-dir-status (update-function status-buffer)
  (let ((status-str nil)
	(file nil)
	(translation '(("+N" . added)
		       ("-D" . removed)
		       (" M" . edited)

	  (push (list (buffer-substring-no-properties
		       (+ (point) 4)
		       (line-end-position)) 
		      translated) result))
	(forward-line))
      (funcall update-function result status-buffer)))

;; XXX Experimental function for the vc-dired replacement.
;; XXX This probably needs some further refinement and testing.
(defun vc-bzr-dir-status (dir update-function status-buffer)
  "Return a list of conses (file . state) for DIR."
  ;; XXX: Is this the right command to use?
  (vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S")
  (vc-exec-after
   `(vc-bzr-after-dir-status (quote ,update-function) ,status-buffer)))

;;; Revision completion

(defun vc-bzr-complete-with-prefix (prefix action table string pred)
  (let ((comp (complete-with-action action table string pred)))

94003:2ecb2ea8d5b5

                                     'edited)) ")")
    ;; else fall back to default vc.el representation
    (vc-default-dired-state-info 'Bzr file)))

;; XXX: this needs testing, it's probably incomplete. 
(defun vc-bzr-after-dir-status (update-function)
  (let ((status-str nil)
	(file nil)
	(translation '(("+N" . added)
		       ("-D" . removed)
		       (" M" . edited)

	  (push (list (buffer-substring-no-properties
		       (+ (point) 4)
		       (line-end-position)) 
		      translated) result))
	(forward-line))
      (funcall update-function result)))

;; XXX Experimental function for the vc-dired replacement.
;; XXX This probably needs some further refinement and testing.
(defun vc-bzr-dir-status (dir update-function)
  "Return a list of conses (file . state) for DIR."
  ;; XXX: Is this the right command to use?
  (vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S")
  (vc-exec-after
   `(vc-bzr-after-dir-status (quote ,update-function))))

;;; Revision completion

(defun vc-bzr-complete-with-prefix (prefix action table string pred)
  (let ((comp (complete-with-action action table string pred)))