[Emacs-diffs] /srv/bzr/emacs/trunk r112311: * lisp/vc/vc-hg.el (vc-hg-annotate-re): Disallow ": " in file names.

[Stefan Monnier]

------------------------------------------------------------
revno: 112311
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14216
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2013-04-16 20:50:44 -0400
message:
  * lisp/vc/vc-hg.el (vc-hg-annotate-re): Disallow ": " in file names.
modified:
  lisp/ChangeLog
  lisp/vc/vc-hg.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-04-17 00:35:22 +0000
+++ b/lisp/ChangeLog    2013-04-17 00:50:44 +0000
@@ -1,3 +1,8 @@
+2013-04-17  Stefan Monnier  <address@hidden>
+
+       * vc/vc-hg.el (vc-hg-annotate-re): Disallow ": " in file names
+       (bug#14216).
+
 2013-04-17  Jean-Philippe Gravel  <address@hidden>
 
        * progmodes/gdb-mi.el (gdbmi-bnf-incomplete-record-result):

=== modified file 'lisp/vc/vc-hg.el'
--- a/lisp/vc/vc-hg.el  2013-02-01 17:19:24 +0000
+++ b/lisp/vc/vc-hg.el  2013-04-17 00:50:44 +0000
@@ -357,7 +357,7 @@
 ;;215 Wed Jun 20 21:22:58 2007 -0700 foo.c: CONTENTS
 ;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS
 (defconst vc-hg-annotate-re
-  "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\(.+\\): \\)\\)")
+  "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: 
+\\([^:\n]+\\(?::\\(?:[^: \n][^:\n]*\\)?\\)*\\): \\)\\)")
 
 (defun vc-hg-annotate-time ()
   (when (looking-at vc-hg-annotate-re)