From unknown Thu Sep 11 21:35:50 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#36534 <36534@debbugs.gnu.org> To: bug#36534 <36534@debbugs.gnu.org> Subject: Status: 25.2; mercurial vc-annotate sometimes fails when using the evolve mercurial extension Reply-To: bug#36534 <36534@debbugs.gnu.org> Date: Fri, 12 Sep 2025 04:35:50 +0000 retitle 36534 25.2; mercurial vc-annotate sometimes fails when using the ev= olve mercurial extension reassign 36534 emacs submitter 36534 Valentin Gatien-Baron severity 36534 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 07 04:49:07 2019 Received: (at submit) by debbugs.gnu.org; 7 Jul 2019 08:49:07 +0000 Received: from localhost ([127.0.0.1]:56147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hk2r4-00087L-Ba for submit@debbugs.gnu.org; Sun, 07 Jul 2019 04:49:07 -0400 Received: from lists.gnu.org ([209.51.188.17]:60598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hjzDe-0001qw-AL for submit@debbugs.gnu.org; Sun, 07 Jul 2019 00:56:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34170) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjzDb-0006X4-W7 for bug-gnu-emacs@gnu.org; Sun, 07 Jul 2019 00:56:10 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, HTML_MESSAGE,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjzDZ-0005pg-N2 for bug-gnu-emacs@gnu.org; Sun, 07 Jul 2019 00:56:07 -0400 Received: from mail-ot1-x32b.google.com ([2607:f8b0:4864:20::32b]:41252) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjzDZ-0005nh-Ce for bug-gnu-emacs@gnu.org; Sun, 07 Jul 2019 00:56:05 -0400 Received: by mail-ot1-x32b.google.com with SMTP id o101so12892270ota.8 for ; Sat, 06 Jul 2019 21:56:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=0o09NSVzD2IkOcg+Spwk7IfSdeP2RbIvrpOd/EFOmnQ=; b=fFklSuBH4jJhuW91OEPS46FrA3azH/fHcx7q5CsPsRrY4Si57KsMq8cOHi/CEy1cUh 7k3oOlEIg8JbrvkB6bkmSK80xXVLgvbOmYMvy7pPQRZihe5WQ/CAtvbiZumMPnT5xZsw 3sfx225DONZe4O9Da2UwoinzcrAA5B1bGvsP4Ie/CfgVvXbGrwANfktSJAc6xpHFRdcK tpYuNZkiX8+Hjskm2VWh4YOnq87oE8QhYw1UCtOpXN8h/9Fk2OY8ZX5c7iWZyvoZ/eSp ohCKqR01YLI0qLn+xGIkDZA64u0mBTJPjTBwSm/0xEvS9UTEqLWc5ci7GCop5L4A6d+s u1Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=0o09NSVzD2IkOcg+Spwk7IfSdeP2RbIvrpOd/EFOmnQ=; b=TBzF4UyySW7fw6I3YmU/ovch81mUX2gH4YSxXlzvKB9eUo9jasb8jgv2YxqJjlnu2v v5qNeEx9ZT0mmdZyCdyydNwa56Mc+b8rghgGOhwp6UOGixozkZQ5e3/YavoLGa4kiaVg TIh9aEm3bUFYaDGA4sRLOdSTjVWIBo4KL//25r7P8N9sIeYjHb74shx+0Zo8ma52Ir6Q KhzNEvC53MD/x7nGZ1+G7NQjO/eW3Pm4PTwj2JrUCGG5yhqLcXB3rqX73AsBzHiPkIhv 2CEuaWIwZpu1PbqcOwryB74ZjJh+tVY4hvfgpmp7JUpurdxFSRG49k4jhtrU+w1SxICD pIeA== X-Gm-Message-State: APjAAAXRfwAUGaddcffr621TeOc7glK2XSS6jyZJ8oN0Cu9OMj8TtN1f nDP9IvtmnMKQdNlsNzTdGl1kC/GZTE+2KBY1r0TvAIaa X-Google-Smtp-Source: APXvYqwDATlUB9p1WHJI9nswA2/FGMF9bqeF1FxlN/EcurXmlUo4cuAgjFmSMTd4fUXLGz0n03rZoqmWS5Y7eCGUB/k= X-Received: by 2002:a9d:ea6:: with SMTP id 35mr8433637otj.305.1562475362735; Sat, 06 Jul 2019 21:56:02 -0700 (PDT) MIME-Version: 1.0 From: Valentin Gatien-Baron Date: Sun, 7 Jul 2019 00:55:51 -0400 Message-ID: Subject: 25.2; mercurial vc-annotate sometimes fails when using the evolve mercurial extension To: bug-gnu-emacs@gnu.org Content-Type: multipart/alternative; boundary="000000000000f75a1c058d1024de" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::32b X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sun, 07 Jul 2019 04:49:05 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --000000000000f75a1c058d1024de Content-Type: text/plain; charset="UTF-8" Sometimes, vc-annotate in a file tracked by mercurial returns an error like this instead of a proper annotate buffer: abort: mercurial/merge.py: no such file in rev 9117c6561b0b Here is a reproduction (requires the evolve extension to be enabled, for instance as described here: https://www.mercurial-scm.org/wiki/EvolveExtension): rm -rf /tmp/test hg init /tmp/test cd /tmp/test echo b > b hg commit -Am0 echo a > a hg commit -Am1 hg commit --amend -m 2 if [ $(hg log -r . -T {rev}) = 1 ]; then echo "Error: cannot test as evolve is not enabled" exit 1 fi emacs -Q a -f 'vc-annotate' What happens is: 1. vc-annotate calls vc-working-revision 2. vc-hg-working-revision calls hg parent --template {rev} file 3. that command fails saying something like "abort: filtered revision '3ee3303ecf2621381e5d5ca14aba73f2835facb5'!" 4. vc-hg-working-revision thus returns 0 5. vc-annotate calls `hg annotate -r 0 file`, which correctly errors out, saying "abort: file: no such file in hex-rev-of-rev-0". 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) In GNU Emacs 25.2.2 (x86_64-pc-linux-gnu, GTK+ Version 3.23.2) of 2018-08-27, modified by Debian built on lgw01-amd64-037 Windowing system distributor 'The X.Org Foundation', version 11.0.12001000 System Description: Ubuntu 18.10 Configured using: 'configure --build x86_64-linux-gnu --prefix=/usr --sharedstatedir=/var/lib --libexecdir=/usr/lib --localstatedir=/var/lib --infodir=/usr/share/info --mandir=/usr/share/man --with-pop=yes --enable-locallisppath=/etc/emacs:/usr/local/share/emacs/25.2/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/25.2/site-lisp:/usr/share/emacs/site-lisp --with-sound=alsa --without-gconf --build x86_64-linux-gnu --prefix=/usr --sharedstatedir=/var/lib --libexecdir=/usr/lib --localstatedir=/var/lib --infodir=/usr/share/info --mandir=/usr/share/man --with-pop=yes --enable-locallisppath=/etc/emacs:/usr/local/share/emacs/25.2/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/25.2/site-lisp:/usr/share/emacs/site-lisp --with-sound=alsa --without-gconf --with-x=yes --with-x-toolkit=gtk3 --with-toolkit-scroll-bars 'CFLAGS=-g -O2 -fdebug-prefix-map=/build/emacs-nDyT48/emacs-25.2+1=. -fstack-protector-strong -Wformat -Werror=format-security -Wall' 'CPPFLAGS=-Wdate-time -D_FORTIFY_SOURCE=2' 'LDFLAGS=-Wl,-Bsymbolic-functions -Wl,-z,relro'' Configured features: XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND GPM DBUS GSETTINGS NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 Important settings: value of $LC_MONETARY: fr_FR.UTF-8 value of $LC_NUMERIC: fr_FR.UTF-8 value of $LC_TIME: fr_FR.UTF-8 value of $LANG: fr_FR.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: Python Minor modes in effect: shell-dirtrack-mode: t tooltip-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Recent messages: Loading debian-ispell...done Loading /var/cache/dictionaries-common/emacsen-ispell-dicts.el (source)...done Loading /etc/emacs/site-start.d/50dictionaries-common.el (source)...done Loading /etc/emacs/site-start.d/50ocaml-mode.el (source)...done Loading /etc/emacs/site-start.d/51tuareg-mode.el (source)...done For information about GNU Emacs and the GNU system, type C-h C-a. Annotating... vc-do-command: Running hg annotate -dq -n -u --follow -r0 merge.py...FAILED (status 255) Mark set Making completion list... Load-path shadows: /usr/share/emacs/site-lisp/elpa/rust-mode-0.3.0/rust-mode-pkg hides /usr/share/emacs/site-lisp/elpa-src/rust-mode-0.3.0/rust-mode-pkg /usr/share/emacs/site-lisp/elpa/rust-mode-0.3.0/rust-mode hides /usr/share/emacs/site-lisp/elpa-src/rust-mode-0.3.0/rust-mode /usr/share/emacs/site-lisp/elpa/rust-mode-0.3.0/rust-mode-autoloads hides /usr/share/emacs/site-lisp/elpa-src/rust-mode-0.3.0/rust-mode-autoloads Features: (shadow sort mail-extr emacsbug message dired rfc822 mml mml-sec epg mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mail-utils vc-annotate vc vc-dispatcher vc-hg python tramp-sh tramp tramp-compat auth-source cl-seq eieio eieio-core cl-macs gnus-util mm-util help-fns mail-prsvr password-cache tramp-loaddefs trampver ucs-normalize shell pcomplete format-spec advice json map comint ring ansi-color finder-inf info package epg-config seq byte-opt gv bytecomp byte-compile cl-extra help-mode easymenu cconv cl-loaddefs pcase cl-lib time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese charscript case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer cl-preloaded nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote dbusbind inotify dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 240886 13755) (symbols 48 24982 0) (miscs 40 282 190) (strings 32 32555 6908) (string-bytes 1 1068597) (vectors 16 40552) (vector-slots 8 744800 4343) (floats 8 262 215) (intervals 56 506 0) (buffers 976 20)) --000000000000f75a1c058d1024de Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Sometimes, vc-annotate in a file tracked by mercurial retu= rns an
error like this instead of a proper annotate buffer:

abort= : mercurial/merge.py: no such file in rev 9117c6561b0b

Here is a rep= roduction (requires the evolve extension to
be enabled, for instance as = described here:
https://www.mercurial-scm.org/wiki/EvolveExtension):

=C2= =A0 rm -rf /tmp/test
=C2=A0 hg init /tmp/test
=C2=A0 cd /tmp/test
= =C2=A0 echo b > b
=C2=A0 hg commit -Am0
=C2=A0 echo a > a
= =C2=A0 hg commit -Am1
=C2=A0 hg commit --amend -m 2
=C2=A0 if [ $(hg = log -r . -T {rev}) =3D 1 ]; then
=C2=A0 =C2=A0 =C2=A0 echo "Error: = cannot test as evolve is not enabled"
=C2=A0 =C2=A0 =C2=A0 exit 1=C2=A0 fi
=C2=A0 emacs -Q a -f 'vc-annotate'


What h= appens is:
1. vc-annotate calls vc-working-revision
2. vc-hg-working-= revision calls hg parent --template {rev} file
3. that command fails say= ing something like "abort: filtered revision
'3ee3303ecf2621381= e5d5ca14aba73f2835facb5'!"
4. vc-hg-working-revision thus retur= ns 0
5. vc-annotate calls `hg annotate -r 0 file`, which correctly error= s
out, saying "abort: file: no such file in hex-rev-of-rev-0".=

Step 3 is probably an hg bug. However `hg parent` w= as deprecated in
2014, so people may be reluctant to change it. And it w= ould 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 fixi= ng the
current issue). `.` means the current revision, see `hg help revs= et`.

So something like this:
(defun vc-hg-working-re= vision (file)
=C2=A0 "Hg-specific version of `vc-working-revision&#= 39;."
=C2=A0 (ignore-errors
=C2=A0 =C2=A0 (with-output-to-string=
=C2=A0 =C2=A0 =C2=A0 (vc-hg-command standard-output 0 nil
=C2=A0 = =C2=A0 "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 yo= u annotate a file that
was last changed in revision 123, emacs will like= ly get 123123 back
and `hg annotate -r 123123` will fail)


In GNU Emacs 25.2.2 (x86_64-pc-linux-gnu, GTK+ Version 3.23.2)
=C2=A0of= 2018-08-27, modified by Debian built on lgw01-amd64-037
Windowing syste= m distributor 'The X.Org Foundation', version 11.0.12001000
Syst= em Description: Ubuntu 18.10

Configured using:
=C2=A0'configu= re --build x86_64-linux-gnu --prefix=3D/usr
=C2=A0--sharedstatedir=3D/va= r/lib --libexecdir=3D/usr/lib
=C2=A0--localstatedir=3D/var/lib --infodir= =3D/usr/share/info
=C2=A0--mandir=3D/usr/share/man --with-pop=3Dyes
= =C2=A0--enable-locallisppath=3D/etc/emacs:/usr/local/share/emacs/25.2/site-= lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/25.2/site-lisp:/usr/= share/emacs/site-lisp
=C2=A0--with-sound=3Dalsa --without-gconf --build = x86_64-linux-gnu
=C2=A0--prefix=3D/usr --sharedstatedir=3D/var/lib --lib= execdir=3D/usr/lib
=C2=A0--localstatedir=3D/var/lib --infodir=3D/usr/sha= re/info
=C2=A0--mandir=3D/usr/share/man --with-pop=3Dyes
=C2=A0--enab= le-locallisppath=3D/etc/emacs:/usr/local/share/emacs/25.2/site-lisp:/usr/lo= cal/share/emacs/site-lisp:/usr/share/emacs/25.2/site-lisp:/usr/share/emacs/= site-lisp
=C2=A0--with-sound=3Dalsa --without-gconf --with-x=3Dyes --wit= h-x-toolkit=3Dgtk3
=C2=A0--with-toolkit-scroll-bars 'CFLAGS=3D-g -O2=
=C2=A0-fdebug-prefix-map=3D/build/emacs-nDyT48/emacs-25.2+1=3D. -fstack= -protector-strong
=C2=A0-Wformat -Werror=3Dformat-security -Wall' &#= 39;CPPFLAGS=3D-Wdate-time
=C2=A0-D_FORTIFY_SOURCE=3D2' 'LDFLAGS= =3D-Wl,-Bsymbolic-functions -Wl,-z,relro''

Configured featur= es:
XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND GPM DBUS GSETTINGS NOTI= FY
ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT LIBOTF XFT ZLIB
TO= OLKIT_SCROLL_BARS GTK3 X11

Important settings:
=C2=A0 value of $L= C_MONETARY: fr_FR.UTF-8
=C2=A0 value of $LC_NUMERIC: fr_FR.UTF-8
=C2= =A0 value of $LC_TIME: fr_FR.UTF-8
=C2=A0 value of $LANG: fr_FR.UTF-8=C2=A0 value of $XMODIFIERS: @im=3Dibus
=C2=A0 locale-coding-system: ut= f-8-unix

Major mode: Python

Minor modes in effect:
=C2=A0 = shell-dirtrack-mode: t
=C2=A0 tooltip-mode: t
=C2=A0 global-eldoc-mod= e: t
=C2=A0 electric-indent-mode: t
=C2=A0 mouse-wheel-mode: t
=C2= =A0 tool-bar-mode: t
=C2=A0 menu-bar-mode: t
=C2=A0 file-name-shadow-= mode: t
=C2=A0 global-font-lock-mode: t
=C2=A0 font-lock-mode: t
= =C2=A0 blink-cursor-mode: t
=C2=A0 auto-composition-mode: t
=C2=A0 au= to-encryption-mode: t
=C2=A0 auto-compression-mode: t
=C2=A0 line-num= ber-mode: t
=C2=A0 transient-mark-mode: t

Recent messages:
Loa= ding debian-ispell...done
Loading /var/cache/dictionaries-common/emacsen= -ispell-dicts.el (source)...done
Loading /etc/emacs/site-start.d/50dicti= onaries-common.el (source)...done
Loading /etc/emacs/site-start.d/50ocam= l-mode.el (source)...done
Loading /etc/emacs/site-start.d/51tuareg-mode.= el (source)...done
For information about GNU Emacs and the GNU system, t= ype C-h C-a.
Annotating...
vc-do-command: Running hg annotate -dq -n = -u --follow -r0 merge.py...FAILED (status 255)
Mark set
Making comple= tion list...

Load-path shadows:
/usr/share/emacs/site-lisp/elpa/r= ust-mode-0.3.0/rust-mode-pkg hides /usr/share/emacs/site-lisp/elpa-src/rust= -mode-0.3.0/rust-mode-pkg
/usr/share/emacs/site-lisp/elpa/rust-mode-0.3.= 0/rust-mode hides /usr/share/emacs/site-lisp/elpa-src/rust-mode-0.3.0/rust-= mode
/usr/share/emacs/site-lisp/elpa/rust-mode-0.3.0/rust-mode-autoloads= hides /usr/share/emacs/site-lisp/elpa-src/rust-mode-0.3.0/rust-mode-autolo= ads

Features:
(shadow sort mail-extr emacsbug message dired rfc82= 2 mml mml-sec epg
mm-decode mm-bodies mm-encode mail-parse rfc2231 maila= bbrev gmm-utils
mailheader sendmail rfc2047 rfc2045 ietf-drums mail-util= s vc-annotate vc
vc-dispatcher vc-hg python tramp-sh tramp tramp-compat = auth-source
cl-seq eieio eieio-core cl-macs gnus-util mm-util help-fns m= ail-prsvr
password-cache tramp-loaddefs trampver ucs-normalize shell pco= mplete
format-spec advice json map comint ring ansi-color finder-inf inf= o
package epg-config seq byte-opt gv bytecomp byte-compile cl-extra
h= elp-mode easymenu cconv cl-loaddefs pcase cl-lib time-date mule-util
too= ltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type
mwheel = x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt
fringe= tabulated-list newcomment elisp-mode lisp-mode prog-mode register
page = menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock
font-lock sy= ntax facemenu font-core frame cl-generic cham georgian
utf-8-lang misc-l= ang vietnamese tibetan thai tai-viet lao korean
japanese eucjp-ms cp5193= 2 hebrew greek romanian slovak czech european
ethiopic indian cyrillic c= hinese charscript case-table epa-hook
jka-cmpr-hook help simple abbrev m= inibuffer cl-preloaded nadvice
loaddefs button faces cus-face macroexp f= iles text-properties overlay
sha1 md5 base64 format env code-pages mule = custom widget
hashtable-print-readable backquote dbusbind inotify dynami= c-setting
system-font-setting font-render-setting move-toolbar gtk x-too= lkit x
multi-tty make-network-process emacs)

Memory information:<= br>((conses 16 240886 13755)
=C2=A0(symbols 48 24982 0)
=C2=A0(miscs = 40 282 190)
=C2=A0(strings 32 32555 6908)
=C2=A0(string-bytes 1 10685= 97)
=C2=A0(vectors 16 40552)
=C2=A0(vector-slots 8 744800 4343)
= =C2=A0(floats 8 262 215)
=C2=A0(intervals 56 506 0)
=C2=A0(buffers 97= 6 20))
--000000000000f75a1c058d1024de-- From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 26 06:56:56 2020 Received: (at 36534) by debbugs.gnu.org; 26 Nov 2020 11:56:56 +0000 Received: from localhost ([127.0.0.1]:39889 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiFtQ-0002QV-BK for submit@debbugs.gnu.org; Thu, 26 Nov 2020 06:56:56 -0500 Received: from quimby.gnus.org ([95.216.78.240]:49316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiFtN-0002QH-EQ for 36534@debbugs.gnu.org; Thu, 26 Nov 2020 06:56:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bgQTlkxpFBFFFREt4CItZRJKx8b4gHSVPoQ9B+dkfcQ=; b=UYgA0/K5FBF8X+Et9rXgV74Lsf 4HF0W1UMQUcgnqYa0tVfBQben18eeHPp4Pgyj+f5oqSmTjFYAaaKqXssdnISvBIhvRoA1Wsb1qWkl f1+3Rv8wEWVdnjNMPCfUkPIOdTGpEyoV9fa8iu6/wL0Ik/w7MA1FopPFlOUD8oRPJRhM=; Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kiFtB-0000wr-9k; Thu, 26 Nov 2020 12:56:46 +0100 From: Lars Ingebrigtsen To: Valentin Gatien-Baron Subject: Re: bug#36534: 25.2; mercurial vc-annotate sometimes fails when using the evolve mercurial extension References: X-Now-Playing: Japan's _Tin Drum (1)_: "Sons of Pioneers" Date: Thu, 26 Nov 2020 12:56:39 +0100 In-Reply-To: (Valentin Gatien-Baron's message of "Sun, 7 Jul 2019 00:55:51 -0400") Message-ID: <87360wuya0.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Valentin Gatien-Baron writes: > Sometimes, vc-annotate in a file tracked by mercurial returns an > error like this instead of a proper annotate buffer: [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 36534 Cc: 36534@debbugs.gnu.org, Dmitry Gutov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Valentin Gatien-Baron 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). -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 28 13:17:18 2020 Received: (at 36534) by debbugs.gnu.org; 28 Nov 2020 18:17:18 +0000 Received: from localhost ([127.0.0.1]:49017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kj4mb-00064G-R2 for submit@debbugs.gnu.org; Sat, 28 Nov 2020 13:17:18 -0500 Received: from mail-ej1-f48.google.com ([209.85.218.48]:35986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kj4mZ-000643-TZ for 36534@debbugs.gnu.org; Sat, 28 Nov 2020 13:17:16 -0500 Received: by mail-ej1-f48.google.com with SMTP id lt17so12417867ejb.3 for <36534@debbugs.gnu.org>; Sat, 28 Nov 2020 10:17:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=uJe/t89cLFL/ahf2rh0mCYobzRmY6y75dVxXykfsDaI=; b=OIceTmvEY2aD3E9sTk/V+Bmv/u144zTOjFsMgLmYPx5t4Cx1RlkWzoIHDvlCBBsYR2 cjMiyqrtwHza/v095G+Fgor6Q5ZwUz6+fjhxb7YKT++uf6Kh1Oxy80SBePN5ZBLBHahW r/dM9+qmqWZyjNoMr7/ybU27NzW5XFeyT1aCf5/XCsmEhXw2cBWM1jA09UJkVFpFPetC g6WVHFlFyJ3+sNLOTAOYR+Eu6GQp2FafOFLWriHodSYD2E4QoVfj/BYe/354JnQbLZKO 2Iu+lGl6+hAkY6GkwV56ZE/beAgEb5VjYisXCiXlka9DhY3o1a9txymU5ISRzoidcwLu N8sQ== 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:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=uJe/t89cLFL/ahf2rh0mCYobzRmY6y75dVxXykfsDaI=; b=QATfP/khUPJNWkakAR+LsEtlcB/O1VtsKazennOc7cLK39sCkXac6tvcpgbD/zt/W3 3ptXNVVc1Cr1a/6y8ZAe7zMAXPPqVrZHeTuNEnjK8pv/GGQSM5fcBRAKkXKA3908eaHy 1i2NtZ8HYeSPam1GIdEhdFUO8jp0UnV7VPxSPFd4hnewD89bsislMGsphUihjCUtuiYy jKxYF5nermXtXkzGx6vcQFquDcBUmtSB1JYpuDlq8x0NnsW8g+NoLh0SAlQoJSw5Ga0j gCiALjhrK+nUw5ZGXR6KDJ54lXlJyUJkgRf6RVkcSczivGqTpzNlLzXvPWk2VGJmShUl 9KMg== X-Gm-Message-State: AOAM530XVHslUzHe0+U1ALrvR2fHhjiYb7FmfIkuiP0VkuP3WInUThMM 7stPcaFz9bzKsFrKHoHkw8M= X-Google-Smtp-Source: ABdhPJzbWPxpF4VBhgGxX/eLCo2f4ebfHLy+h7+nDZpGxpFJP+OzQxoeifOCkcykUCegYBxr68M35Q== X-Received: by 2002:a17:906:5c43:: with SMTP id c3mr14175293ejr.390.1606587430233; Sat, 28 Nov 2020 10:17:10 -0800 (PST) Received: from [192.168.0.4] ([66.205.71.3]) by smtp.googlemail.com with ESMTPSA id e12sm6704409edm.48.2020.11.28.10.17.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 28 Nov 2020 10:17:09 -0800 (PST) Subject: Re: bug#36534: 25.2; mercurial vc-annotate sometimes fails when using the evolve mercurial extension To: Lars Ingebrigtsen , Valentin Gatien-Baron References: <87360wuya0.fsf@gnus.org> From: Dmitry Gutov Message-ID: <63844114-d90b-bb91-f025-59583cb76433@yandex.ru> Date: Sat, 28 Nov 2020 20:17:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <87360wuya0.fsf@gnus.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 36534 Cc: 36534@debbugs.gnu.org, Daniel Colascione , Andrii Kolomoiets X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 26.11.2020 13:56, Lars Ingebrigtsen wrote: > Valentin Gatien-Baron 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. From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 02 06:18:14 2020 Received: (at 36534) by debbugs.gnu.org; 2 Dec 2020 11:18:14 +0000 Received: from localhost ([127.0.0.1]:34519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkQ9F-00029s-Uy for submit@debbugs.gnu.org; Wed, 02 Dec 2020 06:18:14 -0500 Received: from mail-lf1-f54.google.com ([209.85.167.54]:41017) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkQ9E-00029e-8v for 36534@debbugs.gnu.org; Wed, 02 Dec 2020 06:18:13 -0500 Received: by mail-lf1-f54.google.com with SMTP id r24so3996319lfm.8 for <36534@debbugs.gnu.org>; Wed, 02 Dec 2020 03:18:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=AahLXcDu/HNF1P0PbCOQsZ8mWl89yKvXJReemSzOFUA=; b=arvyIkD39+GPhkHi7f7nsiUooWsE8tT+4JOuWfkW7Vx046GiG3263DomCyCxhFQ2sk 6KFfFOLtjSBt7rlM6wFns5ivLR/PB8supggPQqPRf2mDYhd1a6WyAoBOi4aeIb7uHFNN py/k8dWrJHWdoWU38ejHFtE4rFNwyYEmTL+W5NdWg3TyyXKT8MftPPg84o+yPX/dGrTs sSLewsz/qaIEIQdfKJUe1eYrX7pmPbXFm3VQi7hcKkBPbpuCGiE4RND6s+FPD0SDIwWH TOgux7OmlWxHG+2TrcgwVOoPZBy17vor4fkxF93Cimp/0VLRxZe0r2TlRdMTu70ygXRk +S4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=AahLXcDu/HNF1P0PbCOQsZ8mWl89yKvXJReemSzOFUA=; b=WYVxUft7V+rYghqzxGYdfjsAwtTq8qSNcoRaWvR6Xx04Sndel3O5G1ofpnaIw5SWBD VBC7D7yRV91rJ5PimjgCd+xcT+JnQklJtQqL3loZAFR9SL0NJcYQ5U2v6KLyHWLzA8/r 03cBAAQ98U2zgFFWYSARJjSHsoLBd5SkowP6UhSi7ac6pQ7f2lQGlKz2tBKnXWXEH6sF ybSJY9TRz1s66te+TYszOeotd/B9ceEvpNh1pCxjCFg5Zcm6OWs+ZH3qlkEeV+ssSKdM 7337BGi9XVEe9hu3mkczUKVe0wlx1NOmmO1mVuN49gtxypJohNF0w4OX4ynGiSPO8bi8 I7Lg== X-Gm-Message-State: AOAM533cSyEbkJG/neTKesfKwq1+INonxcG/L+EBtepJHJwq6idqh2iL 7B2D+POjNke95/eu1cdIIrw= X-Google-Smtp-Source: ABdhPJySXCUmI6r8PDfmHWcMwp7/b8yng+GyEnindphiEYSSw8v3gYAGuZhJv9fe87fT7D6dTi+56w== X-Received: by 2002:a19:c393:: with SMTP id t141mr1055857lff.529.1606907886179; Wed, 02 Dec 2020 03:18:06 -0800 (PST) Received: from muffinmac ([91.206.110.206]) by smtp.gmail.com with ESMTPSA id o26sm379675ljj.93.2020.12.02.03.18.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 03:18:05 -0800 (PST) From: Andrii Kolomoiets To: Dmitry Gutov Subject: Re: bug#36534: 25.2; mercurial vc-annotate sometimes fails when using the evolve mercurial extension References: <87360wuya0.fsf@gnus.org> <63844114-d90b-bb91-f025-59583cb76433@yandex.ru> Date: Wed, 02 Dec 2020 13:17:56 +0200 In-Reply-To: <63844114-d90b-bb91-f025-59583cb76433@yandex.ru> (Dmitry Gutov's message of "Sat, 28 Nov 2020 20:17:08 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (darwin) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 36534 Cc: 36534@debbugs.gnu.org, Lars Ingebrigtsen , Daniel Colascione , Valentin Gatien-Baron X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dmitry Gutov writes: > On 26.11.2020 13:56, Lars Ingebrigtsen wrote: >> Valentin Gatien-Baron 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. From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 09 19:26:29 2020 Received: (at 36534) by debbugs.gnu.org; 10 Dec 2020 00:26:29 +0000 Received: from localhost ([127.0.0.1]:36538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn9mu-0007Ts-UV for submit@debbugs.gnu.org; Wed, 09 Dec 2020 19:26:29 -0500 Received: from mail-ej1-f45.google.com ([209.85.218.45]:45002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn9mt-0007Tf-DW for 36534@debbugs.gnu.org; Wed, 09 Dec 2020 19:26:27 -0500 Received: by mail-ej1-f45.google.com with SMTP id w1so171420ejf.11 for <36534@debbugs.gnu.org>; Wed, 09 Dec 2020 16:26:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=O3MReJNR4VN9fE3438aua3sEXnEgWE7jKZa1DxGWuhI=; b=pyh9z7i8BMyKDiZYo71/4KyjVJP2lMe23Jo7rG4n5j4mxoiXRTwE853yvhbCO3JATf P5sDMc80Ytq4cmYn/ICwAxsk3syz6x5BRMtr9HM4PHKN1HAEFwhp2ZyB5igIgM1oEROJ dhpSqCiWvXHiscUNjRFUlwp4XAEQ3luaAzc+iDaiBHwmar1QA1LMf7++iPA1zamuOGN7 zxxYop4AiS3Rc1pds7nb3mPSmUDCfsQoqR1tVyVW65TXx37C3SOtxRXroxW3p0E/QdZy vVOkBWd+cf/A6aQrEmAzYMkO0IHsulYgrWA8333OLYxWsrWe0SR+NLIqOq/tcphtgEK4 rLcA== 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:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=O3MReJNR4VN9fE3438aua3sEXnEgWE7jKZa1DxGWuhI=; b=AYCWAjUSPUDjynRIurD4XQK7kreaR9OK4TQtkeQt53Byih6QIWFT7zTrTNFfNygudR bTL1pLG8sxUX0dzEdg5xOzF3sUf3jQTZ3DWGQGP7Ub60Db+t1Vo0yJX+PrQyz7ud5dMP aNILqxiWFyKFLI4r9wkXZO7AlQzvnIKAkzE5LoyVY/XY3h2ZB1z1Wfh2YzBptmglrXPP pcyddyb+MJY9AwOXD7gWHHWXuGv1iBu5TJyztaqnIukDTWh5K/EUV/RHVa7Mi1O1bZ2W pty312n0tMg7dXwpSx0y2QPQ437dNMe3EuBfCNaB/OQ2PsbG99j7E0mr6uPm8AJdi+g3 yVWQ== X-Gm-Message-State: AOAM530NAu0reIQp+je6ibksE+/bdAfMsEC8Q0Fw9lHKbkB0Z2SjUxpl 7v0Xv6phGS7HUwW6ZdToY9c= X-Google-Smtp-Source: ABdhPJxWl+eiz8ND9/ovaornAp62Ph7NMTgp3j1A/IguAyMbH3rjG2E1We/6yw1N5xe9JuqwZQAFsQ== X-Received: by 2002:a17:906:af79:: with SMTP id os25mr4211108ejb.275.1607559981356; Wed, 09 Dec 2020 16:26:21 -0800 (PST) Received: from [192.168.0.4] ([66.205.71.3]) by smtp.googlemail.com with ESMTPSA id 91sm3766321edy.45.2020.12.09.16.26.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Dec 2020 16:26:20 -0800 (PST) Subject: Re: bug#36534: 25.2; mercurial vc-annotate sometimes fails when using the evolve mercurial extension To: Andrii Kolomoiets References: <87360wuya0.fsf@gnus.org> <63844114-d90b-bb91-f025-59583cb76433@yandex.ru> From: Dmitry Gutov Message-ID: Date: Thu, 10 Dec 2020 02:26:18 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 36534 Cc: Lars Ingebrigtsen , Valentin Gatien-Baron , 36534@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) Thanks Andrii, On 02.12.2020 13:17, Andrii Kolomoiets wrote: > Not sure what it may leads to. Indeed the `vc-git-working-revision` > function ignores FILE as well. Sounds like it will indeed bring its behavior closer to vc-git's, which is generally better tested. Seems like a good thing. From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 09 19:39:51 2020 Received: (at 36534-done) by debbugs.gnu.org; 10 Dec 2020 00:39:51 +0000 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 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 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) 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) Subject: Re: bug#36534: 25.2; mercurial vc-annotate sometimes fails when using the evolve mercurial extension To: Valentin Gatien-Baron , 36534-done@debbugs.gnu.org References: From: Dmitry Gutov Message-ID: <9242696f-e8b3-9071-336b-9ace5d785c42@yandex.ru> Date: Thu, 10 Dec 2020 02:39:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 36534-done Cc: Lars Magne Ingebrigtsen , Andrii Kolomoiets X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) 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. From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 12 13:55:07 2020 Received: (at 36534) by debbugs.gnu.org; 12 Dec 2020 18:55:07 +0000 Received: from localhost ([127.0.0.1]:46517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1koA2s-0003J6-Sl for submit@debbugs.gnu.org; Sat, 12 Dec 2020 13:55:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1koA2r-0003IW-PK for 36534@debbugs.gnu.org; Sat, 12 Dec 2020 13:55:06 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49083) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koA2l-0007Sm-Uu; Sat, 12 Dec 2020 13:55:00 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1koA2g-0001k1-SG; Sat, 12 Dec 2020 13:54:55 -0500 From: Glenn Morris To: 36534@debbugs.gnu.org Subject: Re: bug#36534: closed (Re: bug#36534: 25.2; mercurial vc-annotate sometimes fails when using the evolve mercurial extension) References: <9242696f-e8b3-9071-336b-9ace5d785c42@yandex.ru> X-Spook: industrial intelligence Agro Symptoms IRA Central X-Ran: tU@~ql(eHm9yF+,`JyRqXM'|:]-,bvmyaS$ps8I>.Gd_otOSZqGpC\qoB%4%E{gX7LSusy X-Hue: magenta X-Attribution: GM Date: Sat, 12 Dec 2020 13:54:53 -0500 In-Reply-To: (GNU bug Tracking System's message of "Thu, 10 Dec 2020 00:40:02 +0000") Message-ID: <26k0tmyhvm.fsf@fencepost.gnu.org> User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 36534 Cc: Valentin Gatien-Baron , dgutov@yandex.ru X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, this change causes a test failure. Ref eg https://hydra.nixos.org/build/132497145 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 12 20:57:23 2020 Received: (at 36534) by debbugs.gnu.org; 13 Dec 2020 01:57:23 +0000 Received: from localhost ([127.0.0.1]:47192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1koGdX-0006I5-HR for submit@debbugs.gnu.org; Sat, 12 Dec 2020 20:57:23 -0500 Received: from mail-wr1-f46.google.com ([209.85.221.46]:46512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1koGdV-0006Hr-PH for 36534@debbugs.gnu.org; Sat, 12 Dec 2020 20:57:22 -0500 Received: by mail-wr1-f46.google.com with SMTP id a11so5147635wrr.13 for <36534@debbugs.gnu.org>; Sat, 12 Dec 2020 17:57:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=McUdr9/T+tjVvRzqrD6IJgOgAvOmpKGLH9T1CUBAih8=; b=dKZoktMx8RJLMDhoQ5eF1xje+iTa6uVP5nhie3Vgb/DRjcEvo+N6ylwyI1nQTQDyrx HLxNBtQhUzcWKcJInznNU4lr91FxbJAdhNS4+rr8W6VL3o2dAb8z30Sgedjo2vT7EO7U DTjah8tN29kLyUTWA3DvE4UwRcXmWBm3zoMeNXrXh/+8wD9HWiYFhUSADgdHWgfmWq61 5d4nPwPR9Dte2DYnxN2Sy26Ht/ezu9Zp4YkjoUFxb7h54eetc5G6fKf20k2+6LsAMRem 0YYBy3n3k59+GKPftw7FbArxvgtJsT2GAdYzUpzgXTNyeDmBzLmCq0I1NXHw6bwuWQgJ lVFw== 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:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=McUdr9/T+tjVvRzqrD6IJgOgAvOmpKGLH9T1CUBAih8=; b=MpKa6776rPkBeu/ZHlJFwDzMxgPzKyHRemfGK4F+doq3pz1FA+id3C12hrbHuGzx7h RsEWEL3yH0HMy0OO1/31fg75re9h6ME5GAuSvV6bKE8A/DQ8w3Dwoq+QsuGF82/aWgk+ ot8koFRVeFSefFfyFTXfRwGyBkZ25wpkKLsgvwUoIrghQjXi6/NU/BF52+xPV1kqQrV8 42iMNmfMfjnxDfxxZ87GWd2rGemJpPuPl+TlUJttjIyC0PuR4tNFzU4GYgfldv08Sq7b 2gNppgjRYZxiQ0BUBwYEey8McsDRFxgrN/17RXks/VxXVedxayi47Vqrdew4qNdmlpcO mBzQ== X-Gm-Message-State: AOAM532/m7vNLFF/+KeLuleWP3Wd1y10stYepuUrZt1nzKv93mvgzkWS MoPNsjzxb97K+TnD4iC7znY= X-Google-Smtp-Source: ABdhPJwrd2LojQzCcWqyzLLkr2Y7FJdeSuccMxCSTH6vxtlN9m+KlX2PAOVNk+cnehMgNrEvi6rkGA== X-Received: by 2002:a5d:4349:: with SMTP id u9mr21037772wrr.319.1607824635760; Sat, 12 Dec 2020 17:57:15 -0800 (PST) Received: from [192.168.0.5] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id z13sm24193074wmz.3.2020.12.12.17.57.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 12 Dec 2020 17:57:14 -0800 (PST) Subject: Re: bug#36534: closed (Re: bug#36534: 25.2; mercurial vc-annotate sometimes fails when using the evolve mercurial extension) To: Glenn Morris , 36534@debbugs.gnu.org References: <9242696f-e8b3-9071-336b-9ace5d785c42@yandex.ru> <26k0tmyhvm.fsf@fencepost.gnu.org> From: Dmitry Gutov Message-ID: <1d2f084c-6ef1-5086-1deb-18da7cd7ebdd@yandex.ru> Date: Sun, 13 Dec 2020 03:57:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <26k0tmyhvm.fsf@fencepost.gnu.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 36534 Cc: Valentin Gatien-Baron X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) Hi Glenn, Thanks. On 12.12.2020 20:54, Glenn Morris wrote: > > Hi, this change causes a test failure. > > Ref eg https://hydra.nixos.org/build/132497145 Apparently Hg shows revision "-1" for a file in a repository with no commits at all (which is confirmed by https://stackoverflow.com/a/28831490/615245). I can't reproduce it locally, though. My Hg is 5.3.1, Hydra's is 4.7. Apparently that behavior changed at some point, but I can't find the exact version and change log entry. The exact values are not very important for that test, so I'll just add another possible one. From unknown Thu Sep 11 21:35:50 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 10 Jan 2021 12:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator