[Emacs-diffs] emacs/lisp ChangeLog vc-bzr.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/12/06 20:22:19

Modified files:
        lisp           : ChangeLog vc-bzr.el 

Log message:
        * vc-bzr.el (vc-bzr-annotate-command): Show author in annotation.
        Handle empty author field (Bug#4144).  Suggested by Óscar Fuentes.
        (vc-bzr-annotate-time, vc-bzr-annotate-extract-revision-at-line):
        Update annotation regexp.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16844&r2=1.16845
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-bzr.el?cvsroot=emacs&r1=1.89&r2=1.90

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16844
retrieving revision 1.16845
diff -u -b -r1.16844 -r1.16845
--- ChangeLog   6 Dec 2009 19:49:04 -0000       1.16844
+++ ChangeLog   6 Dec 2009 20:22:16 -0000       1.16845
@@ -10,6 +10,11 @@
 
 2009-12-06  Chong Yidong  <address@hidden>
 
+       * vc-bzr.el (vc-bzr-annotate-command): Show author in annotation.
+       Handle empty author field (Bug#4144).  Suggested by Óscar Fuentes.
+       (vc-bzr-annotate-time, vc-bzr-annotate-extract-revision-at-line):
+       Update annotation regexp.
+
        * simple.el (beginning-of-visual-line): Constrain to field
        boundaries (Bug#5106).
 

Index: vc-bzr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-bzr.el,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- vc-bzr.el   3 Dec 2009 08:53:06 -0000       1.89
+++ vc-bzr.el   6 Dec 2009 20:22:19 -0000       1.90
@@ -572,8 +572,12 @@
                     (inhibit-read-only t))
                (setq string (substring string (match-end 0)))
         (unless tag
-          (setq tag (propertize rev 'help-echo (concat "Author: " author
-                                                       ", date: " date)
+                (setq tag
+                      (propertize
+                       (concat rev " " (substring author 0 7))
+                       'help-echo (format "Revision: %d, author: %s, date: %s"
+                                          (string-to-number rev)
+                                          author date)
                                 'mouse-face 'highlight))
                  (puthash key tag table))
                (goto-char (process-mark proc))
@@ -584,7 +588,7 @@
 (declare-function vc-annotate-convert-time "vc-annotate" (time))
 
 (defun vc-bzr-annotate-time ()
-  (when (re-search-forward "^ *[0-9.]+ +|" nil t)
+  (when (re-search-forward "^ *[0-9.]+ +[^\n ]* +|" nil t)
     (let ((prop (get-text-property (line-beginning-position) 'help-echo)))
       (string-match "[0-9]+\\'" prop)
       (let ((str (match-string-no-properties 0 prop)))
@@ -599,7 +603,7 @@
 Return nil if current line isn't annotated."
   (save-excursion
     (beginning-of-line)
-    (if (looking-at " *\\([0-9.]+\\) *| ")
+    (if (looking-at "^ *\\([0-9.]+\\) +[^\n ]* +|")
         (match-string-no-properties 1))))
 
 (defun vc-bzr-command-discarding-stderr (command &rest args)