From: Dmitry Gutov <dgutov@yandex.ru>
To: Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>,
36534-done@debbugs.gnu.org
Cc: Lars Magne Ingebrigtsen <larsi@gnus.org>,
Andrii Kolomoiets <andreyk.mad@gmail.com>
Subject: bug#36534: 25.2; mercurial vc-annotate sometimes fails when using the evolve mercurial extension
Date: Thu, 10 Dec 2020 02:39:41 +0200 [thread overview]
Message-ID: <9242696f-e8b3-9071-336b-9ace5d785c42@yandex.ru> (raw)
In-Reply-To: <CA+0DEqgTVM2PriC3brpRCDEQCt_TQcrTR58GXcxJkLa-_AFgRw@mail.gmail.com>
Version: 28.1
Hi Valentin,
Sorry we're only doing this now.
On 07.07.2019 07:55, Valentin Gatien-Baron wrote:
> 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}"))))
>
> (another reason to stop using `hg parents` is that during a merge, it
> will in most cases print two revisions, so if you annotate a file that
> was last changed in revision 123, emacs will likely get 123123 back
> and `hg annotate -r 123123` will fail)
Thanks for the thorough explanation. I have installed the patch in
revision 4f352ad6f1 on master. Kinda messed up the attribution, but
alas, not something I can fix now.
Aside from improved compatibility, the new implementation seems
considerably faster, too. Like 100ms vs 600ms on mozilla-central, which
is a huge repo.
next prev parent reply other threads:[~2020-12-10 0:39 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
2020-12-10 0:26 ` Dmitry Gutov
2020-12-10 0:39 ` Dmitry Gutov [this message]
[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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9242696f-e8b3-9071-336b-9ace5d785c42@yandex.ru \
--to=dgutov@yandex.ru \
--cc=36534-done@debbugs.gnu.org \
--cc=andreyk.mad@gmail.com \
--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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.