diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2008-11-04 17:36:43 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2008-11-04 17:36:43 +0000 |
| commit | da4d4066794fa114d340a0c1d796aed1523a7c72 (patch) | |
| tree | e2a5442c026d52d003334bfa16642f006a8ddd63 /lisp/vc-bzr.el | |
| parent | 74c76008f5bb0c55699f0402eefa0ea96639ad37 (diff) | |
| download | emacs-da4d4066794fa114d340a0c1d796aed1523a7c72.tar.gz emacs-da4d4066794fa114d340a0c1d796aed1523a7c72.tar.bz2 emacs-da4d4066794fa114d340a0c1d796aed1523a7c72.zip | |
(vc-bzr-dir-extra-headers): New function.
(vc-bzr-dir-printer): Rename from vc-bzr-status-printer.
Diffstat (limited to 'lisp/vc-bzr.el')
| -rw-r--r-- | lisp/vc-bzr.el | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 2fa1ee2509b..efa9fc9ef9e 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -585,10 +585,10 @@ stream. Standard error output is discarded." (:conc-name vc-bzr-extra-fileinfo->)) extra-name) ;; original name for rename targets, new name for -(defun vc-bzr-status-printer (info) +(defun vc-bzr-dir-printer (info) "Pretty-printer for the vc-dir-fileinfo structure." (let ((extra (vc-dir-fileinfo->extra info))) - (vc-default-status-printer 'Bzr info) + (vc-default-dir-printer 'Bzr info) (when extra (insert (propertize (format " (renamed from %s)" @@ -664,6 +664,19 @@ stream. Standard error output is discarded." (apply 'vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S" files) (vc-exec-after `(vc-bzr-after-dir-status (quote ,update-function)))) + +(defun vc-bzr-dir-extra-headers (dir) + (let ((str (with-temp-buffer + (vc-bzr-command "info" t 0 dir) + (buffer-string)))) + (concat + (propertize "Parent branch: " 'face 'font-lock-type-face) + (propertize + (if (string-match "parent branch: \\(.+\\)$" str) + (match-string 1 str) + "None") + 'face 'font-lock-variable-name-face)))) + ;;; Revision completion (defun vc-bzr-revision-completion-table (files) |