From: Andrii Kolomoiets <andreyk.mad@gmail.com>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>,
36534@debbugs.gnu.org, Lars Ingebrigtsen <larsi@gnus.org>
Subject: bug#36534: 25.2; mercurial vc-annotate sometimes fails when using the evolve mercurial extension
Date: Wed, 02 Dec 2020 13:17:56 +0200 [thread overview]
Message-ID: <m2lfegh2xn.fsf@gmail.com> (raw)
In-Reply-To: <63844114-d90b-bb91-f025-59583cb76433@yandex.ru> (Dmitry Gutov's message of "Sat, 28 Nov 2020 20:17:08 +0200")
Dmitry Gutov <dgutov@yandex.ru> writes:
> On 26.11.2020 13:56, Lars Ingebrigtsen wrote:
>> Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> writes:
>>
>>> Sometimes, vc-annotate in a file tracked by mercurial returns an
>>> error like this instead of a proper annotate buffer:
>> [...]
>>
>>> Step 3 is probably an hg bug. However `hg parent` was deprecated in
>>> 2014, so people may be reluctant to change it. And it would be simpler
>>> for vc-hg-working-revision to call `hg log -r . -T {rev}` (vc-git does
>>> that, so I assume that it works in general on top of fixing the
>>> current issue). `.` means the current revision, see `hg help revset`.
>>>
>>> So something like this:
>>> (defun vc-hg-working-revision (file)
>>> "Hg-specific version of `vc-working-revision'."
>>> (ignore-errors
>>> (with-output-to-string
>>> (vc-hg-command standard-output 0 nil
>>> "log" "-r" "." "--template" "{rev}"))))
>> (This bug report unfortunately got no response at the time.)
>> I'm pretty unfamiliar with Mercurial, but perhaps Dmitry has some
>> comments here (added to the Cc's).
>
> I have very little experience with Mercurial myself.
>
> Perhaps Daniel or Andrii can comment.
Valentin did a pretty good investigation here.
But proposed change make the `vc-hg-working-revision` function ignore
the FILE arg, so the result will differ.
1. mkdir working-revision
2. cd working-revision
3. hg init
4. echo a > a
5. hg commit -Am0
6. echo b > b
7. hg commit -Am1
8. hg parent --template {rev} a
=> 0
This is the old behavior of the `vc-hg-working-revision`
9. hg log -r . --template {rev}
=> 1
And this is the new one.
Not sure what it may leads to. Indeed the `vc-git-working-revision`
function ignores FILE as well.
next prev parent reply other threads:[~2020-12-02 11:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-07 4:55 bug#36534: 25.2; mercurial vc-annotate sometimes fails when using the evolve mercurial extension Valentin Gatien-Baron
2020-11-26 11:56 ` Lars Ingebrigtsen
2020-11-28 18:17 ` Dmitry Gutov
2020-12-02 11:17 ` Andrii Kolomoiets [this message]
2020-12-10 0:26 ` Dmitry Gutov
2020-12-10 0:39 ` Dmitry Gutov
[not found] ` <handler.36534.D36534.160756079129946.notifdone@debbugs.gnu.org>
2020-12-12 18:54 ` bug#36534: closed (Re: bug#36534: 25.2; mercurial vc-annotate sometimes fails when using the evolve mercurial extension) Glenn Morris
2020-12-13 1:57 ` Dmitry Gutov
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=m2lfegh2xn.fsf@gmail.com \
--to=andreyk.mad@gmail.com \
--cc=36534@debbugs.gnu.org \
--cc=dgutov@yandex.ru \
--cc=larsi@gnus.org \
--cc=valentin.gatienbaron@gmail.com \
/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).