From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#7792: 24.0.50; vc-annotate doesn't understand all commiters IDs Date: Thu, 06 Jan 2011 20:22:29 -0500 Message-ID: References: <87mxnf6u3a.fsf@everybody.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1294363454 8042 80.91.229.12 (7 Jan 2011 01:24:14 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 7 Jan 2011 01:24:14 +0000 (UTC) Cc: 7792@debbugs.gnu.org, Katsumi Yamaoka To: mah@everybody.org (Mark A. Hershberger) Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jan 07 02:24:08 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Pb13n-0005w9-BI for geb-bug-gnu-emacs@m.gmane.org; Fri, 07 Jan 2011 02:24:07 +0100 Original-Received: from localhost ([127.0.0.1]:46476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pb13m-0002m0-JZ for geb-bug-gnu-emacs@m.gmane.org; Thu, 06 Jan 2011 20:24:06 -0500 Original-Received: from [140.186.70.92] (port=52720 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pb13e-0002kz-KF for bug-gnu-emacs@gnu.org; Thu, 06 Jan 2011 20:24:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pb13a-0008IE-Qf for bug-gnu-emacs@gnu.org; Thu, 06 Jan 2011 20:23:58 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:56223) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pb13a-0008IA-Ox for bug-gnu-emacs@gnu.org; Thu, 06 Jan 2011 20:23:54 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1Pb0vy-0000hL-GS; Thu, 06 Jan 2011 20:16:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 07 Jan 2011 01:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 7792 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 7792-submit@debbugs.gnu.org id=B7792.12943629182621 (code B ref 7792); Fri, 07 Jan 2011 01:16:02 +0000 Original-Received: (at 7792) by debbugs.gnu.org; 7 Jan 2011 01:15:18 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Pb0vF-0000gC-Q1 for submit@debbugs.gnu.org; Thu, 06 Jan 2011 20:15:18 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183] helo=ironport2-out.pppoe.ca) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Pb0vD-0000fw-3N; Thu, 06 Jan 2011 20:15:15 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAEr5JU1MCpdc/2dsb2JhbACkHnS9FoVMBIRnjiA X-IronPort-AV: E=Sophos;i="4.60,286,1291611600"; d="scan'208";a="87266634" Original-Received: from 76-10-151-92.dsl.teksavvy.com (HELO pastel.home) ([76.10.151.92]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 06 Jan 2011 20:22:29 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id B0D6458B92; Thu, 6 Jan 2011 20:22:29 -0500 (EST) In-Reply-To: <87mxnf6u3a.fsf@everybody.org> (Mark A. Hershberger's message of "Wed, 05 Jan 2011 14:14:49 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Thu, 06 Jan 2011 20:16:02 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:43166 Archived-At: 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 > ) > 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 " format. So it should have been something like "Gnus developpers " 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 + + * vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time): + Author names can have space (bug#7792). + 2011-01-04 Kenichi Handa * 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)))