From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel,gmane.emacs.pretest.bugs Subject: Re: 23.0.60; vc-hg-annotate-re --follow enhancement Date: Sat, 17 May 2008 08:33:51 -0700 Message-ID: <200805171533.m4HFXpgA008967@sallyv1.ics.uci.edu> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1211038596 15321 80.91.229.12 (17 May 2008 15:36:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 17 May 2008 15:36:36 +0000 (UTC) Cc: emacs-pretest-bug@gnu.org To: David Hull Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 17 17:37:15 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JxOTC-00006k-JG for ged-emacs-devel@m.gmane.org; Sat, 17 May 2008 17:37:14 +0200 Original-Received: from localhost ([127.0.0.1]:56035 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JxOSS-0008Fq-Hp for ged-emacs-devel@m.gmane.org; Sat, 17 May 2008 11:36:28 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JxOSM-0008BY-KU for emacs-devel@gnu.org; Sat, 17 May 2008 11:36:22 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JxOSK-00089K-Q2 for emacs-devel@gnu.org; Sat, 17 May 2008 11:36:22 -0400 Original-Received: from [199.232.76.173] (port=35253 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JxOSK-00089E-OM for emacs-devel@gnu.org; Sat, 17 May 2008 11:36:20 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:40203) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JxOSK-0000el-6D for emacs-devel@gnu.org; Sat, 17 May 2008 11:36:20 -0400 Original-Received: from mx10.gnu.org ([199.232.76.166]:50452) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1JxORD-0001LQ-6q for emacs-pretest-bug@gnu.org; Sat, 17 May 2008 11:35:11 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1JxOSG-0000dt-39 for emacs-pretest-bug@gnu.org; Sat, 17 May 2008 11:36:19 -0400 Original-Received: from sallyv1.ics.uci.edu ([128.195.1.109]:53916) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1JxOSF-0000dZ-Kw for emacs-pretest-bug@gnu.org; Sat, 17 May 2008 11:36:15 -0400 X-ICS-MailScanner-Watermark: 1211643234.16708@rTkdvpzfQ7OF4byLVmGgjw Original-Received: from mothra.ics.uci.edu (mothra.ics.uci.edu [128.195.6.93]) by sallyv1.ics.uci.edu (8.13.7+Sun/8.13.7) with ESMTP id m4HFXpgA008967; Sat, 17 May 2008 08:33:51 -0700 (PDT) In-Reply-To: (David Hull's message of "Fri, 16 May 2008 13:31:44 -0700") Original-Lines: 23 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@mothra.ics.uci.edu X-detected-kernel: by monty-python.gnu.org: Solaris 10 (beta) X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:97325 gmane.emacs.pretest.bugs:22357 Archived-At: David Hull 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?