From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs 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 Message-ID: <9242696f-e8b3-9071-336b-9ace5d785c42@yandex.ru> References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33644"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 Cc: Lars Magne Ingebrigtsen , Andrii Kolomoiets To: Valentin Gatien-Baron , 36534-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Dec 10 01:40:49 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1knA0m-0008de-0z for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 10 Dec 2020 01:40:48 +0100 Original-Received: from localhost ([::1]:46488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knA0l-0008E3-2b for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 09 Dec 2020 19:40:47 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knA03-0008Ch-9a for bug-gnu-emacs@gnu.org; Wed, 09 Dec 2020 19:40:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53233) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1knA02-0007sb-Im for bug-gnu-emacs@gnu.org; Wed, 09 Dec 2020 19:40:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1knA02-0007nT-Fp for bug-gnu-emacs@gnu.org; Wed, 09 Dec 2020 19:40:02 -0500 Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Thu, 10 Dec 2020 00:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 36534 X-GNU-PR-Package: emacs Mail-Followup-To: 36534@debbugs.gnu.org, dgutov@yandex.ru, valentin.gatienbaron@gmail.com Original-Received: via spool by 36534-done@debbugs.gnu.org id=D36534.160756079129946 (code D ref 36534); Thu, 10 Dec 2020 00:40:02 +0000 Original-Received: (at 36534-done) by debbugs.gnu.org; 10 Dec 2020 00:39:51 +0000 Original-Received: from localhost ([127.0.0.1]:36544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn9zr-0007mw-3Z for submit@debbugs.gnu.org; Wed, 09 Dec 2020 19:39:51 -0500 Original-Received: from mail-ed1-f53.google.com ([209.85.208.53]:35384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn9zp-0007mh-KF for 36534-done@debbugs.gnu.org; Wed, 09 Dec 2020 19:39:50 -0500 Original-Received: by mail-ed1-f53.google.com with SMTP id u19so3650874edx.2 for <36534-done@debbugs.gnu.org>; Wed, 09 Dec 2020 16:39:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:cc:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=i0AePuSztDt+f0lRUEQG0nm01dlz3W1Mw4yVqrL2j0Q=; b=eIf8EkgZvoKNtOho0H36RBTq/B5NDAWCrEtMEJTaaHQ8Inf1mh6eSW3nHg42fO6ZkH QiGkIOR2Gq8e00zctCUCJmAQ+iqEhCjtlGfxhyWm+70aIncf0LZn97gNkakimpP/aTdi fV5G0TFxfs00++ysfdGKkgnGs/2lIsOurOAxp7F/BC2VzG7/QeKYRWROPixZh+IZ1pdS lPvbBCErSYsNgCscmGREro+H40VSQq/4qQRP0eBzydzEzx6EDSoK76FPvT4IV79Yn9Wc itgLz9GrIavxtc2CRx9GFskkUBOHqd2ZZQQuaggz/zSTEeHxdBV0mtPQ5Wi0V2m0Ap3t vqqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:cc:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=i0AePuSztDt+f0lRUEQG0nm01dlz3W1Mw4yVqrL2j0Q=; b=XBJHePYQMk1+1vdmME69Hg+UwsImXfcEB8YEF550C1d3zw4JbJrma7RRamJiww+RJh EZQZxlVC9rzagrbNuKyVMuRbYWvgVG/m8nMScVs5kuI5sROqUqL7ciQMpOXlnM01JyK+ Ce31lEaMcYm0rc1TecUkssQl9AitJkHoU0TKeK13fxWpRmEqKULrR5G5a6TvHuw6B+m4 JfsCQ6fKF6FaBrSjfGLJ/ExTLPqwpGdIBTAaiwDMvkklGmmoKRFTiFV5+956KCIF6XmM xZsQILe1jTGBEjYa+AOOl+7NCm2WhGJoNkDA2q78fELl33rN5lXss2ANlwrL8f9qQu0s Wecw== X-Gm-Message-State: AOAM533P8bqzBKCa/vlG6lpjFme5UwOqCXf7QY0J8g++20LXm29OdRti Aockn+JNkKiLFukAVfmmQtM= X-Google-Smtp-Source: ABdhPJypSodSZQvJ2OjmL0gC62xL3sgcEbhWk80mSrMBaWzW3/kLB4kLCWpweiGYd/KjC+DQI7Tycw== X-Received: by 2002:aa7:c353:: with SMTP id j19mr4394815edr.204.1607560783762; Wed, 09 Dec 2020 16:39:43 -0800 (PST) Original-Received: from [192.168.0.4] ([66.205.71.3]) by smtp.googlemail.com with ESMTPSA id t26sm3152883edt.69.2020.12.09.16.39.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Dec 2020 16:39:43 -0800 (PST) In-Reply-To: Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:195608 Archived-At: 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.