From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Hull Newsgroups: gmane.emacs.devel,gmane.emacs.pretest.bugs Subject: 23.0.60; vc-hg-annotate-command version number bug + patch Date: Fri, 16 May 2008 13:22:48 -0700 Message-ID: NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1210975531 29990 80.91.229.12 (16 May 2008 22:05:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 16 May 2008 22:05:31 +0000 (UTC) To: emacs-pretest-bug@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 17 00:06:00 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Jx83P-0004E3-BA for ged-emacs-devel@m.gmane.org; Sat, 17 May 2008 00:05:49 +0200 Original-Received: from localhost ([127.0.0.1]:53290 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jx82f-0003rv-SK for ged-emacs-devel@m.gmane.org; Fri, 16 May 2008 18:04:45 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jx6S9-00007E-43 for emacs-devel@gnu.org; Fri, 16 May 2008 16:22:57 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jx6S8-00006k-Le for emacs-devel@gnu.org; Fri, 16 May 2008 16:22:56 -0400 Original-Received: from [199.232.76.173] (port=50666 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jx6S8-00006Z-8s for emacs-devel@gnu.org; Fri, 16 May 2008 16:22:56 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:38755) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Jx6S8-0005nZ-1T for emacs-devel@gnu.org; Fri, 16 May 2008 16:22:56 -0400 Original-Received: from mail.gnu.org ([199.232.76.166]:36823 helo=mx10.gnu.org) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1Jx6R3-0002uG-7z for emacs-pretest-bug@gnu.org; Fri, 16 May 2008 16:21:49 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Jx6S4-0005ml-Mo for emacs-pretest-bug@gnu.org; Fri, 16 May 2008 16:22:54 -0400 Original-Received: from mail.idealab.com ([208.76.2.4]:57199 helo=rain.mail.idealab.com) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Jx6S4-0005lw-4v for emacs-pretest-bug@gnu.org; Fri, 16 May 2008 16:22:52 -0400 Original-Received: from rain.mail.idealab.com (localhost.localdomain [127.0.0.1]) by localhost (Postfix) with ESMTP id 3956D6983C8; Fri, 16 May 2008 13:22:49 -0700 (PDT) Original-Received: from 10-1-2-210.dhcp.pas.lab (10-1-2-210.dhcp.pas.lab [10.1.2.210]) by rain.mail.idealab.com (Postfix) with ESMTP id 0DCAC698269; Fri, 16 May 2008 13:22:49 -0700 (PDT) Original-From: David Hull X-Antivirus: Scanned by F-Prot Antivirus (http://www.f-prot.com) X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-Mailman-Approved-At: Fri, 16 May 2008 18:04:40 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:97295 gmane.emacs.pretest.bugs:22345 Archived-At: There is a small problem in the function vc-hg-annotate-command that causes the code that deletes up to the first line of the sources to delete too far if the first line of sources starts with a space, such as the following: 0 Fri Apr 25 18:04:19 2008 -0700: #! /usr/bin/perl 0 Fri Apr 25 18:04:19 2008 -0700: 36 Tue May 13 17:55:19 2008 -0700: my @fields = @{$e->{field}}; This patch fixes the problem: Index: vc-hg.el =================================================================== RCS file: /sources/emacs/emacs/lisp/vc-hg.el,v retrieving revision 1.77 diff -u -r1.77 vc-hg.el --- vc-hg.el 15 May 2008 17:38:47 -0000 1.77 +++ vc-hg.el 16 May 2008 19:49:59 -0000 @@ -288,8 +288,8 @@ (when revision (concat "-r" revision))) (with-current-buffer buffer (goto-char (point-min)) - (re-search-forward "^[0-9]") - (delete-region (point-min) (1- (point))))) + (re-search-forward "^[ \t]*[0-9]") + (delete-region (point-min) (match-beginning 0)))) ;; The format for one line output by "hg annotate -d -n" looks like this: -- David Hull