23.0.60; vc-hg-annotate-re --follow enhancement

23.0.60; vc-hg-annotate-re --follow enhancement

[David Hull]

If I specify the "--follow" option in my .hgrc file so that "hg
annotate" follows file name changes, the output includes the filename,
which causes vc-hg-annotate-re to not match.  The following patch
causes vc-hg-annotate-re to match an optional filename after the date.

--- vc-hg.el.orig       2008-05-16 12:50:17.000000000 -0700
+++ vc-hg.el    2008-05-16 12:59:27.000000000 -0700
@@ -295,7 +295,11 @@
 ;; The format for one line output by "hg annotate -d -n" looks like this:
 ;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS
 ;; i.e: VERSION_NUMBER DATE: CONTENTS
-(defconst vc-hg-annotate-re "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\): ")
+;; If the user has set the "-f" option, the output looks like:
+;;35 Tue May 13 17:52:17 2008 -0700 example.c: CONTENTS
+;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS
+(defconst vc-hg-annotate-re
+  "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)[^:\n]*\\(:[^ \n][^:\n]*\\)*: ")
 
 (defun vc-hg-annotate-time ()
   (when (looking-at vc-hg-annotate-re)

-- 
David Hull

Re: 23.0.60; vc-hg-annotate-re --follow enhancement

[Dan Nicolaescu]

David Hull <david@snap.com> writes:

  > If I specify the "--follow" option in my .hgrc file so that "hg
  > annotate" follows file name changes, the output includes the filename,
  > which causes vc-hg-annotate-re to not match.  The following patch
  > causes vc-hg-annotate-re to match an optional filename after the date.
  > 
  > --- vc-hg.el.orig       2008-05-16 12:50:17.000000000 -0700
  > +++ vc-hg.el    2008-05-16 12:59:27.000000000 -0700
  > @@ -295,7 +295,11 @@
  >  ;; The format for one line output by "hg annotate -d -n" looks like this:
  >  ;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS
  >  ;; i.e: VERSION_NUMBER DATE: CONTENTS
  > -(defconst vc-hg-annotate-re "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\): ")
  > +;; If the user has set the "-f" option, the output looks like:
  > +;;35 Tue May 13 17:52:17 2008 -0700 example.c: CONTENTS
  > +;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS
  > +(defconst vc-hg-annotate-re
  > +  "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)[^:\n]*\\(:[^ \n][^:\n]*\\)*: ")

Looks good.
How about using --follow by default in vc-annotate?
What do people thing about this?

bug#263: marked as done (23.0.60; vc-hg-annotate-re --follow enhancement)

[Emacs bug Tracking System]

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


Your message dated Thu, 29 May 2008 20:00:30 -0400
with message-id <18495.17310.202293.69643@fencepost.gnu.org>
and subject line Re: vc-hg-annotate-re --follow enhancement
has caused the Emacs bug report #263,
regarding 23.0.60; vc-hg-annotate-re --follow enhancement
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.)


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

[-- Attachment #2: Type: message/rfc822, Size: 5620 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-re --follow enhancement
Date: Fri, 16 May 2008 13:31:44 -0700
Message-ID: <m3od767zyn.fsf@10-1-2-210.dhcp.pas.lab>

If I specify the "--follow" option in my .hgrc file so that "hg
annotate" follows file name changes, the output includes the filename,
which causes vc-hg-annotate-re to not match.  The following patch
causes vc-hg-annotate-re to match an optional filename after the date.

--- vc-hg.el.orig       2008-05-16 12:50:17.000000000 -0700
+++ vc-hg.el    2008-05-16 12:59:27.000000000 -0700
@@ -295,7 +295,11 @@
 ;; The format for one line output by "hg annotate -d -n" looks like this:
 ;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS
 ;; i.e: VERSION_NUMBER DATE: CONTENTS
-(defconst vc-hg-annotate-re "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\): ")
+;; If the user has set the "-f" option, the output looks like:
+;;35 Tue May 13 17:52:17 2008 -0700 example.c: CONTENTS
+;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS
+(defconst vc-hg-annotate-re
+  "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)[^:\n]*\\(:[^ \n][^:\n]*\\)*: ")
 
 (defun vc-hg-annotate-time ()
   (when (looking-at vc-hg-annotate-re)

-- 
David Hull





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

From: Glenn Morris <rgm@gnu.org>
To: 263-done@emacsbugs.donarmstrong.com
Subject: Re: vc-hg-annotate-re --follow enhancement
Date: Thu, 29 May 2008 20:00:30 -0400
Message-ID: <18495.17310.202293.69643@fencepost.gnu.org>


This has been installed.