From: Stefan Monnier <monnier@iro.umontreal.ca>
To: mah@everybody.org (Mark A. Hershberger)
Cc: 7792@debbugs.gnu.org, Katsumi Yamaoka <yamaoka@jpl.org>
Subject: bug#7792: 24.0.50; vc-annotate doesn't understand all commiters IDs
Date: Thu, 06 Jan 2011 20:22:29 -0500 [thread overview]
Message-ID: <jwvpqsa3vn3.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87mxnf6u3a.fsf@everybody.org> (Mark A. Hershberger's message of "Wed, 05 Jan 2011 14:14:49 -0500")
close 7792
thanks
> While trying to find a large file to try vc-annotate on for the BZR
> backend, I first tried lisp/gnus/gnus-art.el from the Emacs repository
> but I noticed that commits (such as r102020
> <http://bazaar.launchpad.net/~vcs-imports/emacs/trunk/revision/102020>)
> that were made by a committer with a space in zes[1] commit id were not
> found.
Indeed. I've committed the patch below to the emacs-23 branch (for
Emacs-23.3) which should fix it.
Note that the author name used in those commits (i.e. "Gnus
developpers") is not a good choice since it doesn't follow the "name
<email>" format. So it should have been something like "Gnus
developpers <gnus@gnus.org>" which would not have triggered this bug.
Stefan
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog 2011-01-04 07:09:46 +0000
+++ lisp/ChangeLog 2011-01-06 16:00:20 +0000
@@ -1,3 +1,8 @@
+2011-01-06 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time):
+ Author names can have space (bug#7792).
+
2011-01-04 Kenichi Handa <handa@m17n.org>
* mail/rmailmm.el (rmail-mime-insert-bulk): Display an unknown
=== modified file 'lisp/vc-bzr.el'
--- lisp/vc-bzr.el 2011-01-02 23:50:46 +0000
+++ lisp/vc-bzr.el 2011-01-06 15:33:56 +0000
@@ -605,7 +605,7 @@
(when (process-buffer proc)
(with-current-buffer (process-buffer proc)
(setq string (concat (process-get proc :vc-left-over) string))
- (while (string-match "^\\( *[0-9.]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\)\\( |.*\n\\)" string)
+ (while (string-match "^\\( *[0-9.]+ *\\) \\(.+?\\) +\\([0-9]\\{8\\}\\)\\( |.*\n\\)" string)
(let* ((rev (match-string 1 string))
(author (match-string 2 string))
(date (match-string 3 string))
@@ -632,7 +632,7 @@
(declare-function vc-annotate-convert-time "vc-annotate" (time))
(defun vc-bzr-annotate-time ()
- (when (re-search-forward "^ *[0-9.]+ +[^\n ]* +|" nil t)
+ (when (re-search-forward "^ *[0-9.]+ +.+? +|" 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)))
prev parent reply other threads:[~2011-01-07 1:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-05 19:14 bug#7792: 24.0.50; vc-annotate doesn't understand all commiters IDs Mark A. Hershberger
2011-01-06 5:16 ` Glenn Morris
2011-01-06 7:40 ` Katsumi Yamaoka
2011-01-07 1:22 ` Stefan Monnier [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvpqsa3vn3.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=7792@debbugs.gnu.org \
--cc=mah@everybody.org \
--cc=yamaoka@jpl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.