changeset 107969:62fa87a581e1

Fix to vc-hg-annotate-extract-revision-at-line (Bug#5960). * vc-hg.el (vc-hg-annotate-extract-revision-at-line): Expand file name relative to the project root (Bug#5960).
author Chong Yidong <cyd@stupidchicken.com>
date Fri, 16 Apr 2010 20:28:19 -0400
parents 3222c3374fe9
children d1f44eb382c0
files lisp/ChangeLog lisp/vc-hg.el
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Apr 16 00:43:29 2010 -0700
+++ b/lisp/ChangeLog	Fri Apr 16 20:28:19 2010 -0400
@@ -1,3 +1,8 @@
+2010-04-17  Magnus Henoch  <magnus.henoch@gmail.com>
+
+	* vc-hg.el (vc-hg-annotate-extract-revision-at-line): Expand file
+	name relative to the project root (Bug#5960).
+
 2010-04-16  Glenn Morris  <rgm@gnu.org>
 
 	* vc-git.el (vc-git-print-log): Doc fix.
--- a/lisp/vc-hg.el	Fri Apr 16 00:43:29 2010 -0700
+++ b/lisp/vc-hg.el	Fri Apr 16 20:28:19 2010 -0400
@@ -340,7 +340,8 @@
       (if (match-beginning 3)
 	  (match-string-no-properties 1)
 	(cons (match-string-no-properties 1)
-	      (expand-file-name (match-string-no-properties 4)))))))
+	      (expand-file-name (match-string-no-properties 4)
+				(vc-hg-root default-directory)))))))
 
 (defun vc-hg-previous-revision (file rev)
   (let ((newrev (1- (string-to-number rev))))