[Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/11/04 17:36:43

Index: vc-bzr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-bzr.el,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- vc-bzr.el   5 Oct 2008 00:08:51 -0000       1.69
+++ vc-bzr.el   4 Nov 2008 17:36:43 -0000       1.70
@@ -585,10 +585,10 @@
             (: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 @@
   (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)