unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: David Hull <david@snap.com>
To: emacs-pretest-bug@gnu.org
Subject: 23.0.60; vc-hg-annotate-re --follow enhancement
Date: Fri, 16 May 2008 13:31:44 -0700	[thread overview]
Message-ID: <m3od767zyn.fsf@10-1-2-210.dhcp.pas.lab> (raw)

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




             reply	other threads:[~2008-05-16 20:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-16 20:31 David Hull [this message]
2008-05-17 15:33 ` 23.0.60; vc-hg-annotate-re --follow enhancement Dan Nicolaescu

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=m3od767zyn.fsf@10-1-2-210.dhcp.pas.lab \
    --to=david@snap.com \
    --cc=emacs-pretest-bug@gnu.org \
    /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).