From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs 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 Message-ID: References: <87ip3mo0fh.fsf@web.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1366159970 12200 80.91.229.3 (17 Apr 2013 00:52:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 17 Apr 2013 00:52:50 +0000 (UTC) Cc: 14216@debbugs.gnu.org To: Arne Babenhauserheide Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Apr 17 02:52:53 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1USGcB-0004LA-Dl for geb-bug-gnu-emacs@m.gmane.org; Wed, 17 Apr 2013 02:52:47 +0200 Original-Received: from localhost ([::1]:58274 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USGcB-00086z-2D for geb-bug-gnu-emacs@m.gmane.org; Tue, 16 Apr 2013 20:52:47 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:53487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USGc8-000857-2M for bug-gnu-emacs@gnu.org; Tue, 16 Apr 2013 20:52:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USGc7-0000sb-5P for bug-gnu-emacs@gnu.org; Tue, 16 Apr 2013 20:52:44 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:51429) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USGc7-0000sW-2G for bug-gnu-emacs@gnu.org; Tue, 16 Apr 2013 20:52:43 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1USGgI-0007M2-CT for bug-gnu-emacs@gnu.org; Tue, 16 Apr 2013 20:57:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 17 Apr 2013 00:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 14216 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 14216-submit@debbugs.gnu.org id=B14216.136616016828168 (code B ref 14216); Wed, 17 Apr 2013 00:57:02 +0000 Original-Received: (at 14216) by debbugs.gnu.org; 17 Apr 2013 00:56:08 +0000 Original-Received: from localhost ([127.0.0.1]:55538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1USGfQ-0007KH-9L for submit@debbugs.gnu.org; Tue, 16 Apr 2013 20:56:08 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:45353) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1USGfN-0007K8-Pi for 14216@debbugs.gnu.org; Tue, 16 Apr 2013 20:56:06 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EABK/CFHO+LAd/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNAcLFA0LDSQTh38DCQaxH4YsDYlVjBKEeAOUN40PgzSBXoMT X-IPAS-Result: Av8EABK/CFHO+LAd/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNAcLFA0LDSQTh38DCQaxH4YsDYlVjBKEeAOUN40PgzSBXoMT X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="7591491" Original-Received: from 206-248-176-29.dsl.teksavvy.com (HELO pastel.home) ([206.248.176.29]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 16 Apr 2013 20:51:40 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 5E27D67BA3; Tue, 16 Apr 2013 20:51:42 -0400 (EDT) In-Reply-To: <87ip3mo0fh.fsf@web.de> (Arne Babenhauserheide's message of "Tue, 16 Apr 2013 19:22:26 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:73466 Archived-At: > 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 + + * vc/vc-hg.el (vc-hg-annotate-re): Disallow ": " in file names + (bug#14216). + 2013-04-17 Jean-Philippe Gravel * 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)