* 23.0.60; vc-hg-annotate-re --follow enhancement
@ 2008-05-16 20:31 David Hull
2008-05-17 15:33 ` Dan Nicolaescu
0 siblings, 1 reply; 2+ messages in thread
From: David Hull @ 2008-05-16 20:31 UTC (permalink / raw)
To: emacs-pretest-bug
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: 23.0.60; vc-hg-annotate-re --follow enhancement
2008-05-16 20:31 23.0.60; vc-hg-annotate-re --follow enhancement David Hull
@ 2008-05-17 15:33 ` Dan Nicolaescu
0 siblings, 0 replies; 2+ messages in thread
From: Dan Nicolaescu @ 2008-05-17 15:33 UTC (permalink / raw)
To: David Hull; +Cc: emacs-pretest-bug
David Hull <david@snap.com> 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?
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-05-17 15:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-16 20:31 23.0.60; vc-hg-annotate-re --follow enhancement David Hull
2008-05-17 15:33 ` Dan Nicolaescu
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).