bug#263: 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