GNU bug report logs - #5846
23.1.95.1 problems with mercurial commands in *VC Annotate* buffer on Windows

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 5846 in the body.
You can then email your comments to 5846 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andy Moreton <andrewjmoreton <at> googlemail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: 23.1.95.1 problems with mercurial commands in *VC Annotate* buffer
	on Windows
Date: Tue, 06 Apr 2010 14:42:05 +0100

Using emacs from the pretest Windows binary:
http://alpha.gnu.org/gnu/emacs/pretest/windows/emacs-23.1.95-bin-i386.zip

In GNU Emacs 23.1.95.1 (i386-mingw-nt5.1.2600)
 of 2010-04-04 on G41R2F1
Windowing system distributor `Microsoft Corp.', version 5.1.2600
configured using `configure --with-gcc (3.4) --no-opt --cflags 
-Ic:/imagesupport/include'

Using Mercurial from TortoiseHg 0.9, which contains Mercurial-1.4, 
Python-2.5.4, PyGTK-2.12.1, GTK-2.16.1

Start emacs with "c:\emacs\23.1.95\bin\emacs -Q"
Open a file from a mercurial repository
Type "C-x v g" to annotate the file

In the *VC Annotate* buffer:
1) Type "l" (vc-annotate-show-log-revision-at-line)
   The Hg command runs, but the *vc-change-log* buffer is empty

2) Type "f" (vc-annotate-find-revision-at-line)
   Emacs displays a message "Cannot open load file: vc-nil"

These commands both work with emacs-23.1 with the same files.

Message #10 received at 5846 <at> debbugs.gnu.org (full text, mbox):

From: Chong Yidong <cyd <at> stupidchicken.com>
To: Andy Moreton <andrewjmoreton <at> googlemail.com>
Cc: 5846 <at> debbugs.gnu.org
Subject: Re: 23.1.95.1 problems with mercurial commands in *VC Annotate*
	buffer on Windows
Date: Sat, 17 Apr 2010 12:03:19 -0400

> In GNU Emacs 23.1.95.1 (i386-mingw-nt5.1.2600)
>
> Using Mercurial from TortoiseHg 0.9, which contains Mercurial-1.4,
> Python-2.5.4, PyGTK-2.12.1, GTK-2.16.1
>
> Start emacs with "c:\emacs\23.1.95\bin\emacs -Q"
> Open a file from a mercurial repository
> Type "C-x v g" to annotate the file
>
> In the *VC Annotate* buffer:
> 1) Type "l" (vc-annotate-show-log-revision-at-line)
>    The Hg command runs, but the *vc-change-log* buffer is empty
>
> 2) Type "f" (vc-annotate-find-revision-at-line)
>    Emacs displays a message "Cannot open load file: vc-nil"

It looks like this is the same bug as the one just fixed in

  http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5960

You can find the patch there, and it will be included in the next
pretest.

Thanks for the bug report.

Message #15 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andy Moreton <andrewjmoreton <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: Re: bug#5846: 23.1.95.1 problems with mercurial commands in *VC
	Annotate* buffer on Windows
Date: Mon, 19 Apr 2010 21:01:32 +0100

On Sat 17 Apr 2010, Chong Yidong wrote:

>> In GNU Emacs 23.1.95.1 (i386-mingw-nt5.1.2600)
>>
>> Using Mercurial from TortoiseHg 0.9, which contains Mercurial-1.4,
>> Python-2.5.4, PyGTK-2.12.1, GTK-2.16.1
>>
>> Start emacs with "c:\emacs\23.1.95\bin\emacs -Q"
>> Open a file from a mercurial repository
>> Type "C-x v g" to annotate the file
>>
>> In the *VC Annotate* buffer:
>> 1) Type "l" (vc-annotate-show-log-revision-at-line)
>>    The Hg command runs, but the *vc-change-log* buffer is empty
>>
>> 2) Type "f" (vc-annotate-find-revision-at-line)
>>    Emacs displays a message "Cannot open load file: vc-nil"
>
> It looks like this is the same bug as the one just fixed in
>
>   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5960
>
> You can find the patch there, and it will be included in the next
> pretest.
>
> Thanks for the bug report.

I've rebuilt emacs from the emacs-23 branch today, and the problems are
still there. In addition, the modeline display shows "Hg-" suggesting that
emacs is not correctly detecting the working revision of the file.

    AndyM

Message #18 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andy Moreton <andrewjmoreton <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: Re: bug#5846: 23.1.95.1 problems with mercurial commands in *VC
	Annotate* buffer on Windows
Date: Tue, 20 Apr 2010 15:13:42 +0100

On Mon 19 Apr 2010, Andy Moreton wrote:

> On Sat 17 Apr 2010, Chong Yidong wrote:
>
>>> In GNU Emacs 23.1.95.1 (i386-mingw-nt5.1.2600)
>>>
>>> Using Mercurial from TortoiseHg 0.9, which contains Mercurial-1.4,
>>> Python-2.5.4, PyGTK-2.12.1, GTK-2.16.1
>>>
>>> Start emacs with "c:\emacs\23.1.95\bin\emacs -Q"
>>> Open a file from a mercurial repository
>>> Type "C-x v g" to annotate the file
>>>
>>> In the *VC Annotate* buffer:
>>> 1) Type "l" (vc-annotate-show-log-revision-at-line)
>>>    The Hg command runs, but the *vc-change-log* buffer is empty
>>>
>>> 2) Type "f" (vc-annotate-find-revision-at-line)
>>>    Emacs displays a message "Cannot open load file: vc-nil"
>>
>> It looks like this is the same bug as the one just fixed in
>>
>>   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5960
>>
>> You can find the patch there, and it will be included in the next
>> pretest.
>>
>> Thanks for the bug report.
>
> I've rebuilt emacs from the emacs-23 branch today, and the problems are
> still there. In addition, the modeline display shows "Hg-" suggesting that
> emacs is not correctly detecting the working revision of the file.

Ive retested with the 23.1.96 pretest tarball, and have found the
problem. In vc-hg-working-revision (in vc-hg.el):

      (let ((process-environment avoid-local-env))
	;; Ignore all errors.
	(process-file
	 "hg" nil t nil
	 "parent" "--template" "{rev}" (file-relative-name file)))

1) TortoiseHg does not seem to honour the "HGRC=" set in
`avoid-local-env'. for local configration it reads some of the 
the following config files:
       %ProgramFiles%\TortoiseHg\Mercurial.ini
       %USERPROFILE%\mercurial.ini
       %HOME%\.hgrc

2) I had the following setting in "~/.hgrc":
   [alias]
   parenttag = parents --template "{latesttag} +{latesttagdistance}\n"

The combined effect is that TortoiseHg read my ~/.hgrc file, thus making
the "hg parent" command ambiguous (could be "parents" or "parenttag").

`vc-hg-working-revision' should use "hg parents" to make the command
unambiguous.

    AndyM

Message #19 received at 5846-done <at> debbugs.gnu.org (full text, mbox):

From: Chong Yidong <cyd <at> stupidchicken.com>
To: Dan Nicolaescu <dann <at> ics.uci.edu>
Cc: 5846-done <at> debbugs.gnu.org, Andy Moreton <andrewjmoreton <at> gmail.com>
Subject: Re: bug#5846: 23.1.95.1 problems with mercurial commands in *VC
	Annotate* buffer on Windows
Date: Tue, 20 Apr 2010 11:59:16 -0400

Dan Nicolaescu <dann <at> ics.uci.edu> writes:

> This patch should fix it.  Yidong, please apply to the appropriate branch.
>
>      * vc-hg.el (vc-hg-state): Use HGRCPATH, not HGRC.
>      (vc-hg-working-revision): Likewise.  Use hg parents, not hg parent
>      (Bug#5846).

Done, it's in the emacs-23 branch.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.