From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.bugs Subject: bug#5960: 24.0.50; vc-annotate buffer commands fail in subdirectories with Hg Date: Fri, 16 Apr 2010 14:45:54 -0400 Message-ID: References: <84ljcn8f75.fsf@linux-b2a3.site> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1271444404 5811 80.91.229.12 (16 Apr 2010 19:00:04 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 16 Apr 2010 19:00:04 +0000 (UTC) Cc: 5960@debbugs.gnu.org To: Magnus Henoch , cyd@stupidchicken.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Apr 16 21:00:03 2010 connect(): No such file or directory Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1O2qll-0000iF-SU for geb-bug-gnu-emacs@m.gmane.org; Fri, 16 Apr 2010 21:00:02 +0200 Original-Received: from localhost ([127.0.0.1]:55396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2qll-0004pZ-6g for geb-bug-gnu-emacs@m.gmane.org; Fri, 16 Apr 2010 15:00:01 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O2qks-0004Fm-RT for bug-gnu-emacs@gnu.org; Fri, 16 Apr 2010 14:59:06 -0400 Original-Received: from [140.186.70.92] (port=38474 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2qkr-0004E1-D6 for bug-gnu-emacs@gnu.org; Fri, 16 Apr 2010 14:59:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O2qkp-0005kM-7Z for bug-gnu-emacs@gnu.org; Fri, 16 Apr 2010 14:59:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35688) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O2qkp-0005k1-5B for bug-gnu-emacs@gnu.org; Fri, 16 Apr 2010 14:59:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1O2qZC-0002if-DH; Fri, 16 Apr 2010 14:47:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dan Nicolaescu Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 16 Apr 2010 18:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 5960 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 5960-submit@debbugs.gnu.org id=B5960.127144356310436 (code B ref 5960); Fri, 16 Apr 2010 18:47:02 +0000 Original-Received: (at 5960) by debbugs.gnu.org; 16 Apr 2010 18:46:03 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O2qYE-0002iF-De for submit@debbugs.gnu.org; Fri, 16 Apr 2010 14:46:02 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O2qYC-0002i0-9w for 5960@debbugs.gnu.org; Fri, 16 Apr 2010 14:46:01 -0400 Original-Received: from dann by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1O2qY6-0006um-Td; Fri, 16 Apr 2010 14:45:55 -0400 In-Reply-To: <84ljcn8f75.fsf@linux-b2a3.site> (Magnus Henoch's message of "Fri\, 16 Apr 2010 18\:44\:46 +0100") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Fri, 16 Apr 2010 14:47:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:36272 Archived-At: Magnus Henoch writes: > cd /tmp > hg init reproduce > cd reproduce > mkdir foo > echo foo > foo/foo.txt > hg add foo/foo.txt > hg commit -m "Added foo.txt." > emacs -Q foo/foo.txt > > C-x v g > l > > Expected result: the *vc-change-log* buffer lists the changeset that added > foo.txt. > Actual result: the *vc-change-log* buffer is empty. > > I took a look in the code, and it seems that > vc-hg-annotate-extract-revision-at-line expands filenames against the > current directory, while `hg annotate' displays filenames relative to > the project root. Thus this patch: > > === modified file 'lisp/vc-hg.el' > --- lisp/vc-hg.el 2010-04-07 05:56:35 +0000 > +++ lisp/vc-hg.el 2010-04-16 17:43:15 +0000 > @@ -356,7 +356,7 @@ > (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)))) > Thanks! This is a regression from 23.1, so this should go into the emacs-23 branch if that branch is still open for regressions. Yidong? Please check it in.