From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?Q?=C3=93scar?= Fuentes Newsgroups: gmane.emacs.bugs Subject: bug#4144: 23.1.50; VC Annotate for bzr files broken Date: Mon, 07 Sep 2009 07:17:34 +0200 Message-ID: <87y6or8hap.fsf@telefonica.net> Reply-To: =?UTF-8?Q?=C3=93scar?= Fuentes , 4144@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1252301244 4789 80.91.229.12 (7 Sep 2009 05:27:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 7 Sep 2009 05:27:24 +0000 (UTC) To: 4144@emacsbugs.donarmstrong.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Sep 07 07:27:17 2009 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.50) id 1MkWl2-00059C-4m for geb-bug-gnu-emacs@m.gmane.org; Mon, 07 Sep 2009 07:27:16 +0200 Original-Received: from localhost ([127.0.0.1]:38632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MkWl1-0008Ct-9i for geb-bug-gnu-emacs@m.gmane.org; Mon, 07 Sep 2009 01:27:15 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MkWkt-0008BD-Oy for bug-gnu-emacs@gnu.org; Mon, 07 Sep 2009 01:27:07 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MkWko-00086b-N1 for bug-gnu-emacs@gnu.org; Mon, 07 Sep 2009 01:27:07 -0400 Original-Received: from [199.232.76.173] (port=52861 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MkWko-00086C-6M for bug-gnu-emacs@gnu.org; Mon, 07 Sep 2009 01:27:02 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:41082) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MkWkn-0000bg-IM for bug-gnu-emacs@gnu.org; Mon, 07 Sep 2009 01:27:01 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n875QwhE021320; Sun, 6 Sep 2009 22:26:58 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n875P47r020960; Sun, 6 Sep 2009 22:25:04 -0700 Resent-Date: Sun, 6 Sep 2009 22:25:04 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: =?UTF-8?Q?=C3=93scar?= Fuentes Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Mon, 07 Sep 2009 05:25:04 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 4144 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 4144-submit@emacsbugs.donarmstrong.com id=B4144.125230066419969 (code B ref 4144); Mon, 07 Sep 2009 05:25:04 +0000 Original-Received: (at 4144) by emacsbugs.donarmstrong.com; 7 Sep 2009 05:17:44 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from ctsmtpout1.frontal.correo (outmailhost.telefonica.net [213.4.149.242]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n875HguT019962 for <4144@emacsbugs.donarmstrong.com>; Sun, 6 Sep 2009 22:17:43 -0700 Original-Received: from qcore (83.52.52.96) by ctsmtpout1.frontal.correo (7.2.056.6) (authenticated as 981711563$telefonica.net) id 4A8F1FC3002A30C4 for 4144@emacsbugs.donarmstrong.com; Mon, 7 Sep 2009 07:17:36 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Mon, 07 Sep 2009 01:27:07 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list 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:30840 Archived-At: The breakage is caused by commits with empty `committer' field (in this case coming from conversions from other VCS). This confuses the regexp used by vc-bzr-annotate-command for determining revision id, author and date. Some experimentation shows that this regexp works on the case of empty committer field too: *** /usr/local/share/emacs/23.1.50/lisp/vc-bzr.el.gz --- /tmp/buffer-content-191724Q *************** *** 547,553 **** ;; to allow saving space by sharing the text properties. (setq vc-bzr-annotation-table (make-hash-table :test 'equal)) (goto-char (point-min)) ! (while (re-search-forward "^\\( *[0-9.]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\) |" nil t) (let* ((rev (match-string 1)) (author (match-string 2)) --- 547,554 ---- ;; to allow saving space by sharing the text properties. (setq vc-bzr-annotation-table (make-hash-table :test 'equal)) (goto-char (point-min)) ! ;;; `author' field may be empty: ! (while (re-search-forward "^\\( *[0-9.]+\\) *\\([^\n ]* *?\\) +\\([0-9]\\{8\\}\\) |" nil t) (let* ((rev (match-string 1)) (author (match-string 2))