From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Arne Babenhauserheide <arne_bab@web.de>
Cc: 14216@debbugs.gnu.org
Subject: bug#14216: 24.2; vc-annotate for hg mistreats lines with ": " as partially bmeing part of the revision specification (with patch)
Date: Tue, 16 Apr 2013 20:51:42 -0400 [thread overview]
Message-ID: <jwv61zmf09n.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87ip3mo0fh.fsf@web.de> (Arne Babenhauserheide's message of "Tue, 16 Apr 2013 19:22:26 +0200")
> It long irked me that when I run vc-annotate in a Mercurial
> repository, some lines get treated as part of the revision
> spec. Example:
> # try this: <- that is part of the revision specification
I installed the patch below which should still allow colon in names,
except when followed by a space.
Stefan
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog 2013-04-17 00:35:22 +0000
+++ lisp/ChangeLog 2013-04-17 00:49:44 +0000
@@ -1,3 +1,8 @@
+2013-04-17 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * vc/vc-hg.el (vc-hg-annotate-re): Disallow ": " in file names
+ (bug#14216).
+
2013-04-17 Jean-Philippe Gravel <jpgravel@gmail.com>
* progmodes/gdb-mi.el (gdbmi-bnf-incomplete-record-result):
=== modified file 'lisp/vc/vc-hg.el'
--- lisp/vc/vc-hg.el 2013-02-01 17:19:24 +0000
+++ lisp/vc/vc-hg.el 2013-04-17 00:44:50 +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)
next prev parent reply other threads:[~2013-04-17 0:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-16 17:22 bug#14216: 24.2; vc-annotate for hg mistreats lines with ": " as partially bmeing part of the revision specification (with patch) Arne Babenhauserheide
2013-04-17 0:51 ` Stefan Monnier [this message]
2013-04-17 12:08 ` Arne Babenhauserheide
2013-04-17 14:30 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwv61zmf09n.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=14216@debbugs.gnu.org \
--cc=arne_bab@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).