23.0.60; vc-hg-annotate-command version number bug + patch

23.0.60; vc-hg-annotate-command version number bug + patch

[David Hull]

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

Re: 23.0.60; vc-hg-annotate-command version number bug + patch

[Dan Nicolaescu]

David Hull <david@snap.com> writes:

  > 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:

I checked in this patch on the 22 branch, it will be merged to HEAD in a
few days.

Thanks!

bug#262: marked as done (23.0.60; vc-hg-annotate-command version number bug + patch)

[Emacs bug Tracking System]

[-- Attachment #1: Type: text/plain, Size: 890 bytes --]


Your message dated Thu, 29 May 2008 18:30:58 -0400
with message-id <k97idclp3x.fsf@fencepost.gnu.org>
and subject line Re: bug#262: 23.0.60; vc-hg-annotate-command version number bug + patch
has caused the Emacs bug report #262,
regarding 23.0.60; vc-hg-annotate-command version number bug + patch
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact don@donarmstrong.com
immediately.)


-- 
262: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=262
Emacs Bug Tracking System
Contact don@donarmstrong.com with problems

[-- Attachment #2: Type: message/rfc822, Size: 5745 bytes --]

From: David Hull <david@snap.com>
From: David Hull <hull@snap.com>
To: emacs-pretest-bug@gnu.org
Cc: 
Subject: 23.0.60; vc-hg-annotate-command version number bug + patch
Date: Fri, 16 May 2008 13:22:48 -0700
Message-ID: <m3prrm80dj.fsf@10-1-2-210.dhcp.pas.lab>

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





[-- Attachment #3: Type: message/rfc822, Size: 1474 bytes --]

From: Glenn Morris <rgm@gnu.org>
To: 262-done@emacsbugs.donarmstrong.com
Subject: Re: bug#262: 23.0.60; vc-hg-annotate-command version number bug + patch
Date: Thu, 29 May 2008 18:30:58 -0400
Message-ID: <k97idclp3x.fsf@fencepost.gnu.org>