From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: 25.1; vc-annotate in Git is unable to fully navigate the history if the file was moved Resent-From: Wojciech Siewierski Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 03 Apr 2017 00:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 26345@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149117792715383 (code B ref -1); Mon, 03 Apr 2017 00:06:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Apr 2017 00:05:27 +0000 Received: from localhost ([127.0.0.1]:57878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cupUs-000401-9L for submit@debbugs.gnu.org; Sun, 02 Apr 2017 20:05:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cunKd-0000iN-81 for submit@debbugs.gnu.org; Sun, 02 Apr 2017 17:46:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cunKU-0004P7-Bc for submit@debbugs.gnu.org; Sun, 02 Apr 2017 17:46:38 -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, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:43499) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cunKU-0004Oo-7t for submit@debbugs.gnu.org; Sun, 02 Apr 2017 17:46:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cunKP-0001A4-Ss for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2017 17:46:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cunKM-0004GH-39 for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2017 17:46:29 -0400 Received: from mail-lf0-x235.google.com ([2a00:1450:4010:c07::235]:35597) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cunKL-0004Cp-Gj for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2017 17:46:25 -0400 Received: by mail-lf0-x235.google.com with SMTP id j90so63363971lfk.2 for ; Sun, 02 Apr 2017 14:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version; bh=ReUSTSwpzellgbGKgSxL29dfd/TF3zAdqBMOZ1oPeLQ=; b=WnDTWrWucr+TZ6Y+QqWuJfj/wgSwgjyJAPrZmHjoKmKOof6IC7Y2WGdckdf/BKpYBI sOgYhwzi2xHoa6Qgl34L0AHeZabiKPXuDTuPOMX7X59EjkeZsyhDkiQMJf5Q7bRip7cX vpdILkJZHzVmdNmS+UVnLKVy/M8TLsLsb50/EIXxE9mGOz2PjQD5j/Sz+GfOij1Xi3RN /bXWXzzrs3rh32sAeEdfqMGLyR5pPJqvPtOY0XPXqaJhcDVmOSku7bOVypFksYc2GKE1 fcXvJ7v9C3xe2pC/13erq8lw9UkpHp8IGKLZ/iJEfo8NR4o7wZ72buuzTDSoavENjNUP sxng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version; bh=ReUSTSwpzellgbGKgSxL29dfd/TF3zAdqBMOZ1oPeLQ=; b=hIlYs2pTPQ1Znq7Xhv6w08kmRzqiwkaJyxbnS7VD8iwhYVRUpzHFpdjHm13gCkN+Hj d7WXD2Xn+ZCseGxJnaspxHTwgqrdEBBfvO3SzfsFK3jIn66kAfnuxXo6jaFb2ByuZOhQ c74glDs4V6Et0Q0uFHf9Ji0EbazL3z7q+AlNaEXTD/BKIbWB9nOxpeGRPJSVzQrO2ALs Oo9qJihQazAjn6m0cbDokvFctLZF8boCyg6ADVpFwx42TNG/z+/76rZUTUlHIQGr8RC9 xq7rA1U/P2WrNlVua5Rsy7WY32YkcIkR54sYxfI5GI4uqcdsDuJyMKPU3av+jVV79BHy iTdQ== X-Gm-Message-State: AFeK/H22Gf/zzVHaii81EW8dxDg/ZnqnO5gKbDm1Ksa0Dp4KPjO+ilr53ILwZoC8KfXWQA== X-Received: by 10.25.229.6 with SMTP id c6mr3662526lfh.95.1491169581790; Sun, 02 Apr 2017 14:46:21 -0700 (PDT) Received: from [192.168.1.101] (host-37-190-211-219.dynamic.mm.pl. [37.190.211.219]) by smtp.googlemail.com with ESMTPSA id g4sm2197127lji.35.2017.04.02.14.46.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Apr 2017 14:46:20 -0700 (PDT) From: Wojciech Siewierski Message-ID: <3b0ce616-d7ae-8f63-3ed8-cab1a6feaae2@gmail.com> Date: Sun, 2 Apr 2017 23:46:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="tnDpFuSkkOOP7qB22jIIDvtnA6VQ4dHCu" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Mailman-Approved-At: Sun, 02 Apr 2017 20:05:25 -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: -4.0 (----) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --tnDpFuSkkOOP7qB22jIIDvtnA6VQ4dHCu Content-Type: multipart/mixed; boundary="0F2v1MwESUOfEta9Hx61meJ9AWLim413i"; protected-headers="v1" From: Wojciech Siewierski To: bug-gnu-emacs@gnu.org Message-ID: <3b0ce616-d7ae-8f63-3ed8-cab1a6feaae2@gmail.com> Subject: 25.1; vc-annotate in Git is unable to fully navigate the history if the file was moved --0F2v1MwESUOfEta9Hx61meJ9AWLim413i Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable It seems some vc-git operations override `default-directory' with the parent directory of the files they operate on. It's a problem if they no longer exist like in the following scenario. Preparation steps in shell: $ git init $ mkdir olddir/ $ echo oldcontent > olddir/file.txt $ git add olddir/ $ git commit -m 'Initial commit' $ echo newcontent > olddir/file.txt $ git add olddir/ $ git commit -m 'Modify the file' $ git mv olddir/ newdir/ $ git commit -m 'Move the file' Reproduction: 1. Open newdir/file.txt in Emacs. 2. Press `C-x v g' to open `vc-annotate'. 3. Press `j' to jump to the revision from before the file was moved. 4. Try to move to the next (newer) revision with `n'. The error appears here. > apply: Setting current directory: No such file or directory, =2E../testrepo/olddir/ It seems in this scenario `vc-annotate' also has trouble with the regular navigation (`n' and `p') without the usage of `j' but the error message is not as clear. In GNU Emacs 25.1.1 (x86_64-unknown-linux-gnu, GTK+ Version 2.24.31) of 2017-01-08 built on localhost Windowing system distributor 'The X.Org Foundation', version 11.0.1180400= 0 System Description: Ubuntu 16.04.2 LTS Configured using: 'configure --disable-dependency-tracking --prefix=3D/nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1 --with-modules --with-x-toolkit=3Dgtk2 --with-xft' Configured features: XPM JPEG TIFF GIF PNG RSVG SOUND DBUS GSETTINGS NOTIFY LIBSELINUX GNUTLS LIBXML2 FREETYPE XFT ZLIB TOOLKIT_SCROLL_BARS GTK2 X11 MODULES Important settings: value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix Major mode: Org Minor modes in effect: TeX-PDF-mode: t magit-auto-revert-mode: t ido-vertical-mode: t flx-ido-mode: t yas-global-mode: t yas-minor-mode: t projectile-mode: t global-diff-hl-mode: t hl-line-mode: t global-company-mode: t company-mode: t org-bullets-mode: t recentf-mode: t bbyac-global-mode: t bbyac-mode: t beacon-mode: t volatile-highlights-mode: t global-git-commit-mode: t global-undo-tree-mode: t undo-tree-mode: t show-paren-mode: t minibuffer-depth-indicate-mode: t electric-pair-mode: t global-subword-mode: t subword-mode: t diff-auto-refine-mode: t shell-dirtrack-mode: t async-bytecomp-package-mode: t ivy-mode: t override-global-mode: t winner-mode: t tooltip-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t column-number-mode: t line-number-mode: t transient-mark-mode: t Recent messages: Type C-x 1 to delete the help window, C-M-v to scroll help. Quit When done with this frame, type C-x 5 0 Quit When done with this frame, type C-x 5 0 Quit [3 times] Type C-x 1 to delete the help window, C-M-v to scroll help. Mark set C-x C-g is undefined Quit Load-path shadows: /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/scala-m= ode-20170323.502/ob-scala hides /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-scala /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-texinfo hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-texinfo /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-publish hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-publish /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-org hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-org /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-odt hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-odt /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-md hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-md /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-man hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-man /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-latex hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-latex /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-icalendar hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-icalendar /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-html hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-html /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-beamer hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-beamer /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-ascii hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-ascii /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-w3m hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-w3m /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-version hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-version /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-timer hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-timer /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-table hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-table /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-src hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-src /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-rmail hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-rmail /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-protocol hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-protocol /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-plot hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-plot /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-pcomplete hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-pcomplete /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-mouse hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-mouse /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-mobile hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-mobile /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-mhe hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-mhe /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-macs hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-macs /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-macro hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-macro /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-loaddefs hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-loaddefs /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-list hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-list /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-irc hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-irc /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-install hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-install /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-inlinetask hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-inlinetask /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-info hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-info /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-indent hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-indent /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-id hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-id /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-habit hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-habit /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-gnus hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-gnus /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-footnote hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-footnote /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-feed hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-feed /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-faces hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-faces /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-eshell hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-eshell /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-entities hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-entities /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-element hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-element /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-docview hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-docview /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-datetree hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-datetree /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-ctags hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-ctags /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-crypt hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-crypt /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-compat hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-compat /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-colview hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-colview /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-clock hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-clock /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-capture hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-capture /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-bibtex hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-bibtex /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-bbdb hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-bbdb /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-attach hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-attach /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-archive hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-archive /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-agenda hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-agenda /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-tangle hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-tangle /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-table hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-table /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-sqlite hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-sqlite /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-sql hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-sql /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-shen hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-shen /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-screen hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-screen /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-scheme hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-scheme /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/scala-m= ode-20170323.502/ob-scala hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-scala /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-sass hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-sass /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-ruby hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-ruby /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-ref hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-ref /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-python hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-python /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-plantuml hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-plantuml /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-picolisp hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-picolisp /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-perl hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-perl /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-org hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-org /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-octave hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-octave /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-ocaml hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-ocaml /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-mscgen hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-mscgen /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-maxima hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-maxima /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-matlab hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-matlab /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-makefile hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-makefile /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-lob hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-lob /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-lisp hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-lisp /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-lilypond hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-lilypond /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-ledger hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-ledger /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-latex hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-latex /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-keys hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-keys /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-js hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-js /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-java hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-java /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-io hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-io /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-haskell hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-haskell /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-gnuplot hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-gnuplot /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-fortran hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-fortran /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-exp hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-exp /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-eval hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-eval /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-emacs-lisp hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-emacs-lisp /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-dot hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-dot /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-ditaa hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-ditaa /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-css hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-css /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-core hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-core /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-comint hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-comint /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-clojure hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-clojure /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-calc hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-calc /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-awk hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-awk /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-asymptote hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-asymptote /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-R hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-R /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-C hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-C /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/seq-2.1= 9/seq hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/emacs-lisp/seq ~/.emacs.d/skeletons/generic hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/emacs-lisp/generic Features: (shadow mail-extr emacsbug sendmail pulse debug eieio-opt speedbar sb-image ezimage dframe vc-annotate helm-projectile helm-files image-dired helm-tags helm-bookmark helm-adaptive helm-info helm-external helm-net helm-buffers helm-grep helm-regexp helm-elscreen helm-utils helm-locate helm-types c-c++-header breadcrumb find-file expand-region cperl-mode-expansions text-mode-expansions cc-mode-expansions the-org-mode-expansions python-el-fgallina-expansions latex-mode-expansions er-basic-expansions expand-region-core expand-region-custom cl-indent wdired slime hyperspec browse-url sort iedit iedit-lib dired-aux rst vim-line-open tramp-cache ispell tabify cal-move parse-time epa-file epa org-datetree org-capture haskell-doc inf-haskell haskell-decl-scan geiser-mode geiser-xref geiser-compile geiser-debug geiser-chibi geiser-mit geiser-chez geiser-chicken geiser-racket geiser-guile info-look geiser geiser-repl geiser-image geiser-company geiser-doc geiser-menu geiser-edit geiser-completion geiser-autodoc geiser-eval geiser-connection tq geiser-syntax geiser-log geiser-popup view geiser-impl geiser-custom geiser-base scheme dired-subtree dired-hacks-utils network-stream nsm starttls warnings git-rebase texmathp preview prv-emacs tex-buf indent-guide font-latex latex tex-ispell tex-style tex dbus tex-mode latexenc wgrep-ag wgrep ag vc-svn find-dired magit-obsolete magit-blame magit-stash magit-bisect magit-remote magit-commit magit-sequence magit-notes magit-worktree magit-branch magit-files magit-refs magit-status magit magit-repos magit-apply magit-wip magit-log magit-diff smerge-mode magit-core magit-autorevert autorevert filenotify magit-process magit-margin magit-mode magit-git crm magit-section magit-popup misearch multi-isearch smex ido-vertical-mode flx-ido ido vc-git org-table org-agenda company-rtags colir color counsel esh-util swiper org-clock ansible yasnippet rtags repeat bookmark projectile diff-hl vc-dir vc vc-dispatcher hl-line haskell haskell-completions haskell-load haskell-commands highlight-uses-mode haskell-modules haskell-sandbox haskell-repl haskell-debug haskell-interactive-mode haskell-presentation-mode haskell-collapse haskell-navigate-imports haskell-compile haskell-process haskell-session haskell-hoogle haskell-mode haskell-cabal haskell-utils haskell-font-lock haskell-indentation haskell-string haskell-sort-imports haskell-lexeme haskell-align-imports haskell-compat haskell-complete-module haskell-ghc-support dabbrev haskell-customize macrostep-c cmacexp macrostep sh-script smie executable company-files company-oddmuse company-clang company-dabbrev-code company-dabbrev company-keywords company-etags company-gtags company-capf company-cmake company-xcode company-semantic company-eclim company-template company-css company-nxml company-bbdb company-tern dash-functional tern url-http tls gnutls url-auth company flycheck jedi auto-complete jedi-core python-environment epc ctable concurrent deferred python perltidy cperl-lineup cperl-mode paredit yafolding org-bullets disp-table org-rmail org-mhe org-irc org-info org-gnus org-docview doc-view subr-x jka-compr image-mode org-bibtex bibtex org-bbdb org-w3m my-secret zenburn-theme recentf-merge recentf tree-widget wid-edit avy bbyac browse-kill-ring derived ecomplete racer rust-mode ggtags phi-search phi-search-core multiple-cursors mc-hide-unmatched-lines-mode mc-separate-operations rectangular-region-mode mc-mark-pop mc-mark-more mc-cycle-cursors mc-edit-lines multiple-cursors-core rect beacon etags xref project volatile-highlights highlight-symbol goto-last-change p4 ps-print ps-def lpr stgit ewoc git-commit with-editor tramp-sh server magit-utils log-edit message rfc822 mml mml-sec epg mailabbrev mail-utils gmm-utils mailheader pcvs-util add-log legalese finder diary-lib diary-loaddefs undo-tree diff dired-x pastes-from-web my-scratch my-global-settings cualess-global-mark avoid paren mb-depth elec-pair cap-words superword subword my-registers my-fixes disable-suspend fuck-you-slime lineup my-eshell my-org steam xml url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf url-util mailcap org-crypt ob-scala ensime ensime-mode ensime-sbt sbt-mode sbt-mode-rgrep grep sbt-mode-comint sbt-mode-buffer sbt-mode-project sbt-mode-vars ensime-http ensime-ui ensime-semantic-highlight ensime-doc ensime-search ensime-undo ensime-startup ensime-refactor diff-mode ensime-popup ensime-notes ensime-model ensime-inspector imenu ensime-goto-testfile ensime-editor popup ensime-debug gdb-mi bindat gud ensime-stacktrace ensime-inf ensime-overlay ensime-completion-util ensime-config ensime-util ensime-client ensime-vars url-gw scala-mode scala-mode-prettify-symbols scala-mode-imenu scala-mode-map scala-mode-fontlock scala-mode-indent scala-mode-paragraph scala-mode-syntax scala-mode-lib pp hideshow flymake arc-mode archive-mode ensime-macros cl ob-java ob-perl ob-python ob-C cc-mode cc-fonts cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs ob-haskell ob-sqlite ob-octave ob-gnuplot ob-dot ob-plantuml ob-ditaa ob-makefile ob-sed ob-awk ob-shell org-protocol org-element avl-tree org org-macro org-footnote org-pcomplete org-list org-faces org-entities noutline outline org-version ob-emacs-lisp ob ob-tangle org-src ob-ref ob-lob ob-table ob-keys ob-exp ob-comint tramp tramp-compat tramp-loaddefs trampver shell pcomplete ob-core ob-eval org-compat org-macs org-loaddefs format-spec find-func cal-menu calendar cal-loaddefs my-ibuffer ibuffer-vc ibuf-ext ibuffer my-helm helm-help helm helm-source eieio-compat helm-multi-match helm-lib dired helm-config helm-easymenu async-bytecomp async my-ivy ivy-hydra ivy flx delsel ivy-overlay ffap thingatpt url-parse auth-source eieio gnus-util time-date password-cache url-vars my-god-mode god-mode my-keys windmove my-fun my-mode-line my-skeletons skeletor compile comint ansi-color rx let-alist autoinsert skeleton my-hooks hydra lv key-chord use-package diminish bind-key easy-mmode tex-site eieio-core advice slime-autoloads info edmacro kmacro cask cl-seq cl-macs cask-bootstrap package-build mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums mm-util help-fns mail-prsvr json map lisp-mnt shut-up epl git commander f dash s ucs-normalize finder-inf package epg-config seq byte-opt gv bytecomp byte-compile cl-extra help-mode easymenu cconv cl-loaddefs pcase cl-lib my-compat winner ring cus-start cus-load 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 1451135 142112) (symbols 48 82760 0) (miscs 40 9828 3493) (strings 32 438521 140156) (string-bytes 1 8714254) (vectors 16 159814) (vector-slots 8 3567015 52260) (floats 8 3169 4363) (intervals 56 44066 417) (buffers 976 192)) --0F2v1MwESUOfEta9Hx61meJ9AWLim413i-- --tnDpFuSkkOOP7qB22jIIDvtnA6VQ4dHCu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJY4XEpAAoJEOWQKlKyR7jeGI8H/1kc8FT5p7oRAFtV5FgK9c49 LSFLQ+Pf1CDvhQnCIPo6AsWUYUsa5cUZBMlyJ7BaFj5hmpEDvzc4xHZ+XnIPZSeF FyXC4GALeaLmg9Lur8ROiPugZAIkesCDw6mqzVDShA1y7yV+L4zljDczd6AMHdKG oV/EMajtHqFu85grF3TBGA58j9sf7Sz+ztinJRJmCSLs5bcFIkD7Z7ZGVc0P/yqu k1Eu9GKazK1QRF2MN34o/wJv5tgIbqBl73aMl5ZaIYkc25EKGLB+zxZOHcePsr6A oUAX4VxLq1vmXdVUyUA6HXKYiWat3qDnolWqU4exgjh/s/vnLgUW58xZyk2kPcM= =0NFf -----END PGP SIGNATURE----- --tnDpFuSkkOOP7qB22jIIDvtnA6VQ4dHCu-- From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: 25.1; vc-annotate in Git is unable to fully navigate the history if the file was moved Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 10 Apr 2017 02:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Wojciech Siewierski , 26345@debbugs.gnu.org Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.149179142427538 (code B ref 26345); Mon, 10 Apr 2017 02:31:01 +0000 Received: (at 26345) by debbugs.gnu.org; 10 Apr 2017 02:30:24 +0000 Received: from localhost ([127.0.0.1]:40365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxP60-0007A5-Cj for submit@debbugs.gnu.org; Sun, 09 Apr 2017 22:30:24 -0400 Received: from mail-wr0-f176.google.com ([209.85.128.176]:32984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxP5y-00079p-Hw for 26345@debbugs.gnu.org; Sun, 09 Apr 2017 22:30:22 -0400 Received: by mail-wr0-f176.google.com with SMTP id l28so9949279wre.0 for <26345@debbugs.gnu.org>; Sun, 09 Apr 2017 19:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=8NhoxbCDfLI8gZ9YeJd/o1Pz7TFA5/KMCJZMtnTbicE=; b=Lr8rYRmN0b+7de9tepZjnTgQVTj202M906ZJgvJ6wf/ph51iRs327vxEvOGy8hMI5D 56kroZDk9Lu/QdWP4a9uChBnyvsOVq183hLxriyt27X5MuGXn0T7RkrDTsIDoFpK+njf 9tnAwsXqFm/BPCP9nqO74KwB+9fSRHIsMBH+0YwxDOy7KPiLFs+n1fYY5ruLNzS8cPsJ ykeTDjOkFm2jiJZX+0YFrMzNqBfA6CNbxYrksSVZ7+28hk4oXUvB2V20DW7NVovNo4ER BAfGIpLkqh9UM21R7uDoKStGqubt1QWj84C+xobZ6fUQ0kJbDd7hqbJVl+dfY6gkP6K7 /xCA== 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:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=8NhoxbCDfLI8gZ9YeJd/o1Pz7TFA5/KMCJZMtnTbicE=; b=m+JBh7duXYBHWY/8mR+m/mvsmCTP85H1KqXbSWBckGvjZhetkYXWAgdP8tIm/V6Bb2 k/B3AqbZvhkG3Rfub4i8xGUn7GLp/DP24fQVlmmUHa3qvPoFRwqyJ8t/ym330j1Bre5Z 4N88539eRalHCzhMK3TJyX7Giygnnc5wc/eVUL5lzTtwthY573pRvJdwQ103ixZUv0xy vCZqe/QN1PMiV0FyXZgODIiP7g9EzzM0dibhAhrugeVnNfsObmwwOw9e45+hHJee4wuJ 0x98YbUS5osBRHMsJz2d3hn5Ys5PzONTlBx8h4vJmUEBRWZvU0RE81ISzXEDAqJb6Hlv iX8w== X-Gm-Message-State: AFeK/H0dSdZJLwVzC1709mV6Yt6UV0QzLWaXK4bfT4CgjcWQuZM0PxZ7msLGVs+hmGHeYA== X-Received: by 10.223.165.66 with SMTP id j2mr47158729wrb.157.1491791416800; Sun, 09 Apr 2017 19:30:16 -0700 (PDT) Received: from [192.168.1.3] ([185.105.173.156]) by smtp.googlemail.com with ESMTPSA id u145sm8317394wmu.1.2017.04.09.19.30.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Apr 2017 19:30:16 -0700 (PDT) References: <3b0ce616-d7ae-8f63-3ed8-cab1a6feaae2@gmail.com> From: Dmitry Gutov Message-ID: Date: Mon, 10 Apr 2017 05:30:14 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0 MIME-Version: 1.0 In-Reply-To: <3b0ce616-d7ae-8f63-3ed8-cab1a6feaae2@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: -2.6 (--) 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.6 (--) On 03.04.2017 00:46, Wojciech Siewierski wrote: > > It seems some vc-git operations override `default-directory' with the > parent directory of the files they operate on. It's a problem if they no > longer exist like in the following scenario. > > Preparation steps in shell: > > $ git init > $ mkdir olddir/ > $ echo oldcontent > olddir/file.txt > $ git add olddir/ > $ git commit -m 'Initial commit' > $ echo newcontent > olddir/file.txt > $ git add olddir/ > $ git commit -m 'Modify the file' > $ git mv olddir/ newdir/ > $ git commit -m 'Move the file' > > Reproduction: > > 1. Open newdir/file.txt in Emacs. > 2. Press `C-x v g' to open `vc-annotate'. > 3. Press `j' to jump to the revision from before the file was moved. > 4. Try to move to the next (newer) revision with `n'. The error appears > here. Thanks. For the report. I'm including a minor patch below. Does it improve things considerably for you? >> apply: Setting current directory: No such file or directory, > .../testrepo/olddir/ > > It seems in this scenario `vc-annotate' also has trouble with the > regular navigation (`n' and `p') without the usage of `j' but the error > message is not as clear. The problem of `n' and `p' navigation between revisions where the file name changed is still present, because of how `vc-git-next-revision' is written. Suggestions for a better implementation are welcome. The patch that fixes the first scenario: diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 1a3f1bf..4767cbf 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1274,9 +1274,8 @@ vc-git--rev-parse (defun vc-git-next-revision (file rev) "Git-specific version of `vc-next-revision'." - (let* ((default-directory (file-name-directory - (expand-file-name file))) - (file (file-name-nondirectory file)) + (let* ((default-directory (vc-git-root file)) + (file (file-relative-name file)) (current-rev (with-temp-buffer (and From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: 25.1; vc-annotate in Git is unable to fully navigate the history if the file was moved Resent-From: Wojciech Siewierski Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 10 Apr 2017 15:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov , 26345@debbugs.gnu.org Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.14918367918947 (code B ref 26345); Mon, 10 Apr 2017 15:07:01 +0000 Received: (at 26345) by debbugs.gnu.org; 10 Apr 2017 15:06:31 +0000 Received: from localhost ([127.0.0.1]:41371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxati-0002KF-Qk for submit@debbugs.gnu.org; Mon, 10 Apr 2017 11:06:31 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:36606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxatg-0002K1-Ok for 26345@debbugs.gnu.org; Mon, 10 Apr 2017 11:06:29 -0400 Received: by mail-lf0-f68.google.com with SMTP id 75so3334591lfs.3 for <26345@debbugs.gnu.org>; Mon, 10 Apr 2017 08:06:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to; bh=x8bA1oxMA20tNHJY+7KNGf9f2r2FXemRMrXzjewtaf8=; b=Pc0R5XXM2E24aqQzcX5lXe89TOM8XXvLTCHDrdCLaIXyecHZ6oQ2iMXJZZZAmWlwnK IZA6Qn6yl249V06EHPFOb8x5SprGZxDh82bv674R+hoTGM8Hqub6jH7f0HRXuDlTJlRD nRWGIiDl3p4iPvbRUQsOnbdesHBlddc1dBr3kyBr2EDxqBNJ/BwfCGw7jAbBE5O6wkm9 Y+dT+jAFhmiTE4SsjkzJNhztY17+d8S96EJEq0/we4flUzbEZAJyI312nzQzxuMH+akG XTD77sqcM0f+j81pyu4Y2EeodJwWmuGobg2pF/GqdfKdPY1fRFrtvM/vRVaGaMBMgBgx Ml3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to; bh=x8bA1oxMA20tNHJY+7KNGf9f2r2FXemRMrXzjewtaf8=; b=aNo0OSydiG3XVKxgB8SH1UMDKLRVuAfahFqTQka8Xj6lszr0MpwjMTkSbSr3IA432P jJHDNdYwaiInAJuwZl+uSYqUVtbKujA2xroeDdh/u7FHFBZ9z7WxKtLwSTEbVX8G5soz U3IFWkvpUFhA7Pk2h1+s2K2rX1+s8dx5c5OZj9/9y/9I3BJ0J/Zga2QlH99RXljEVWVs 0WqzxYb763+WPqKj2PdcyrzJScj7GQe836CQ/Iw2XYUkUdRsdzM5DjAHSUhiS2skdVu/ YNrU3cJjUYaJF/Mddn8arOdxV2inT7xQ1miVFoU7wP9Ul8elHCvMwa7uAdcGalmWROkB J06w== X-Gm-Message-State: AFeK/H2927Xg0+IFw96wgahNqkkJVlyRrIEGxYjMS7t9vmV62R9V9/sbDMhCqbjdSc88+Q== X-Received: by 10.46.32.156 with SMTP id g28mr16800208lji.86.1491836782811; Mon, 10 Apr 2017 08:06:22 -0700 (PDT) Received: from [192.168.43.99] (user-94-254-162-126.play-internet.pl. [94.254.162.126]) by smtp.googlemail.com with ESMTPSA id h9sm2850569ljb.46.2017.04.10.08.06.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Apr 2017 08:06:22 -0700 (PDT) References: <3b0ce616-d7ae-8f63-3ed8-cab1a6feaae2@gmail.com> From: Wojciech Siewierski Message-ID: Date: Mon, 10 Apr 2017 17:06:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="lAoj1RGi46uR5C1cvHrJ9RJlQqhJTs8nn" X-Spam-Score: 0.5 (/) 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 (/) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --lAoj1RGi46uR5C1cvHrJ9RJlQqhJTs8nn Content-Type: multipart/mixed; boundary="lDk19aDo5sFlaBsFuPfj2nB7h2an6IiEx"; protected-headers="v1" From: Wojciech Siewierski To: Dmitry Gutov , 26345@debbugs.gnu.org Message-ID: Subject: Re: bug#26345: 25.1; vc-annotate in Git is unable to fully navigate the history if the file was moved References: <3b0ce616-d7ae-8f63-3ed8-cab1a6feaae2@gmail.com> In-Reply-To: --lDk19aDo5sFlaBsFuPfj2nB7h2an6IiEx Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 10.04.2017 04:30, Dmitry Gutov wrote: > On 03.04.2017 00:46, Wojciech Siewierski wrote: >> >> It seems some vc-git operations override `default-directory' with the >> parent directory of the files they operate on. It's a problem if they = no >> longer exist like in the following scenario. >> >> Preparation steps in shell: >> >> $ git init >> $ mkdir olddir/ >> $ echo oldcontent > olddir/file.txt >> $ git add olddir/ >> $ git commit -m 'Initial commit' >> $ echo newcontent > olddir/file.txt >> $ git add olddir/ >> $ git commit -m 'Modify the file' >> $ git mv olddir/ newdir/ >> $ git commit -m 'Move the file' >> >> Reproduction: >> >> 1. Open newdir/file.txt in Emacs. >> 2. Press `C-x v g' to open `vc-annotate'. >> 3. Press `j' to jump to the revision from before the file was moved. >> 4. Try to move to the next (newer) revision with `n'. The error appear= s >> here. > > Thanks. For the report. I'm including a minor patch below. Does it > improve things considerably for you? > >>> apply: Setting current directory: No such file or directory, >> .../testrepo/olddir/ >> >> It seems in this scenario `vc-annotate' also has trouble with the >> regular navigation (`n' and `p') without the usage of `j' but the erro= r >> message is not as clear. > > The problem of `n' and `p' navigation between revisions where the file > name changed is still present, because of how `vc-git-next-revision' > is written. Suggestions for a better implementation are welcome. > > The patch that fixes the first scenario: > > diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el > index 1a3f1bf..4767cbf 100644 > --- a/lisp/vc/vc-git.el > +++ b/lisp/vc/vc-git.el > @@ -1274,9 +1274,8 @@ vc-git--rev-parse > > (defun vc-git-next-revision (file rev) > "Git-specific version of `vc-next-revision'." > - (let* ((default-directory (file-name-directory > - (expand-file-name file))) > - (file (file-name-nondirectory file)) > + (let* ((default-directory (vc-git-root file)) > + (file (file-relative-name file)) > (current-rev > (with-temp-buffer > (and The error is gone but usability-wise not much has changed: now the vc-annotate buffer contains "fatal: no such path olddir/file.txt in master" after I finish my test scenario. I guess not much more can be done. Thanks! --lDk19aDo5sFlaBsFuPfj2nB7h2an6IiEx-- --lAoj1RGi46uR5C1cvHrJ9RJlQqhJTs8nn Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJY659sAAoJEOWQKlKyR7jeci0H/1erNDHOQUEtrlDDqZaEQwmY e/B3UOnV8en8mXt/sZyF4RWnW8XOv5m+DG8gTAqaBJ2+Y+GvMD35ogUFRqa6Yd24 0XsdvWCMIIo5PMEcbYL5b0spZsHBQOuI+LL2VcIEwnhqDsZ4oG5BSqIJU/W8HIQi U3lzjoQjYPxNDIMZY/bFNIhZw7bdPSrn4QPveswfEshtknOTfv9QVPqo7tKIkfpD 2MALa2ZJJacv+n6j1fd+eraI3FdDHyyW7bIykIDOwJMvV5M8POHd71dcm61Y0b95 YpEePYwRQCN7T2JLR/cEt+Ck0TyOJ5Gyrr1cxoev6nrF3FpBIJMnXbYLDNgucd4= =gVgQ -----END PGP SIGNATURE----- --lAoj1RGi46uR5C1cvHrJ9RJlQqhJTs8nn-- From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: 25.1; vc-annotate in Git is unable to fully navigate the history if the file was moved Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 10 Apr 2017 23:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Wojciech Siewierski , 26345@debbugs.gnu.org Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.149186676423798 (code B ref 26345); Mon, 10 Apr 2017 23:27:02 +0000 Received: (at 26345) by debbugs.gnu.org; 10 Apr 2017 23:26:04 +0000 Received: from localhost ([127.0.0.1]:41690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxihA-0006Bm-L1 for submit@debbugs.gnu.org; Mon, 10 Apr 2017 19:26:04 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:36911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxih8-0006BH-WD for 26345@debbugs.gnu.org; Mon, 10 Apr 2017 19:26:03 -0400 Received: by mail-wm0-f44.google.com with SMTP id u2so48618802wmu.0 for <26345@debbugs.gnu.org>; Mon, 10 Apr 2017 16:26:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=g0/eYs7QTNkW5O1oRerCGkfKr4MuTWJiiBWj79AQKvc=; b=TfjZoPCSVUuhH7+mvFKASP8aW28xxNPuEhmdopqE6keCffBjeJnQRQYh1wrAAEgdnX RZNQ5C9j61cw1HmQftRQ02oWg2JGRhcybUEVEEfbHIu7rOyHoHGJVg7bnDFdSiQWQh7q encUXoGQRukQMOYv5aVB6Ed0ZFdg8CJqsxB6rc+SNywoOpAmOkBFR1K4yHXirVwbHpd1 OSkB5CcnDSXDlXVZK/9MT6GdUyYwaLLz1X5rpQ3SQYBss3tSnrCU1AkcXpEYz6+OKGFW KRTOaUvhfz/q9tOxywghxm1DSSn4X0pUYQf4Jh36Yj32Y9U3kPs80hyII6F0XuSIoxYJ WhWw== 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:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=g0/eYs7QTNkW5O1oRerCGkfKr4MuTWJiiBWj79AQKvc=; b=b2HvFDNDb3w+S1/AWB2hGFv/IBJi5Ai3WWx9PHdIc2pAgk3uqkQXb2r10ozl68rRsL K997l81HU21sbwUIFb2RmrkLFzqBnzvi3YEI+zvf7SfhKTo4nslEaXk4DR+l0eKHBz3v uhHLpn8i/C7rSRcwaoY1vEdpHTafFR3DTNVBQ2V6f2b052U7xDEj38I14HRLdfXpR0J0 RnNZeQsLIU3Na67/YSUj12g6f7lsNiMRyGGqj9TTQNt+8120ASqaAoK0ya/yssK7Nzsx y8Qvf8aVEx9rts+6wn1RvVkzMunAjAr/ClV9OEG3n5kTZ2qsrdY6Xomewv1Wl7y0KlX5 9Jtw== X-Gm-Message-State: AN3rC/4Y8XHIP6sGXx7fsf2S/b03EYe3KC9gx5uIUVhOHu96Fwj4QVkDjK+oEpWycaddQQ== X-Received: by 10.28.63.71 with SMTP id m68mr11840434wma.46.1491866757173; Mon, 10 Apr 2017 16:25:57 -0700 (PDT) Received: from [192.168.1.3] ([185.105.173.156]) by smtp.googlemail.com with ESMTPSA id 92sm19249818wrh.8.2017.04.10.16.25.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Apr 2017 16:25:56 -0700 (PDT) References: <3b0ce616-d7ae-8f63-3ed8-cab1a6feaae2@gmail.com> From: Dmitry Gutov Message-ID: <67612249-a565-4f9f-2248-13a0822b78d3@yandex.ru> Date: Tue, 11 Apr 2017 02:25:55 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.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.2 (/) 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.2 (/) On 10.04.2017 18:06, Wojciech Siewierski wrote: > The error is gone but usability-wise not much has changed: now the > vc-annotate buffer contains "fatal: no such path olddir/file.txt in > master" after I finish my test scenario. Hmm, you're right. It does, however, improve the following scenario: C-x v g, j, p, n I.e. you can move between revisions belonging to the old file name (with the next/previous commands), just not between different file names. > I guess not much more can be done. It probably can, but someone would have to work out the exact sequence of Git commands to do what we want. From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: 25.1; vc-annotate in Git is unable to fully navigate the history if the file was moved Resent-From: Wojciech Siewierski Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Apr 2017 23:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov , 26345@debbugs.gnu.org Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.149221360521618 (code B ref 26345); Fri, 14 Apr 2017 23:47:02 +0000 Received: (at 26345) by debbugs.gnu.org; 14 Apr 2017 23:46:45 +0000 Received: from localhost ([127.0.0.1]:47582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1czAvM-0005cc-R5 for submit@debbugs.gnu.org; Fri, 14 Apr 2017 19:46:45 -0400 Received: from mail-lf0-f48.google.com ([209.85.215.48]:36787) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1czAvK-0005cP-TO for 26345@debbugs.gnu.org; Fri, 14 Apr 2017 19:46:43 -0400 Received: by mail-lf0-f48.google.com with SMTP id s141so46840503lfe.3 for <26345@debbugs.gnu.org>; Fri, 14 Apr 2017 16:46:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to; bh=TZa+E1fg7W6v3okYT8us6y6qPJPFPE/2djCdjRy740M=; b=hIq3bNE1SDVm9uc5HFpgsmS+xvNAKJvwboWdbqXYkj271o0zhSbZtmN0Azt760CX6/ 6CqiUDTDUGdwra/YiyHWiWggUcF+VnUmAo4PKnBUmvTKqd4FJpdfSikyb9vWxjuIcc7D iF6bygizbVmomQCtSz0LsEu5DIirns7J3i4AvdDtvJFyx/qBdDKG0q8Vp3/7WA7rr9Ug /9wNu0+Pi+kYkbn5FPUzm5Tkjaorea+J1XBCL12NaTomOrSqY61NGLyypc5wKTXyEMm3 7MDOV5XK52ixMW6aeKk32DfDClsNXWsy5pwJ2Vh31CyqHwxp6dEF+WQsik9+2MqhT9dh Zd9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to; bh=TZa+E1fg7W6v3okYT8us6y6qPJPFPE/2djCdjRy740M=; b=W1k85hNB+xxLGpuGbUgvjyv+0Mf5D3B8nrk5iEbVLxfBYxmOnbyfrvRXlBWSx4cMG+ SXVBxvy0DHPka3pJML00kq6IcShp38mfZX/JyJNemBWPBIUFGGxmjwRzLE0f12Q/PU6Q sQMp7wIESReklV/9GOFlCxTkpCHPNTnArWrbrdF7hjGnBpCUeK+v2+8RPK4UMn69LGUz /vwqf6crJdEYrKUxZUDy/VCgKiSwEBIcTL/Mf/1Aqm1TlVa5pwUd83sRO1lak4fH2Rtc DI5RDDG2IIra5QqntBphk4omH6RXk6TL58yZcvhLtzqaKdjvqwdeO5wU+cWtlqjsjktJ +M2g== X-Gm-Message-State: AN3rC/5Aty/EPWw4f3mnyEXTcPH9Ijxz5+k+jN8SJB+TmgackGDdBofz 7q1aCx/yhRpeeA== X-Received: by 10.25.104.4 with SMTP id d4mr23181lfc.160.1492213596851; Fri, 14 Apr 2017 16:46:36 -0700 (PDT) Received: from [192.168.1.101] (host-37-190-211-219.dynamic.mm.pl. [37.190.211.219]) by smtp.googlemail.com with ESMTPSA id 31sm656085lja.17.2017.04.14.16.46.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Apr 2017 16:46:36 -0700 (PDT) References: <3b0ce616-d7ae-8f63-3ed8-cab1a6feaae2@gmail.com> <67612249-a565-4f9f-2248-13a0822b78d3@yandex.ru> From: Wojciech Siewierski Message-ID: <6bb801dd-de3f-6769-674f-5f3627484af3@gmail.com> Date: Sat, 15 Apr 2017 01:46:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <67612249-a565-4f9f-2248-13a0822b78d3@yandex.ru> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Nvw5HFaO7m5fQEVlub4CDG5BODV8L5iF6" X-Spam-Score: 0.5 (/) 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 (/) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Nvw5HFaO7m5fQEVlub4CDG5BODV8L5iF6 Content-Type: multipart/mixed; boundary="ObriorD2q8WACllaI8PEbX9E2qubqpvIq"; protected-headers="v1" From: Wojciech Siewierski To: Dmitry Gutov , 26345@debbugs.gnu.org Message-ID: <6bb801dd-de3f-6769-674f-5f3627484af3@gmail.com> Subject: Re: bug#26345: 25.1; vc-annotate in Git is unable to fully navigate the history if the file was moved References: <3b0ce616-d7ae-8f63-3ed8-cab1a6feaae2@gmail.com> <67612249-a565-4f9f-2248-13a0822b78d3@yandex.ru> In-Reply-To: <67612249-a565-4f9f-2248-13a0822b78d3@yandex.ru> --ObriorD2q8WACllaI8PEbX9E2qubqpvIq Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 11.04.2017 01:25, Dmitry Gutov wrote: > On 10.04.2017 18:06, Wojciech Siewierski wrote: > >> The error is gone but usability-wise not much has changed: now the >> vc-annotate buffer contains "fatal: no such path olddir/file.txt in >> master" after I finish my test scenario. > > Hmm, you're right. It does, however, improve the following scenario: > > C-x v g, j, p, n > > I.e. you can move between revisions belonging to the old file name > (with the next/previous commands), just not between different file name= s. > >> I guess not much more can be done. > > It probably can, but someone would have to work out the exact sequence > of Git commands to do what we want. Right, I missed that but you're right. That's definitely a massive improvement. Thanks! --ObriorD2q8WACllaI8PEbX9E2qubqpvIq-- --Nvw5HFaO7m5fQEVlub4CDG5BODV8L5iF6 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJY8V9aAAoJEOWQKlKyR7jeBqgH/2kt4fNKVKkMAfTsxoPFZFWs 41rqHLleCj0ccFoJBZJzxYg4eyzY9wAOoxfc+U0dXrHx366CpEv7+JA+H28WeiCi qeD8kW36DVp5Ft6Q6X91PLgpXikmgPjXwc6Y/Xs/Y0NajFnkqBzw1/n8Kq94rsxW S4JjDfdBSoLkInLuZuODM/e3AwrrqDmB9iyCEKEAJiYJ49WidwZUSTxgZuR5HjSP Xqe/5n11gJFRqXXISyFylYDHzFO7+BNJzCFT4FSW9D5uGYGo0vEQcaT72gYKhcqX iEo8kBMe6bmJlVSv9eoAvhrfh9Mx8okD6xqglj/9nHgWOgWbwlHaplRwKzjjSX8= =nWjg -----END PGP SIGNATURE----- --Nvw5HFaO7m5fQEVlub4CDG5BODV8L5iF6-- From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: 25.1; vc-annotate in Git is unable to fully navigate the history if the file was moved Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 01 May 2017 01:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Wojciech Siewierski , 26345@debbugs.gnu.org Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.14936028734075 (code B ref 26345); Mon, 01 May 2017 01:42:02 +0000 Received: (at 26345) by debbugs.gnu.org; 1 May 2017 01:41:13 +0000 Received: from localhost ([127.0.0.1]:48303 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d50Kv-00013f-J4 for submit@debbugs.gnu.org; Sun, 30 Apr 2017 21:41:13 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:37858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d50Kt-00013P-Tx for 26345@debbugs.gnu.org; Sun, 30 Apr 2017 21:41:12 -0400 Received: by mail-wm0-f48.google.com with SMTP id m123so88676528wma.0 for <26345@debbugs.gnu.org>; Sun, 30 Apr 2017 18:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=R6MSwFMma+xw5fpLSIDw5CLx+j0ZNddztazfqzKoY/g=; b=qqE8x5Kel6xM7tw5x/h6PuTVyZv4CndiwqWsO+Zxxm7/Wyr2RGLklZ2OrsnDjdr8W+ as2g61ZOBaLzMV2DVojT+xKMGkeIEAuoOGrVTVVxpIh56gLyhQxgvwl1VKR1hMo2IkzH 3gt8kdECHrCNbOLusojl5VdTvTpE+TlyISu3O+OPhFtezhxYAIr6jTkr/0InYsazbRiv jB2mdxH0AlTfIFeDj3BgH1VnufI+MewC/bVqKAKnUcQCi+hamDyimurRFujJcm7voip2 cG24gFcarhoRSNZqDZoY1YJkASl+Kl8ugdSEANwaQOyNA2TwpAZrQW0/nKng8SMuNI6c dkSg== 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:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=R6MSwFMma+xw5fpLSIDw5CLx+j0ZNddztazfqzKoY/g=; b=NO4Jn1HhpB2/FPU7KeJYtK8677Zhc7LeQvvH+EfJmo3hybRXis/8WgRD3ctTDqP/73 Bx57rOMpmMKB7PkHOITz6YpClHiQuT2vrl25/OobxBs1Da5kHeare56teAnvGlxq9F0O lWljfZVaga266qvFcZXT8ZPsZHs3g+sdDOc4PFxUX7ZjIXXMuHSgYHjJB+KOGZijZ9SF DIuOBaXzTKmQLbF57iGT/Y/2YfFuZYU8lkggxF+4yaCFnGCH3liCnoXcUjf5UthGybM6 cSL/j5IIIDnMuaKbp7sQdcSUZg0L3tfa3U9glu137cPg+7U17SGdsNodHsU4HGT6BK/4 EMxw== X-Gm-Message-State: AN3rC/537+EPWt8TXFAB1mM+hcUa/EO/3vnDM/XizzMhQmiZilv4go8R JK2r0zjbXYii9+5Oe6M= X-Received: by 10.28.58.21 with SMTP id h21mr27765wma.9.1493602866120; Sun, 30 Apr 2017 18:41:06 -0700 (PDT) Received: from [192.168.1.3] ([185.105.173.156]) by smtp.googlemail.com with ESMTPSA id y63sm13229472wme.31.2017.04.30.18.41.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Apr 2017 18:41:05 -0700 (PDT) References: <3b0ce616-d7ae-8f63-3ed8-cab1a6feaae2@gmail.com> <67612249-a565-4f9f-2248-13a0822b78d3@yandex.ru> <6bb801dd-de3f-6769-674f-5f3627484af3@gmail.com> From: Dmitry Gutov Message-ID: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> Date: Mon, 1 May 2017 04:41:04 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:53.0) Gecko/20100101 Thunderbird/53.0 MIME-Version: 1.0 In-Reply-To: <6bb801dd-de3f-6769-674f-5f3627484af3@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.2 (/) 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.2 (/) On 15.04.2017 2:46, Wojciech Siewierski wrote: >> Hmm, you're right. It does, however, improve the following scenario: >> >> C-x v g, j, p, n >> >> I.e. you can move between revisions belonging to the old file name >> (with the next/previous commands), just not between different file names. > Right, I missed that but you're right. That's definitely a massive > improvement. Thanks! I've pushed that patch now. Keeping this bug open because it doesn't fix the main scenario. For future reference (mine or someone else's): when we reach the end of the revision list for a particular file name, we can call 'git show REV -M' to look for the next file name, a simple example here: https://kparal.wordpress.com/2011/08/03/git-tip-of-the-day-detect-moved-files/. From debbugs-submit-bounces@debbugs.gnu.org Sat May 06 13:00:17 2017 Received: (at control) by debbugs.gnu.org; 6 May 2017 17:00:17 +0000 Received: from localhost ([127.0.0.1]:58465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7345-0006Pf-7G for submit@debbugs.gnu.org; Sat, 06 May 2017 13:00:17 -0400 Received: from mail-io0-f181.google.com ([209.85.223.181]:36435) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7343-0006Iz-GQ for control@debbugs.gnu.org; Sat, 06 May 2017 13:00:15 -0400 Received: by mail-io0-f181.google.com with SMTP id o12so2822813iod.3 for ; Sat, 06 May 2017 10:00:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:mime-version; bh=3XVfmIT6qdKIU7tlSQ4Tqivevp3jXzJ+aO0iiNp9mH4=; b=C9ZAHGZCZnIoFmt1OA0KVMyjSz8gODRSa0UuER0EBUbxmjF5ZHQGoe/uYZifhIywq6 r8jMF3iHq28ES+cQ5aUmoTxME+Cws32lXYfatQMFWs1JqxlmlU6kCJy2v7ZatQyToOMn G9t3DLG2nMXTXstO5qYMRiLJz22BxiUsiNyHDuZv9gbdgC4sRbPeRY9e26libp8TgFFE 1gyUO36S/l8iabgkCmiBKRQBMGvVWv2HO32/UDAjD+YYkxYOvf8hq4ulwfYLTV44twRf gf6W9bv5GSNC79wqTumMKmi/jMGRqmzNsl3YP/yPh36lv381w4TN+P4PapjNd8R0oZbO v6LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :mime-version; bh=3XVfmIT6qdKIU7tlSQ4Tqivevp3jXzJ+aO0iiNp9mH4=; b=i0vv+bl7pk3q2Y3bqVEauudbRb5mOhRpbsh4ls31QUCbU3NLDfGKHjVEQk5shnMoFZ N/m744MmtUUfM7em4arYg2ySbeuHDmQ/bsinKe7KFnloMozyYrqTYEm8aBJnCUEkq4Hs hUg73u1aEOw0pa5ykmTKHaAMFPB+0/jEYm/GRumwllhRednbH4W7LqC/4G1poasHcAnL EjoRoIJngXGPSV8LlTOrRyIT4hEK460Sc/Uar7ll9ZHA5WnETdk0PUpzhsn9/Uql+nH3 q4Ju8s/nvuZIqvX+ZG6vj5dpdiv07cbFpqtOBH5F+ejq4MNB9ucfB8DI5x4/sx/6Vahb SMZQ== X-Gm-Message-State: AN3rC/5OpaN3YAOAGXtbIa5HoJ0GKpczohp/0el7+q1yh+cm5IQ75sYN GGdjjDHIe8ytCczp X-Received: by 10.107.20.73 with SMTP id 70mr22571858iou.210.1494090009857; Sat, 06 May 2017 10:00:09 -0700 (PDT) Received: from zony ([45.2.7.65]) by smtp.googlemail.com with ESMTPSA id z85sm2384613ita.3.2017.05.06.10.00.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 06 May 2017 10:00:09 -0700 (PDT) From: npostavs@users.sourceforge.net To: control@debbugs.gnu.org Subject: control message for bug #26345 Date: Sat, 06 May 2017 13:01:42 -0400 Message-ID: <87mvaply15.fsf@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.1 (--) X-Debbugs-Envelope-To: control 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.1 (--) severity 26345 minor quit From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 14 01:55:13 2025 Received: (at control) by debbugs.gnu.org; 14 Mar 2025 05:55:13 +0000 Received: from localhost ([127.0.0.1]:59600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tsy0n-0001ln-BK for submit@debbugs.gnu.org; Fri, 14 Mar 2025 01:55:13 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:42902) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tsy0k-0001kQ-Nk for control@debbugs.gnu.org; Fri, 14 Mar 2025 01:55:11 -0400 DKIM-Signature: a=rsa-sha256; b=lzM0zshgiQ/VgGkwEIFm5iRf40niKtfecsmo4Z3cQw6Pj0a5Nz4EgYcETQfq8MjiQNwmkXR4DTARUXCnzYscq2ELso2osghDfomTOfH6Bi1DSH5kxo+GsaCfZ2aewJDjuwQwolTPmPtkcdyw9rMmo2j029C0BamFs1bcsrNoHuokHNI0m9DJB6Cxk9W4lLZB4+pgxAv7JaiDCxmPacykHT5yo2/tvAEEC8co5/PPMqlEUz9KHtCtsVj+bxhhMmAzz8KixEFUxmUQAmxAykivTmAnpY/ZYDCJeafQt/pY/1JfrUq6I7eNhQjZntz41CRUtf5sxxybwDuCg9AJDhN9CA==; s=purelymail1; d=spwhitton.name; v=1; bh=CfAqcTN+VyAWIfORqloYTAG49O68zQhX9wdJos2eIdA=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=zCr6qrGyOkgeIR/QcRa34oMBP5MFH5/QJA6rD5PrfweKbGf9tcnuPbHYJIxvEhIYN+wNom/xrvadWebqezBLEQVbT+mDuUUOh7McP47rg7IAwzvEsjTG1qnTwEbRX9GLHoahyG/og4VCgxQxlUXFXnAFW1o2gYKegq6z9rhCk88bDB4dxCUQXsv67B7pnFVdlXneZc7uXBFo2JQfDu16A6N3iTXjFTrzsSZY25CbJbXnInxFzd/k8UWhqhS0YxCoWQINdGSu65tylTJ7kcOd2pUd+wqoql7g2VTLhkjzq/I/aiOiik9w/tD00BzSpOm05kvj/XZqFKVTO3E2Rqf/3Q==; s=purelymail1; d=purelymail.com; v=1; bh=CfAqcTN+VyAWIfORqloYTAG49O68zQhX9wdJos2eIdA=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: control@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 702508397 for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Fri, 14 Mar 2025 05:55:04 +0000 (UTC) Received: by melete.silentflame.com (Postfix, from userid 1000) id 546307EE2C8; Fri, 14 Mar 2025 13:51:48 +0800 (CST) From: Sean Whitton To: control@debbugs.gnu.org Subject: raise severity Date: Fri, 14 Mar 2025 13:51:48 +0800 Message-ID: <87o6y4xiq3.fsf@melete.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control 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 (-) severity 26345 normal thanks -- Sean Whitton From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 30 Jun 2025 20:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: dgutov@yandex.ru Cc: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= , 26345@debbugs.gnu.org, wojciech.siewierski@gmail.com Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.175131555410909 (code B ref 26345); Mon, 30 Jun 2025 20:33:02 +0000 Received: (at 26345) by debbugs.gnu.org; 30 Jun 2025 20:32:34 +0000 Received: from localhost ([127.0.0.1]:49684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uWLB3-0002pj-6X for submit@debbugs.gnu.org; Mon, 30 Jun 2025 16:32:34 -0400 Received: from mail.kubajecminek.cz ([144.91.101.54]:35062) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uWLAx-0002o8-Ue for 26345@debbugs.gnu.org; Mon, 30 Jun 2025 16:32:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; s=202503r; d=kubajecminek.cz; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1751315415; bh=089oqTpp25TR48KuTB/I177 VkrT8UfHev6oEx09czHc=; b=d6dcBsDD+a+4vAKNfDfEuzToiP40Z6+wGcgTLyg1pt8NMMGfKE +NFyC/bMDaVkwWWscYfaKCrahGURr+0/8G7FMdPGVY2Uhc690o/vRswuxje+PoGpE9CTNUZq+Aj tGjUR/Pje34iotRaXuFHMJh5vPE70CjPA4NUO1lWgLUO+cgUAUJvlMazotajYcEyVJbnGZxu9NF wTp7tBKq9NPlf0b9SYw5MvEbin1aFnbEjp8Oe3Lv9fJIIwgG0GtvwRZnzkzO4O4I1SLPqR6CFhv R0QZ2TAPmPNYh0AMH9E5d7NmlrCSuTYa0Qr5HccCm5Dy5Et/3UPhJZmVog3C/7jt7JA==; DKIM-Signature: v=1; a=ed25519-sha256; s=202503e; d=kubajecminek.cz; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1751315415; bh=089oqTpp25TR48KuTB/I177 VkrT8UfHev6oEx09czHc=; b=vP9c1yKpGbvXyE2eE5ZnXGx/1ZNxM43dVG/Pzm6VP46WNhN07i 6QNX17XB0FFR2aHIhPKehB11qG5fRkmonrCQ==; From: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= Date: Mon, 30 Jun 2025 22:29:43 +0200 Message-ID: <20250630202943.13127-1-kuba@kubajecminek.cz> X-Mailer: git-send-email 2.49.0 In-Reply-To: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) 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.8 (/) * lisp/vc/vc-git.el (vc-git-registered,vc-git-annotate-command): Update the FILE argument passed to 'vc-git-annotate-command' based on whether FILE exists in the current revision. If it doesn't, look up its new name. (Bug#26345) --- What do you think about the patch below? lisp/vc/vc-git.el | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index e27798913fe..8f10893d0ba 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -289,12 +289,13 @@ vc-git-update-on-retrieve-tag ;;;###autoload (load "vc-git" nil t) ;;;###autoload (vc-git-registered file)))) -(defun vc-git-registered (file) +(defun vc-git-registered (file &optional rev) "Check whether FILE is registered with git." (let ((dir (vc-git-root file))) (when dir (with-temp-buffer (let* (process-file-side-effects + (rev (or rev "HEAD")) ;; Do not use the `file-name-directory' here: git-ls-files ;; sometimes fails to return the correct status for relative ;; path specs. @@ -306,7 +307,7 @@ vc-git-registered ;; If result is empty, use ls-tree to check for deleted ;; file. (when (eq (point-min) (point-max)) - (vc-git--out-ok "ls-tree" "--name-only" "-z" "HEAD" + (vc-git--out-ok "ls-tree" "--name-only" "-z" rev "--" name)) (buffer-string)))) (and str @@ -1860,7 +1861,12 @@ vc-git-revision-completion-table (defun vc-git-annotate-command (file buf &optional rev) (vc-git--asciify-coding-system) - (let ((name (file-relative-name file))) + ;; If the file does not exist in the tree, it most likely means + ;; that it has been renamed. Bug#26345 + (let* ((file (if (vc-git-registered file rev) + file + (cdr (assoc file (vc-git-file-name-changes rev))))) + (name (file-relative-name file))) (apply #'vc-git-command buf 'async nil "blame" "--date=short" (append (vc-switches 'git 'annotate) (list rev "--" name))))) -- 2.49.0 From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 05 Jul 2025 08:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= , Sean Whitton Cc: kuba@kubajecminek.cz, wojciech.siewierski@gmail.com, 26345@debbugs.gnu.org, dgutov@yandex.ru Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.175170586423796 (code B ref 26345); Sat, 05 Jul 2025 08:58:02 +0000 Received: (at 26345) by debbugs.gnu.org; 5 Jul 2025 08:57:44 +0000 Received: from localhost ([127.0.0.1]:40097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uXyiO-0006Bh-2y for submit@debbugs.gnu.org; Sat, 05 Jul 2025 04:57:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40734) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uXyiM-0006Ad-7W for 26345@debbugs.gnu.org; Sat, 05 Jul 2025 04:57:43 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXyiG-0003QM-4g; Sat, 05 Jul 2025 04:57:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=6udzhfjF6O5yogX6KCswy7Cp4DWDWEQgCr/Y70I1QGo=; b=KeixgDBFTKfqjsC8aBB5 6lUziPiZwUJ3ciIEGejhJouLrCapKKVWgavn4i5L7DuCbliKN/SHKqqDhPayf8of/xSGT/84hKo6D iDdRIUEN77lkV1Xl07uOlg2yVdQBKC/m6jzK4kzgUFJ1dy430x3XhIea4SaLUEbT99i2bbd5nwa6U IMukiESN9NnvM2HngZhN1z1yMgbP3ruXybIJLQWTuBwsqGvqOmcIwW6iCIqHzyU9e516T3eC0Ngkr kHMMfxQcHBbXoZRw+jXoVNRhoSik61JXL74cq1h0Ch58X+/ddxreUifV3AGz/ygqKxamRgtf0U2YX Rmm/RPdMJneN9Q==; Date: Sat, 05 Jul 2025 11:57:33 +0300 Message-Id: <86cyafvwua.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <20250630202943.13127-1-kuba@kubajecminek.cz> (bug-gnu-emacs@gnu.org) References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) 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 (---) > Cc: Jakub Ječmínek , > 26345@debbugs.gnu.org, wojciech.siewierski@gmail.com > Date: Mon, 30 Jun 2025 22:29:43 +0200 > From: Jakub Ječmínek via "Bug reports for GNU Emacs, > the Swiss army knife of text editors" > > * lisp/vc/vc-git.el (vc-git-registered,vc-git-annotate-command): > Update the FILE argument passed to 'vc-git-annotate-command' > based on whether FILE exists in the current revision. If it > doesn't, look up its new name. (Bug#26345) > --- > What do you think about the patch below? Sean, any comments? > lisp/vc/vc-git.el | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el > index e27798913fe..8f10893d0ba 100644 > --- a/lisp/vc/vc-git.el > +++ b/lisp/vc/vc-git.el > @@ -289,12 +289,13 @@ vc-git-update-on-retrieve-tag > ;;;###autoload (load "vc-git" nil t) > ;;;###autoload (vc-git-registered file)))) > > -(defun vc-git-registered (file) > +(defun vc-git-registered (file &optional rev) > "Check whether FILE is registered with git." > (let ((dir (vc-git-root file))) > (when dir > (with-temp-buffer > (let* (process-file-side-effects > + (rev (or rev "HEAD")) > ;; Do not use the `file-name-directory' here: git-ls-files > ;; sometimes fails to return the correct status for relative > ;; path specs. > @@ -306,7 +307,7 @@ vc-git-registered > ;; If result is empty, use ls-tree to check for deleted > ;; file. > (when (eq (point-min) (point-max)) > - (vc-git--out-ok "ls-tree" "--name-only" "-z" "HEAD" > + (vc-git--out-ok "ls-tree" "--name-only" "-z" rev > "--" name)) > (buffer-string)))) > (and str > @@ -1860,7 +1861,12 @@ vc-git-revision-completion-table > > (defun vc-git-annotate-command (file buf &optional rev) > (vc-git--asciify-coding-system) > - (let ((name (file-relative-name file))) > + ;; If the file does not exist in the tree, it most likely means > + ;; that it has been renamed. Bug#26345 > + (let* ((file (if (vc-git-registered file rev) > + file > + (cdr (assoc file (vc-git-file-name-changes rev))))) > + (name (file-relative-name file))) > (apply #'vc-git-command buf 'async nil "blame" "--date=short" > (append (vc-switches 'git 'annotate) > (list rev "--" name))))) > -- > 2.49.0 > > > > > From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 05 Jul 2025 16:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= Cc: dgutov@yandex.ru, 26345@debbugs.gnu.org, Elizabeth Ferdman , wojciech.siewierski@gmail.com Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.17517337367905 (code B ref 26345); Sat, 05 Jul 2025 16:43:02 +0000 Received: (at 26345) by debbugs.gnu.org; 5 Jul 2025 16:42:16 +0000 Received: from localhost ([127.0.0.1]:46553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uY5xv-00023J-NN for submit@debbugs.gnu.org; Sat, 05 Jul 2025 12:42:16 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:45278) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uY5xt-00022c-3N for 26345@debbugs.gnu.org; Sat, 05 Jul 2025 12:42:14 -0400 DKIM-Signature: a=rsa-sha256; b=UQLCrNrdiQbYvYiHIfzqPVJ4XprK0dP6aeTRAv+dMgPraIYBsddRoH7n6O6xlbwecfv1vkkeFuIEdtHZbff/5CbpGniC6YRsvUN0/zVYE6kTQeC3PmjMt90QHHS9WAMWr2orGUUN9e06r+jv0fGD+iOgv5KIQFKBRIxFTg3PwK5FnauGHTpaEApoQjp1iV51udJRePsyQimZtpPODUk/Nq57/iqWFAcHhDizpkWwDa9GUkOyww6badmo55TAVOmLn6to0Q295YPqPeeiqxswJ9M7rhRPHTLLUF83ewD+Pe79X45ck7XRVgmA6RgBF8Ruu+ebGybjMDgIXc32S8wZRw==; s=purelymail2; d=spwhitton.name; v=1; bh=v4iCmyoank2DzZ8tAUUWEQgLxAiYdUcQZ8rErOTh3iQ=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=w4P7BCsPC8znks4ijbL88pdUcFzd5G3ntCBuXIwJG2e1YqXKW9uikNhs7V4z0cur9x4ug9iIZ2Xme5J0rQX9+LU8aU7FWB03lv2cEQ6/Ph42W7yKe5nUJl6c4/kfrZNSt+1w8kOfrApe41RswdijEmywX5tdXsqZv3CuUvSCln2i9MF0INkdfo+rbX6rOHazT0za1ZLDaRUxgCiulTJm0o+2csks02Jqqq6/TaoJRuj939tiKkg4AXeH+yAPHZno/vIeX9t0i1i07HAQ97VF8BNeItEU8N/oOXGpmHDlcs7bu5AMYaZMDuXSuIAYNf3Si5V5P1RKZGugM8piABrrUw==; s=purelymail2; d=purelymail.com; v=1; bh=v4iCmyoank2DzZ8tAUUWEQgLxAiYdUcQZ8rErOTh3iQ=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 26345@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1621680925; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sat, 05 Jul 2025 16:42:05 +0000 (UTC) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id CB7F2940819; Sat, 05 Jul 2025 17:42:04 +0100 (BST) From: Sean Whitton In-Reply-To: <20250630202943.13127-1-kuba@kubajecminek.cz> References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> Date: Sat, 05 Jul 2025 17:42:04 +0100 Message-ID: <87cyaeoahv.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.2 (/) 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.8 (/) Hello, On Mon 30 Jun 2025 at 10:29pm +02, Jakub Je=C4=8Dm=C3=ADnek via "Bug report= s for GNU Emacs, the Swiss army knife of text editors" wrote: > * lisp/vc/vc-git.el (vc-git-registered,vc-git-annotate-command): > Update the FILE argument passed to 'vc-git-annotate-command' > based on whether FILE exists in the current revision. If it > doesn't, look up its new name. (Bug#26345) > --- > What do you think about the patch below? Thanks for posting this. We can't add an optional argument to vc-git-registered directly because that's the vc-git implementation for the `registered' backend function, so its lambda list is fixed by the API. You could get around this by making vc-git-registered a tiny wrapper around a function vc-git--registered which has all the existing code plus the optional argument. But is the call to vc-git-registered needed at all? Why not just look at the file name changes list immediately, and if the file does not appear there, assume that the original file name is valid? And maybe then this could happen up in vc-annotate instead of being Git-specific. It's kind of a heuristic anyway. --=20 Sean Whitton From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 06 Jul 2025 02:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Sean Whitton , Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= Cc: 26345@debbugs.gnu.org, Elizabeth Ferdman , wojciech.siewierski@gmail.com Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.175176792626481 (code B ref 26345); Sun, 06 Jul 2025 02:13:03 +0000 Received: (at 26345) by debbugs.gnu.org; 6 Jul 2025 02:12:06 +0000 Received: from localhost ([127.0.0.1]:48921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uYErL-0006sS-QT for submit@debbugs.gnu.org; Sat, 05 Jul 2025 22:12:05 -0400 Received: from forward501d.mail.yandex.net ([2a02:6b8:c41:1300:1:45:d181:d501]:55418) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uYErI-0006qF-1Y for 26345@debbugs.gnu.org; Sat, 05 Jul 2025 22:12:01 -0400 Received: from mail-nwsmtp-smtp-production-main-76.iva.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-76.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:bc97:0:640:ee90:0]) by forward501d.mail.yandex.net (Yandex) with ESMTPS id 521F461C7F; Sun, 6 Jul 2025 05:11:51 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-76.iva.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id lBU0cm8MN8c0-G4vSrgvs; Sun, 06 Jul 2025 05:11:50 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1751767910; bh=uXVZWb5SAxaNhlmSW3Gbb+oWvbuVu5NfFyLoQBmVJlg=; h=In-Reply-To:From:Subject:Message-ID:Cc:References:Date:To; b=Jm1btQDMocHRq/BJSUUyqsL1IzekpsPPuuIrzil4sJT7XcVdbEeDzXbVVw9fTzofl pf+af9AVk6gYqMCyB9wVYwnq6u7kVpZpX8icLoho/Ly5tz41WIGFNZjkaZezclwPFX NAw5p4MGamWsfXt+2BvoICt8TJYLCDtHduAi+1Tk= Authentication-Results: mail-nwsmtp-smtp-production-main-76.iva.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfauth.phl.internal (Postfix) with ESMTP id 77338F40066; Sat, 5 Jul 2025 22:11:47 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Sat, 05 Jul 2025 22:11:47 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddvjeeikecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefkffggfgfuvfevfhfhjggtgfesthejredttddvjeenucfhrhhomhepffhmihhtrhih ucfiuhhtohhvuceoughguhhtohhvseihrghnuggvgidrrhhuqeenucggtffrrghtthgvrh hnpeeihfejueevteffffdvfeetffffkefhuedujeeiheehiedulefghefgffefudffuden ucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegughhuth hovhdomhgvshhmthhprghuthhhphgvrhhsohhnrghlihhthidqudeffeefleelheehvddq vdelgeejjeejjeeiqdgughhuthhovheppeihrghnuggvgidrrhhusehfrghsthhmrghilh drtghomhdpnhgspghrtghpthhtohephedpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepshhpfihhihhtthhonhesshhpfihhihhtthhonhdrnhgrmhgvpdhrtghpthhtohepkh husggrsehkuhgsrghjvggtmhhinhgvkhdrtgiipdhrtghpthhtohepvdeifeegheesuggv sggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehgnhhuuggvvhhlihiisehgmhgrih hlrdgtohhmpdhrtghpthhtohepfihojhgtihgvtghhrdhsihgvfihivghrshhkihesghhm rghilhdrtghomh X-ME-Proxy: Feedback-ID: ib1d9465d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 5 Jul 2025 22:11:45 -0400 (EDT) Message-ID: <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> Date: Sun, 6 Jul 2025 05:11:44 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> <87cyaeoahv.fsf@zephyr.silentflame.com> Content-Language: en-US From: Dmitry Gutov In-Reply-To: <87cyaeoahv.fsf@zephyr.silentflame.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) 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.7 (-) On 05/07/2025 19:42, Sean Whitton wrote: > But is the call to vc-git-registered needed at all? Why not just look > at the file name changes list immediately, and if the file does not > appear there, assume that the original file name is valid? I think (?) the file name might have changed in some later revision - so it won't be returned by vc-git-file-name-changes for that specific REV, but still might not match the current name. From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Jakub =?utf-8?B?SmXEjW3DrW5law==?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 06 Jul 2025 21:10:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov , Sean Whitton Cc: Eli Zaretskii , 26345@debbugs.gnu.org, wojciech.siewierski@gmail.com Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.175183617126613 (code B ref 26345); Sun, 06 Jul 2025 21:10:05 +0000 Received: (at 26345) by debbugs.gnu.org; 6 Jul 2025 21:09:31 +0000 Received: from localhost ([127.0.0.1]:59207 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uYWc6-0006v6-UK for submit@debbugs.gnu.org; Sun, 06 Jul 2025 17:09:31 -0400 Received: from mail.kubajecminek.cz ([144.91.101.54]:40526) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uYWc4-0006tz-3S for 26345@debbugs.gnu.org; Sun, 06 Jul 2025 17:09:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; s=202503r; d=kubajecminek.cz; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1751835835; bh=47DEQpj8HBSa+/TImW+5JCe uQeRkm5NMpJWZG3hSuFU=; b=KT3a+g4ZmBz2xjaGDbyCuOiq6uua+qzD1VMDRQkVa8YHk1xXu4 Ho+Cm0xRtxdXjVhtxk6ohIaRFTpBJ4E6ZmOayidEuhux8pVy5lS427MHO3+G2rJ2tY60mzDuWxu c5y8b7QDkRD3SDI3Hy1UxZnQe/eNmNhdICq4Tr62m1+14bKPkDa2+hPm/qZXd6ss9mGQIai42Ea r+Lcr25RPL/PQ38qUL6BzsYTFW+ewHbGd6OieGxUH/Z5cH+AsgpZUolFYSmcoiBHbarFRlSqffV WJv48yl+ssckqeOa2bgeNpT5lI8pP7gTwiekolyXnLI6XBecJNwFIFI1rLSVoMTt+eA==; DKIM-Signature: v=1; a=ed25519-sha256; s=202503e; d=kubajecminek.cz; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1751835835; bh=47DEQpj8HBSa+/TImW+5JCe uQeRkm5NMpJWZG3hSuFU=; b=nIbr4wdBD/VUbLML/MzJDgie5TVrnv9H74oXsO7CYauDbiA/M+ Y0kRQeqW1lO/7x19GYALvT78bc6r99Ik6jBQ==; From: Jakub =?utf-8?B?SmXEjW3DrW5law==?= In-Reply-To: <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> Date: Sun, 06 Jul 2025 22:55:19 +0200 Message-ID: References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> <87cyaeoahv.fsf@zephyr.silentflame.com> <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> X-Notmuch-Emacs-Draft: True MIME-Version: 1.0 Content-Type: text/plain Sean Whitton writes: > But is the call to vc-git-registered needed at all? Why not just look > at the file name changes list immediately, and if the file does not > appear there, assume that the original file name is valid? I think you're right, looking at `vc-*-file-name-changes' should be enough. > And maybe then this could happen up in vc-annotate instead of being > Git-specific. It's kind of a heuristic anyway. The problem occurs when we call `vc-annotate-next-revision', which in turn calls `vc-annotate-warp-revision'. I can make the change there, but I'm not familiar with any VCS other than Git, so I can't test it. Dmitry Gutov writes: > On 05/07/2025 19:42, Sean Whitton wrote: > I think (?) the file name might have changed in some later revision - so > it won't be returned by vc-git-file-name-changes for that specific REV, > but still might not match the current name. I'm not sure. X-Spam-Score: 0.0 (/) 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 (-) From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 06 Jul 2025 21:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov , Sean Whitton Cc: eliz@gnu.org, 26345@debbugs.gnu.org, wojciech.siewierski@gmail.com Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.17518375509315 (code B ref 26345); Sun, 06 Jul 2025 21:33:03 +0000 Received: (at 26345) by debbugs.gnu.org; 6 Jul 2025 21:32:30 +0000 Received: from localhost ([127.0.0.1]:59272 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uYWyK-0002Q5-Pm for submit@debbugs.gnu.org; Sun, 06 Jul 2025 17:32:29 -0400 Received: from mail.kubajecminek.cz ([144.91.101.54]:49800) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uYWyH-0002PD-Bx for 26345@debbugs.gnu.org; Sun, 06 Jul 2025 17:32:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; s=202503r; d=kubajecminek.cz; c=relaxed/relaxed; h=From:To:Subject:Date:Message-ID; t=1751837414; bh=Sjw4VIxUG35C0ml4FaJ2sTW Q5uGGmK2yvp9Xh1ogyAc=; b=NrdeW+cGQKvRoDeeQYUXoEH7Q3B9vwEUerEN0g0fcYhEe0JWkw ziqVpyjl3cZQXJDunCUatLL7hHWnH+szIGUiGUUHKG2NXkuxYLiZxCG2kJYf4NqfuO7OoRGEha/ DEt2i+2AJQo6210jtZlJfg4KpIo3kOB0pcl+ML741Tv/1bQapy/v6iRG9ulp268QuwYaaZZoFwo HgCnFib+oWFfbDXKIJYSQWu/M6aYasf6D+ofmvuYvwrUjnV9gOtBVIkRlunJIdGw7Gi7vmtqxNu l9z/x5cdbbH+i1uu2LrbmOIOCZ1+PRrMmXU0WSrbk0Y9+JxAY0c+pwIGWytbaKnCtUg==; DKIM-Signature: v=1; a=ed25519-sha256; s=202503e; d=kubajecminek.cz; c=relaxed/relaxed; h=From:To:Subject:Date:Message-ID; t=1751837414; bh=Sjw4VIxUG35C0ml4FaJ2sTW Q5uGGmK2yvp9Xh1ogyAc=; b=X9fEzqznHczDLNAlw0v4U3XGyyNxpzuulq+AtRQvtX1F2ITSLo PX8bSXaEVvmGj6irRVRNSs3Bu9ZOwlS6lBBg==; Message-ID: <14b81359-223e-4f03-9c5d-1711c98b8b2b@kubajecminek.cz> Date: Sun, 6 Jul 2025 23:30:11 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> <87cyaeoahv.fsf@zephyr.silentflame.com> <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> Content-Language: en-US From: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= In-Reply-To: <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) 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 (-) I'm sending the e-mail again, I think my previous message was malformed. Sean Whitton writes: > But is the call to vc-git-registered needed at all? Why not just look > at the file name changes list immediately, and if the file does not > appear there, assume that the original file name is valid? I think you're right, looking at `vc-*-file-name-changes' should be enough. > And maybe then this could happen up in vc-annotate instead of being > Git-specific. It's kind of a heuristic anyway. The problem occurs when we call `vc-annotate-next-revision', which in turn calls `vc-annotate-warp-revision'. I can make the change there, but I'm not familiar with any VCS other than Git, so I can't test it. Dmitry Gutov writes: > On 05/07/2025 19:42, Sean Whitton wrote: > I think (?) the file name might have changed in some later revision - so > it won't be returned by vc-git-file-name-changes for that specific REV, > but still might not match the current name. I'm not sure. From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 07 Jul 2025 08:35:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov Cc: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= , eliz@gnu.org, 26345@debbugs.gnu.org, wojciech.siewierski@gmail.com Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.17518772803378 (code B ref 26345); Mon, 07 Jul 2025 08:35:05 +0000 Received: (at 26345) by debbugs.gnu.org; 7 Jul 2025 08:34:40 +0000 Received: from localhost ([127.0.0.1]:32796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uYhJ9-0000sP-F6 for submit@debbugs.gnu.org; Mon, 07 Jul 2025 04:34:39 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:33464) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uYhJ7-0000rh-5g for 26345@debbugs.gnu.org; Mon, 07 Jul 2025 04:34:37 -0400 DKIM-Signature: a=rsa-sha256; b=QHv2qsjO0Eb/In+SQNlNgkWGjfNbaulvDiPU4QwTf2Ai5U+3HOhwcyTP7ZnEyqIh4uKjgcLFHycuXRvTAsRx8AWDWJ6juzTIoEfjrABxOg9QOdn64YZWqGG25+UCrs7MbimZCKrUIx0RCp7O2zYv/kBhBVWzXQuFYg50b6IdW5MiDIEc4DB9SZqyvi4grQDyivtcR/zaD2J+U1aYheLzn7PzuIpKhelvwZthPvGnAl01DJJsJDFCMt4Pz14mi9pAp3KT72LeZfbrBWvuRBN/Gbij7I+ZJvnDLMTwJ6vv6XVhOEQRq8ahIc6/bnrsE8YICgfiByDyy9/EAoMvBSvUkA==; s=purelymail2; d=spwhitton.name; v=1; bh=9Eh/87AY4BAXKJ1M9V2AklLVGqWxc8RT2+2C6zAibFQ=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=VNyGS+IDptfe6UzaeLfMs+NM90wcZMZoMF32GUbRvzIp/EHeZWFTWZJbJOPZ1Syof+UamQUan/EdRMdGLg/Foprz6julyJEEzMA4bKBePGpga67TqJqROha1vk6sTzI68y78Hz9cUUyuIEcf/K3IfrplupjhFrV1znaydg5vg7tfxSUN8ZQILj98K6sFgC1Vpg4OfUh5J4mMF8zBact+gtid2awNgXe/G3U5ZVY0xf8Mx7bOvPMNfT8m+D3wOvG5SyHuTNZBs6z2zax2SizycqYh82o1OIPMT1YmwIv/5jFFaHHOzMATKwMKjYxC3P/ncwMp+X3aLOT43rf/uPR/fQ==; s=purelymail2; d=purelymail.com; v=1; bh=9Eh/87AY4BAXKJ1M9V2AklLVGqWxc8RT2+2C6zAibFQ=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 26345@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1355163843; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Mon, 07 Jul 2025 08:34:30 +0000 (UTC) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id 3B92D940228; Mon, 07 Jul 2025 09:34:30 +0100 (BST) From: Sean Whitton In-Reply-To: <14b81359-223e-4f03-9c5d-1711c98b8b2b@kubajecminek.cz> References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> <87cyaeoahv.fsf@zephyr.silentflame.com> <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> <14b81359-223e-4f03-9c5d-1711c98b8b2b@kubajecminek.cz> Date: Mon, 07 Jul 2025 09:34:30 +0100 Message-ID: <87h5zol7qh.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.0 (-) 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.0 (--) Hello, On Sun 06 Jul 2025 at 11:30pm +02, Jakub Je=C4=8Dm=C3=ADnek via "Bug report= s for GNU Emacs, the Swiss army knife of text editors" wrote: > Sean Whitton writes: > >> And maybe then this could happen up in vc-annotate instead of being >> Git-specific. It's kind of a heuristic anyway. > > The problem occurs when we call `vc-annotate-next-revision', which in > turn calls `vc-annotate-warp-revision'. I can make the change there, but > I'm not familiar with any VCS other than Git, so I can't test it. That's okay, I think the only thing is to check that the backend implements file-name-changes using vc-find-backend-function. Then so long as the general approach makes sense and works for Git it's fine. > Dmitry Gutov writes: > >> On 05/07/2025 19:42, Sean Whitton wrote: >> I think (?) the file name might have changed in some later revision - so >> it won't be returned by vc-git-file-name-changes for that specific REV, >> but still might not match the current name. > > I'm not sure. Seems like this needs to be investigated before we can proceed. --=20 Sean Whitton From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 07 Jul 2025 21:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Sean Whitton , Dmitry Gutov Cc: 26345@debbugs.gnu.org, wojciech.siewierski@gmail.com Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.175192269726676 (code B ref 26345); Mon, 07 Jul 2025 21:12:01 +0000 Received: (at 26345) by debbugs.gnu.org; 7 Jul 2025 21:11:37 +0000 Received: from localhost ([127.0.0.1]:38349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uYt7g-0006wC-Og for submit@debbugs.gnu.org; Mon, 07 Jul 2025 17:11:37 -0400 Received: from mail.kubajecminek.cz ([144.91.101.54]:33842) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uYt7d-0006vy-9j for 26345@debbugs.gnu.org; Mon, 07 Jul 2025 17:11:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; s=202503r; d=kubajecminek.cz; c=relaxed/relaxed; h=From:To:Subject:Date:Message-ID; t=1751922560; bh=bBEJJmYtBV01njhkRSiZlfe g48p//d4JYKt/c/f8ERU=; b=Fc5ftBtxo72iLMBnP4hq3AEKGnVI7Uc7ifVuExQWOpY+wO9Qe/ pBpxpKLm7Rr0SAIzzK8a8ceRsIB8078zC3aoy9vz/+08/UH+xKYYuoxvdXLjkblQ7O+2BVTt7jv 5x/DOuGHh7symkr47TTlLpbm9NMIKngdxCXz/+sEXB0O3BHufIuUmWGofM1dG/1bcWsNBUug/tQ vV+R3nqIY0o0nM7p2qEwFHEyEQK2c+jvRXZh1dQMFW8v484/PRru/CgVys7neQ4zzVkKncD/EGH e1BK+ZLhDrZ1vG8BQkmK4BMT+OdWGj6Z9upQxF9mrE363k+K/uA1USSrrdBMBAaLhjg==; DKIM-Signature: v=1; a=ed25519-sha256; s=202503e; d=kubajecminek.cz; c=relaxed/relaxed; h=From:To:Subject:Date:Message-ID; t=1751922560; bh=bBEJJmYtBV01njhkRSiZlfe g48p//d4JYKt/c/f8ERU=; b=fNOs88rX0uhGhuc8iCPJjUXGZe9aEAilUqrnl+nTbjrUg+gcyn CuelLs4CNXtJBRx9XSR+9MXXmx+Bijdl5EBw==; Content-Type: multipart/mixed; boundary="------------SVZIjhouhUiOLxS1qXX24vr0" Message-ID: <042b052b-9b3f-463b-aebe-8848f52b38f4@kubajecminek.cz> Date: Mon, 7 Jul 2025 23:09:18 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> <87cyaeoahv.fsf@zephyr.silentflame.com> <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> <14b81359-223e-4f03-9c5d-1711c98b8b2b@kubajecminek.cz> <87h5zol7qh.fsf@zephyr.silentflame.com> Content-Language: en-US From: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= In-Reply-To: <87h5zol7qh.fsf@zephyr.silentflame.com> X-Spam-Score: 0.0 (/) 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 (-) This is a multi-part message in MIME format. --------------SVZIjhouhUiOLxS1qXX24vr0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 7/7/25 10:34, Sean Whitton wrote: > That's okay, I think the only thing is to check that the backend > implements file-name-changes using vc-find-backend-function. Then so > long as the general approach makes sense and works for Git it's fine. I've updated the patch based on your suggestions. You're right, `vc-annotate' is indeed a better place for this change. >> Dmitry Gutov writes: >> >>> On 05/07/2025 19:42, Sean Whitton wrote: >>> I think (?) the file name might have changed in some later revision - so >>> it won't be returned by vc-git-file-name-changes for that specific REV, >>> but still might not match the current name. >> >> I'm not sure. > > Seems like this needs to be investigated before we can proceed. I've tested various scenarios and haven't encountered any issues with the current implementation. It would be great if you could test the change as well, in case there are edge cases I missed. --------------SVZIjhouhUiOLxS1qXX24vr0 Content-Type: text/x-patch; charset=UTF-8; name="0001-Handle-renamed-files-when-cycling-through-revisions.patch" Content-Disposition: attachment; filename*0="0001-Handle-renamed-files-when-cycling-through-revisions.pat"; filename*1="ch" Content-Transfer-Encoding: base64 RnJvbSA1YzQxMDhhMGMyNDNkNTRjOGQyNDQwZWIxYmNhMDZmYTU3ZmFlMzJlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/SmFrdWI9MjBKZT1DND04RG09QzM9 QURuZWs/PSA8a3ViYUBrdWJhamVjbWluZWsuY3o+CkRhdGU6IE1vbiwgNyBKdWwgMjAyNSAy MjozMjo1NyArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIEhhbmRsZSByZW5hbWVkIGZpbGVzIHdo ZW4gY3ljbGluZyB0aHJvdWdoIHJldmlzaW9ucwoKKiBsaXNwL3ZjL3ZjLWFubm90YXRlLmVs ICh2Yy1hbm5vdGF0ZSwgdmMtYW5ub3RhdGUtLWZpbGUtbmFtZS1jaGFuZ2UpOgpVcGRhdGUg dGhlIEZJTEUgYXJndW1lbnQgcGFzc2VkIHRvIGBhbm5vdGF0ZS1jb21tYW5kJyBiYXNlZCBv bgpwb3NzaWJsZSBmaWxlIG5hbWUgY2hhbmdlcyBpbiB0aGUgc3BlY2lmaWVkIHJldmlzaW9u IHVzaW5nIHRoZQpuZXcgZnVuY3Rpb24gYHZjLWFubm90YXRlLS1maWxlLW5hbWUtY2hhbmdl Jy4KLS0tCiBsaXNwL3ZjL3ZjLWFubm90YXRlLmVsIHwgMTEgKysrKysrKysrKy0KIDEgZmls ZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0 IGEvbGlzcC92Yy92Yy1hbm5vdGF0ZS5lbCBiL2xpc3AvdmMvdmMtYW5ub3RhdGUuZWwKaW5k ZXggZTY4YzVhNzk5MTkuLjg4Mjk4OTRkZWNmIDEwMDY0NAotLS0gYS9saXNwL3ZjL3ZjLWFu bm90YXRlLmVsCisrKyBiL2xpc3AvdmMvdmMtYW5ub3RhdGUuZWwKQEAgLTQ1OSw3ICs0NTks OCBAQCB2Yy1hbm5vdGF0ZQogICAgICAgICAgICAgKHNldHEgY29kaW5nLXN5c3RlbS1mb3It cmVhZAogICAgICAgICAgICAgICAgICAgKGNvZGluZy1zeXN0ZW0tY2hhbmdlLWVvbC1jb252 ZXJzaW9uIGNvZGluZy1zeXN0ZW0tZm9yLXJlYWQKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnZG9zKSkpCi0gICAgICAgICh2Yy1j YWxsLWJhY2tlbmQgYmFja2VuZCAnYW5ub3RhdGUtY29tbWFuZCBmaWxlCisgICAgICAgICh2 Yy1jYWxsLWJhY2tlbmQgYmFja2VuZCAnYW5ub3RhdGUtY29tbWFuZAorICAgICAgICAgICAg ICAgICAgICAgICAgICh2Yy1hbm5vdGF0ZS0tZmlsZS1uYW1lLWNoYW5nZSBmaWxlIHJldiBi YWNrZW5kKQogICAgICAgICAgICAgICAgICAgICAgICAgIChnZXQtYnVmZmVyIHRlbXAtYnVm ZmVyLW5hbWUpIHJldikKICAgICAgICAgOzsgd2UgbXVzdCBzZXR1cCB0aGUgbW9kZSBmaXJz dCwgYW5kIHRoZW4gc2V0IG91ciBsb2NhbAogICAgICAgICA7OyB2YXJpYWJsZXMgYmVmb3Jl IHRoZSBzaG93LWZ1bmN0aW9uIGlzIGNhbGxlZCBhdCB0aGUgZXhpdCBvZgpAQCAtODA0LDYg KzgwNSwxNCBAQCB2Yy1hbm5vdGF0ZS1nb3RvLWxpbmUKICAgICAgIChtZXNzYWdlICJBbm5v dGF0aW9ucyB3ZXJlIGZvciByZXZpc2lvbiAlczsgbGluZSBudW1iZXJzIG1heSBiZSBpbmNv cnJlY3QiCiAJICAgICAgIHJldikpKSkpCiAKKyhkZWZ1biB2Yy1hbm5vdGF0ZS0tZmlsZS1u YW1lLWNoYW5nZSAoZmlsZSByZXYgYmFja2VuZCkKKyAgIlJldHVybiB0aGUgbmFtZSBvZiBG SUxFIGF0IHJldmlzaW9uIFJFViB1c2luZyBCQUNLRU5ELgorSWYgdGhlIGZpbGUgbmFtZSBo YXMgY2hhbmdlZCBpbiB0aGUgZ2l2ZW4gcmV2aXNpb24sIHJldHVybiB0aGUgbmV3IG5hbWU7 CitvdGhlcndpc2UsIHJldHVybiBGSUxFIHVuY2hhbmdlZC4iCisgIChpZiAodmMtZmluZC1i YWNrZW5kLWZ1bmN0aW9uIGJhY2tlbmQgJ2ZpbGUtbmFtZS1jaGFuZ2VzKQorICAgICAgKG9y IChjZHIgKGFzc29jIGZpbGUgKHZjLWNhbGwtYmFja2VuZCBiYWNrZW5kICdmaWxlLW5hbWUt Y2hhbmdlcyByZXYpKSkgZmlsZSkKKyAgICBmaWxlKSkKKwogKHByb3ZpZGUgJ3ZjLWFubm90 YXRlKQogCiA7OzsgdmMtYW5ub3RhdGUuZWwgZW5kcyBoZXJlCi0tIAoyLjQ5LjAKCg== --------------SVZIjhouhUiOLxS1qXX24vr0-- From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 08 Jul 2025 16:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov , Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= , 26345@debbugs.gnu.org, wojciech.siewierski@gmail.com Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.175199260014081 (code B ref 26345); Tue, 08 Jul 2025 16:37:02 +0000 Received: (at 26345) by debbugs.gnu.org; 8 Jul 2025 16:36:40 +0000 Received: from localhost ([127.0.0.1]:44198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uZBJ9-0003ez-95 for submit@debbugs.gnu.org; Tue, 08 Jul 2025 12:36:40 -0400 Received: from [34.202.193.197] (port=38958 helo=sendmail.purelymail.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uZ5bC-0005WK-HB for 26345@debbugs.gnu.org; Tue, 08 Jul 2025 06:31:21 -0400 DKIM-Signature: a=rsa-sha256; b=CiK0eJ3opftvrXw3y+wijvMVWKCTCBmFK0LbP7s85w+brSCocmIWF0z2CC2Mho2t6WvRHCZJNz0z1yW8WVDzYCcAmTSMorZhG0mPjdT+baF79UJWnZIbwWTZs12UcDVXNK+bOcEYV7v6T0OPLsfY3afd9G8wawYNO0XYPpsdCicbY1tBXhKQm7eK9KIA9djS9gNnD+jx3h0st7bAQy44nYVdi4caPBnT02Z2i12ymjSFjHKxdT01/HsHsJjCVZIXqGS5/M69t3sh/OLpoQFK7dNbJPNSFaQw+R98iyU57oFp+xQRdjoHeXxw5WL+BgjSwQWHXieXN2lnuxOnhpW8tA==; s=purelymail2; d=spwhitton.name; v=1; bh=HlIWAPCApOO/G4HysJvBn7v3pE3YL7sOej5/WdFOSJM=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=tSBz7q8oGLfFQW5GlGkvB36wLe7Ae+9zF1FqyjROf2USwU9FdUCNfYuyOARckYFp0WJyrTnF9FVz3iwWrJh6WMUpE6qS+HnwhWW073Jr1sBNdzOgh1zyW2ieiOV5pnL3vYqIb1pljs5kM+CxwKMqG3x8vCPO4cOlbAL8+IFj/CvShW/gtnrTNW9VWd6NhnPPDhON5GDcUiWUVM/kte/m/pVvbh3ffU/9mfA4/+KNgM9nEBqRwa5GVfHw7aN6lfPIbe4Ox8v7aWKoWwxeT566x/VO25uEW4WsbiQim7UkVF5B2OLe0tsA8Q1rsr/UnT1+eRBpWugvlwaWGw8HuEoNMA==; s=purelymail2; d=purelymail.com; v=1; bh=HlIWAPCApOO/G4HysJvBn7v3pE3YL7sOej5/WdFOSJM=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 26345@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 711300376; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Tue, 08 Jul 2025 10:30:41 +0000 (UTC) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id 45E8694058B; Tue, 08 Jul 2025 11:30:40 +0100 (BST) From: Sean Whitton In-Reply-To: <042b052b-9b3f-463b-aebe-8848f52b38f4@kubajecminek.cz> References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> <87cyaeoahv.fsf@zephyr.silentflame.com> <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> <14b81359-223e-4f03-9c5d-1711c98b8b2b@kubajecminek.cz> <87h5zol7qh.fsf@zephyr.silentflame.com> <042b052b-9b3f-463b-aebe-8848f52b38f4@kubajecminek.cz> Date: Tue, 08 Jul 2025 11:30:40 +0100 Message-ID: <87frf7ht4f.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.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 the administrator of that system for details. Content preview: Hello, On Mon 07 Jul 2025 at 11:09pm +02, Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= via "Bug reports for GNU Emacs, the Swiss army knife of text editors" wrote: > On 7/7/25 10:34, Sean Whitton wrote: >> That's okay, I think the only thing is to check that the backend >> implements file-name-changes using vc-find-backend-function. Then so >> long as the genera [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 T_SPF_TEMPERROR SPF: test of record failed (temperror) 0.0 T_SPF_HELO_TEMPERROR SPF: test of HELO record failed (temperror) 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS 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.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, On Mon 07 Jul 2025 at 11:09pm +02, Jakub Je=C4=8Dm=C3=ADnek via "Bug report= s for GNU Emacs, the Swiss army knife of text editors" wrote: > On 7/7/25 10:34, Sean Whitton wrote: >> That's okay, I think the only thing is to check that the backend >> implements file-name-changes using vc-find-backend-function. Then so >> long as the general approach makes sense and works for Git it's fine. > > I've updated the patch based on your suggestions. You're right, `vc-annot= ate' > is indeed a better place for this change. Jakub, I'm attaching a version of your patch with a rewritten commit message to more closely match our conventions, and to avoid overlong lines of code. Please take a look. >>> Dmitry Gutov writes: >>> >>>> On 05/07/2025 19:42, Sean Whitton wrote: >>>> I think (?) the file name might have changed in some later revision - = so >>>> it won't be returned by vc-git-file-name-changes for that specific REV, >>>> but still might not match the current name. >>> >>> I'm not sure. >> Seems like this needs to be investigated before we can proceed. > I've tested various scenarios and haven't encountered any issues with the > current implementation. It would be great if you could test the change as > well, in case there are edge cases I missed. I think that we need to see an argument in terms of the definition of the file-name-changes backend function that demonstrates that your approach will always work: ;; Return the list of pairs with changes in file names in REV. When ;; a file was added, it should be a cons with nil car. When ;; deleted, a cons with nil cdr. When copied or renamed, a cons ;; with the source name as car and destination name as cdr. --=20 Sean Whitton --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-vc-annotate-Handle-renamed-files-when-changing-revis.patch >From 4a4110b2ed540f3f6c58c3d8a52d965891c8523e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Je=C4=8Dm=C3=ADnek?= Date: Mon, 7 Jul 2025 22:32:57 +0200 Subject: [PATCH] vc-annotate: Handle renamed files when changing revision * lisp/vc/vc-annotate.el (vc-annotate--file-name-change): New function. (vc-annotate): Call it on the FILE argument to the 'annotate-command' backend function (bug#26345). --- lisp/vc/vc-annotate.el | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el index 4f72faacaaf..19f7d1fefc9 100644 --- a/lisp/vc/vc-annotate.el +++ b/lisp/vc/vc-annotate.el @@ -459,7 +459,8 @@ vc-annotate (setq coding-system-for-read (coding-system-change-eol-conversion coding-system-for-read 'dos))) - (vc-call-backend backend 'annotate-command file + (vc-call-backend backend 'annotate-command + (vc-annotate--file-name-change file rev backend) (get-buffer temp-buffer-name) rev) ;; we must setup the mode first, and then set our local ;; variables before the show-function is called at the exit of @@ -798,6 +799,16 @@ vc-annotate-goto-line (message "Annotations were for revision %s; line numbers may be incorrect" rev))))) +(defun vc-annotate--file-name-change (file rev backend) + "Return the name of FILE at revision REV using BACKEND. +If the file name has changed in the given revision, return the new name; +otherwise, return FILE unchanged." + (if (vc-find-backend-function backend 'file-name-changes) + (or (cdr (assoc file + (vc-call-backend backend 'file-name-changes rev))) + file) + file)) + (provide 'vc-annotate) ;;; vc-annotate.el ends here -- 2.47.2 --=-=-=-- From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 26 Jul 2025 20:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Sean Whitton Cc: wojciech.siewierski@gmail.com, 26345@debbugs.gnu.org, Dmitry Gutov Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.17535610158174 (code B ref 26345); Sat, 26 Jul 2025 20:17:01 +0000 Received: (at 26345) by debbugs.gnu.org; 26 Jul 2025 20:16:55 +0000 Received: from localhost ([127.0.0.1]:45347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uflKB-00027l-Io for submit@debbugs.gnu.org; Sat, 26 Jul 2025 16:16:55 -0400 Received: from mail.kubajecminek.cz ([144.91.101.54]:42612) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uflK7-00027T-TX for 26345@debbugs.gnu.org; Sat, 26 Jul 2025 16:16:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; s=202503r; d=kubajecminek.cz; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1753560877; bh=SkUpOwdIo28XFOhIIkGUMgm HymSNGpVwKW7agKf83Qw=; b=F1c4lKQAws+HdyQR3TGzJeCp8gdUaFtbbifOxa4FFeKafvLsYN tMlsvr2dk/bL5G6n1AiCf+cGqqLSjOYoYPluPP12KEuQAD6LRPRuQZ3eIsRis7yQ+JK77+qRN/y /3CGg3pah6RI+cnzRmPvK/KE/r6CDmfXCAlKl+DWGSW32GK5lwmU+f8sl59OnYEKUudU390IUOc LXhpdG2Uj7/gc5dpxDujlnuRQa6yClXcEHCiKNlZ7OdkpACDiSOlAKkoeFANX02oXMIN1uNIezj tFNN+oGC5egzPOsCUo83g8wP5AD5KKL5DJac/CUTMsI4x7wAE4RdYHIBSq/2CGS6w4g==; DKIM-Signature: v=1; a=ed25519-sha256; s=202503e; d=kubajecminek.cz; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1753560877; bh=SkUpOwdIo28XFOhIIkGUMgm HymSNGpVwKW7agKf83Qw=; b=H95m4NGThuEX0oLRTEpXAMMsAnq08pPLJ/koQCfdB9eNE0KtKG TxaTTPtKZQXw2vmCZTVK1/4K9czACMvoeECQ==; From: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= In-Reply-To: <87frf7ht4f.fsf@zephyr.silentflame.com> References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> <87cyaeoahv.fsf@zephyr.silentflame.com> <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> <14b81359-223e-4f03-9c5d-1711c98b8b2b@kubajecminek.cz> <87h5zol7qh.fsf@zephyr.silentflame.com> <042b052b-9b3f-463b-aebe-8848f52b38f4@kubajecminek.cz> <87frf7ht4f.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sat, 26 Jul 2025 22:14:37 +0200 Message-ID: <87a54qlnf6.fsf@kubajecminek.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) 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 (-) Sean Whitton writes: >>> Seems like this needs to be investigated before we can proceed. >> I've tested various scenarios and haven't encountered any issues with the >> current implementation. It would be great if you could test the change as >> well, in case there are edge cases I missed. > > I think that we need to see an argument in terms of the definition of > the file-name-changes backend function that demonstrates that your > approach will always work: > > ;; Return the list of pairs with changes in file names in REV. When > ;; a file was added, it should be a cons with nil car. When > ;; deleted, a cons with nil cdr. When copied or renamed, a cons > ;; with the source name as car and destination name as cdr. My approach updates the FILE argument only if the file name has changed in the given revision; otherwise, it keeps the name unchanged. I=E2=80=99m = not sure if it will **always** work, but it does fix the issue at hand. I'm sorry, but I can't provide any further arguments in favor of this change. From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Jul 2025 01:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= , Sean Whitton Cc: 26345@debbugs.gnu.org, wojciech.siewierski@gmail.com Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.175375279119032 (code B ref 26345); Tue, 29 Jul 2025 01:34:01 +0000 Received: (at 26345) by debbugs.gnu.org; 29 Jul 2025 01:33:11 +0000 Received: from localhost ([127.0.0.1]:58682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ugZDK-0004wt-Li for submit@debbugs.gnu.org; Mon, 28 Jul 2025 21:33:11 -0400 Received: from forward502a.mail.yandex.net ([178.154.239.82]:34464) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ugZDG-0004vs-Uw for 26345@debbugs.gnu.org; Mon, 28 Jul 2025 21:33:08 -0400 Received: from mail-nwsmtp-smtp-production-main-59.iva.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-59.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:4713:0:640:f85a:0]) by forward502a.mail.yandex.net (Yandex) with ESMTPS id 9FE9B89562; Tue, 29 Jul 2025 04:32:58 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-59.iva.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id tWNnEKCmHCg0-akCZ54r2; Tue, 29 Jul 2025 04:32:57 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1753752777; bh=TMhmuoT0GrWkA2cC3fuQHD0X/+yZYKA0Mc6mXikPh3Q=; h=In-Reply-To:From:Message-ID:Cc:References:Date:Subject:To; b=qZteTJyExlZ7MjZxHqQLWqs626NlKEiitmFB/j4vewN2mB121wZT+ppd52oklgvhn Xun+byAwQ6mh/eb2DXuq+gmngt64EW2MOaIR+0OYoo5hMpEnbq0urSyKJuKZMRE3cQ hMG/bRFtlon1V5D8zou1LlasYHtjs1P2PSL19nLo= Authentication-Results: mail-nwsmtp-smtp-production-main-59.iva.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfauth.phl.internal (Postfix) with ESMTP id 012E8F40068; Mon, 28 Jul 2025 21:32:54 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Mon, 28 Jul 2025 21:32:55 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdelfeejgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpegtkfffgggfuffvvehfhfgjsehmtderredtvdejnecuhfhrohhmpeffmhhithhrhicu ifhuthhovhcuoegughhuthhovheshigrnhguvgigrdhruheqnecuggftrfgrthhtvghrnh epudelgedvjedvfeegffduleeuleejfedvtdeitdffieduledtueelteegjeeltdegnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepughguhhtoh hvodhmvghsmhhtphgruhhthhhpvghrshhonhgrlhhithihqddufeeffeelleehhedvqddv leegjeejjeejiedqughguhhtohhvpeephigrnhguvgigrdhruhesfhgrshhtmhgrihhlrd gtohhmpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthho pehkuhgsrgeskhhusggrjhgvtghmihhnvghkrdgtiidprhgtphhtthhopehsphifhhhith htohhnsehsphifhhhithhtohhnrdhnrghmvgdprhgtphhtthhopeifohhjtghivggthhdr shhivgifihgvrhhskhhisehgmhgrihhlrdgtohhmpdhrtghpthhtohepvdeifeegheesug gvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: ib1d9465d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 28 Jul 2025 21:32:53 -0400 (EDT) Content-Type: multipart/mixed; boundary="------------vHizwkEGWOAEbfymP0mZtsOQ" Message-ID: Date: Tue, 29 Jul 2025 04:32:50 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> <87cyaeoahv.fsf@zephyr.silentflame.com> <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> <14b81359-223e-4f03-9c5d-1711c98b8b2b@kubajecminek.cz> <87h5zol7qh.fsf@zephyr.silentflame.com> <042b052b-9b3f-463b-aebe-8848f52b38f4@kubajecminek.cz> <87frf7ht4f.fsf@zephyr.silentflame.com> <87a54qlnf6.fsf@kubajecminek.cz> Content-Language: en-US From: Dmitry Gutov In-Reply-To: <87a54qlnf6.fsf@kubajecminek.cz> X-Spam-Score: 0.0 (/) 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 (-) This is a multi-part message in MIME format. --------------vHizwkEGWOAEbfymP0mZtsOQ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi all! On 26/07/2025 23:14, Jakub Ječmínek via Bug reports for GNU Emacs, the Swiss army knife of text editors wrote: > Sean Whitton writes: > >>>> Seems like this needs to be investigated before we can proceed. >>> I've tested various scenarios and haven't encountered any issues with the >>> current implementation. It would be great if you could test the change as >>> well, in case there are edge cases I missed. >> I think that we need to see an argument in terms of the definition of >> the file-name-changes backend function that demonstrates that your >> approach will always work: >> >> ;; Return the list of pairs with changes in file names in REV. When >> ;; a file was added, it should be a cons with nil car. When >> ;; deleted, a cons with nil cdr. When copied or renamed, a cons >> ;; with the source name as car and destination name as cdr. > My approach updates the FILE argument only if the file name has changed > in the given revision; otherwise, it keeps the name unchanged. I’m not > sure if it will **always** work, but it does fix the issue at hand. I'm > sorry, but I can't provide any further arguments in favor of this > change. Looking over the bug report again, my previous question was off the mark: it was about longer jumps over revisions - but the 'j' and 'a' commands (which are probably the only examples of such in the tree) specify the target file name explicitly (getting it from the buffer contents), so they should be okay. For the 'n' and 'p' commands, it would usually be fine because the step is often 1 revision. Anyway, that patch seems to fix stepping forward once across a name change, but not farther, nor stepping backward over such a change. To reproduce, add steps like this to the original setup: $ echo " morecontent" > newdir/file.txt $ git commit -m 'Edit after the move, adding second line' And then this to the reproduction: 5. Press 'n' again. 6. Press 'p' twice. It seems the fix is to move the change from 'vc-annotate' to 'vc-annotate-warp-revision' (previously mentioned by Jakub), and to update the new function to handle both directions. Please try out the the attached update, it seems handle both. I did some quick testing with Mercurial too. --------------vHizwkEGWOAEbfymP0mZtsOQ Content-Type: text/x-patch; charset=UTF-8; name="vc-annotate-follow-changed-names.diff" Content-Disposition: attachment; filename="vc-annotate-follow-changed-names.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpc3AvdmMvdmMtYW5ub3RhdGUuZWwgYi9saXNwL3ZjL3ZjLWFubm90 YXRlLmVsCmluZGV4IGU2OGM1YTc5OTE5Li42YmVkMzZjOTlkYyAxMDA2NDQKLS0tIGEvbGlz cC92Yy92Yy1hbm5vdGF0ZS5lbAorKysgYi9saXNwL3ZjL3ZjLWFubm90YXRlLmVsCkBAIC02 NjcsNiArNjY3LDExIEBAIHZjLWFubm90YXRlLXdhcnAtcmV2aXNpb24KICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKG9yIGZpbGUKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChjYWFkciB2Yy1idWZmZXItb3ZlcnJpZGluZy1maWxlc2V0 KSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmV3cmV2KSkKKyAgICAg ICAgICAgIChzZXRxIGZpbGUgKHZjLWFubm90YXRlLS1maWxlLW5hbWUtY2hhbmdlCisgICAg ICAgICAgICAgICAgICAgICAgICAob3IgZmlsZQorICAgICAgICAgICAgICAgICAgICAgICAg ICAgIChjYWFkciB2Yy1idWZmZXItb3ZlcnJpZGluZy1maWxlc2V0KSkKKyAgICAgICAgICAg ICAgICAgICAgICAgIG5ld3JldgorICAgICAgICAgICAgICAgICAgICAgICAgdmMtYW5ub3Rh dGUtYmFja2VuZCkpCiAgICAgICAgICAgICAoc2V0cSByZXZzcGVjICgxLSByZXZzcGVjKSkp KQogCSh1bmxlc3MgbmV3cmV2CiAJICAobWVzc2FnZSAiQ2Fubm90IGluY3JlbWVudCAlZCBy ZXZpc2lvbnMgZnJvbSByZXZpc2lvbiAlcyIKQEAgLTY3NSw2ICs2ODAsMTIgQEAgdmMtYW5u b3RhdGUtd2FycC1yZXZpc2lvbgogCShzZXRxIG5ld3JldiB2Yy1idWZmZXItcmV2aXNpb24p CiAgICAgICAgIChsZXQgKCh2Yy11c2Utc2hvcnQtcmV2aXNpb24gdmMtYW5ub3RhdGUtdXNl LXNob3J0LXJldmlzaW9uKSkKIAkgICh3aGlsZSAoYW5kICg8IHJldnNwZWMgMCkgbmV3cmV2 KQorICAgICAgICAgICAgKHNldHEgZmlsZSAodmMtYW5ub3RhdGUtLWZpbGUtbmFtZS1jaGFu Z2UKKyAgICAgICAgICAgICAgICAgICAgICAgIChvciBmaWxlCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKGNhYWRyIHZjLWJ1ZmZlci1vdmVycmlkaW5nLWZpbGVzZXQpKQorICAg ICAgICAgICAgICAgICAgICAgICAgbmV3cmV2CisgICAgICAgICAgICAgICAgICAgICAgICB2 Yy1hbm5vdGF0ZS1iYWNrZW5kCisgICAgICAgICAgICAgICAgICAgICAgICAnYmFja3dhcmQp KQogICAgICAgICAgICAgKHNldHEgbmV3cmV2CiAgICAgICAgICAgICAgICAgICAodmMtY2Fs bC1iYWNrZW5kIHZjLWFubm90YXRlLWJhY2tlbmQgJ3ByZXZpb3VzLXJldmlzaW9uCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChvciBmaWxlCkBAIC04MDQsNiArODE1 LDIxIEBAIHZjLWFubm90YXRlLWdvdG8tbGluZQogICAgICAgKG1lc3NhZ2UgIkFubm90YXRp b25zIHdlcmUgZm9yIHJldmlzaW9uICVzOyBsaW5lIG51bWJlcnMgbWF5IGJlIGluY29ycmVj dCIKIAkgICAgICAgcmV2KSkpKSkKIAorKGRlZnVuIHZjLWFubm90YXRlLS1maWxlLW5hbWUt Y2hhbmdlIChmaWxlIHJldiBiYWNrZW5kICZvcHRpb25hbCBiYWNrd2FyZCkKKyAgIlJldHVy biB0aGUgbmFtZSBvZiBGSUxFIGF0IHJldmlzaW9uIFJFViB1c2luZyBCQUNLRU5ELgorSWYg dGhlIGZpbGUgbmFtZSBoYXMgY2hhbmdlZCBpbiB0aGUgZ2l2ZW4gcmV2aXNpb24sIHJldHVy biB0aGUgbmV3IG5hbWU7CitvdGhlcndpc2UsIHJldHVybiBGSUxFIHVuY2hhbmdlZC4KK0lm IEJBQ0tXQVJELCByZXR1cm4gdGhlIG5hbWUgZm9yIEZJTEUgYmVmb3JlIFJFVi4iCisgIChp ZiAodmMtZmluZC1iYWNrZW5kLWZ1bmN0aW9uIGJhY2tlbmQgJ2ZpbGUtbmFtZS1jaGFuZ2Vz KQorICAgICAgKG9yCisgICAgICAgKGlmIGJhY2t3YXJkCisgICAgICAgICAgIChjYXIgKHJh c3NvYyBmaWxlCisgICAgICAgICAgICAgICAgICAgICAgICAodmMtY2FsbC1iYWNrZW5kIGJh Y2tlbmQgJ2ZpbGUtbmFtZS1jaGFuZ2VzIHJldikpKQorICAgICAgICAgKGNkciAoYXNzb2Mg ZmlsZQorICAgICAgICAgICAgICAgICAgICAgKHZjLWNhbGwtYmFja2VuZCBiYWNrZW5kICdm aWxlLW5hbWUtY2hhbmdlcyByZXYpKSkpCisgICAgICAgZmlsZSkKKyAgICBmaWxlKSkKKwog KHByb3ZpZGUgJ3ZjLWFubm90YXRlKQogCiA7OzsgdmMtYW5ub3RhdGUuZWwgZW5kcyBoZXJl Cg== --------------vHizwkEGWOAEbfymP0mZtsOQ-- From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Jul 2025 13:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= Cc: Dmitry Gutov , 26345@debbugs.gnu.org, wojciech.siewierski@gmail.com Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.175379514432638 (code B ref 26345); Tue, 29 Jul 2025 13:20:02 +0000 Received: (at 26345) by debbugs.gnu.org; 29 Jul 2025 13:19:04 +0000 Received: from localhost ([127.0.0.1]:33263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ugkES-0008UM-69 for submit@debbugs.gnu.org; Tue, 29 Jul 2025 09:19:04 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:42548) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ugkEO-0008TD-54 for 26345@debbugs.gnu.org; Tue, 29 Jul 2025 09:19:01 -0400 DKIM-Signature: a=rsa-sha256; b=d8Xgjf5Pk7dFi3lW4t9coMITLa/+XOH6gbN4GJNRbOMgyZKmFL0TSp1fSCjG0M+KlFTbce6wFatKhE3rhNrbSEjIIfTpC91+IFrVKxTbnHRHJGbZMY3k+D25dAErVE2ClU2WMlH6JNMAYktjmStGMSSC9UZVmJiijhtCfXZCQIjt3kvummSoLEg2A/QTx8VSGlLxAzUkPKr1nSbba6ERqhh4IYhGAe7xAKDysxN/85HT/QHAhBAduSmmoQnc2AhelyIpevs4Fm+QSXxg+0BqCm5uYIDfKstr8yiwD7gamnPWHYiGoR+nZu6upjQ9v9DLRKwDBOSS+dhmjtukZj6ifQ==; s=purelymail2; d=spwhitton.name; v=1; bh=8i8g+skqEnCRpS2mfJACnkDHu8bAN7T5MgsDE1z5IME=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=FvzvSGzso0BQIESnbESOwqnv5ZaU2iMKJcxjmue7V0ylFjxnaayKJWXotaGKUB+puLI/qRshxpAhd6t5kwMMLtMHwLZglHOkhCwafmjjVeqbYmV+k8p3VH5cgZ+08AnfxnLLTFQwTfwQlziWdFRPyO/qnbsmI7vm+SzofGppu6+qUMQP73iZNaY1faS7/HasTdRRab5MZGB7G7lxzcbMupG5wSTk5tOAFtuSq7gbcS41+GjqDlGEoy84LxvuTTFAgfIFBNnqNwdIoboIBWzr+e1uapEHo8GLZHML3ijXGWXnTxu4sVKqSOYsLofh0+F1sZ3gG40QgYeAGDms2MUumQ==; s=purelymail2; d=purelymail.com; v=1; bh=8i8g+skqEnCRpS2mfJACnkDHu8bAN7T5MgsDE1z5IME=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 26345@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -379493580; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Tue, 29 Jul 2025 13:18:53 +0000 (UTC) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id 99525940E58; Tue, 29 Jul 2025 14:18:51 +0100 (BST) From: Sean Whitton In-Reply-To: <87a54qlnf6.fsf@kubajecminek.cz> References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> <87cyaeoahv.fsf@zephyr.silentflame.com> <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> <14b81359-223e-4f03-9c5d-1711c98b8b2b@kubajecminek.cz> <87h5zol7qh.fsf@zephyr.silentflame.com> <042b052b-9b3f-463b-aebe-8848f52b38f4@kubajecminek.cz> <87frf7ht4f.fsf@zephyr.silentflame.com> <87a54qlnf6.fsf@kubajecminek.cz> Date: Tue, 29 Jul 2025 14:18:51 +0100 Message-ID: <877bzr3zk4.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) 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 (-) Hello, On Sat 26 Jul 2025 at 10:14pm +02, Jakub Je=C4=8Dm=C3=ADnek via "Bug report= s for GNU Emacs, the Swiss army knife of text editors" wrote: > Sean Whitton writes: > >>>> Seems like this needs to be investigated before we can proceed. >>> I've tested various scenarios and haven't encountered any issues with t= he >>> current implementation. It would be great if you could test the change = as >>> well, in case there are edge cases I missed. >> >> I think that we need to see an argument in terms of the definition of >> the file-name-changes backend function that demonstrates that your >> approach will always work: >> >> ;; Return the list of pairs with changes in file names in REV. When >> ;; a file was added, it should be a cons with nil car. When >> ;; deleted, a cons with nil cdr. When copied or renamed, a cons >> ;; with the source name as car and destination name as cdr. > > My approach updates the FILE argument only if the file name has changed > in the given revision; otherwise, it keeps the name unchanged. I=E2=80=99= m not > sure if it will **always** work, but it does fix the issue at hand. I'm > sorry, but I can't provide any further arguments in favor of this > change. Thanks for your reply. Would you be able to test Dmitry's patch, please? --=20 Sean Whitton From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 03 Aug 2025 12:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Sean Whitton Cc: Dmitry Gutov , 26345@debbugs.gnu.org, wojciech.siewierski@gmail.com Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.17542247356307 (code B ref 26345); Sun, 03 Aug 2025 12:39:02 +0000 Received: (at 26345) by debbugs.gnu.org; 3 Aug 2025 12:38:55 +0000 Received: from localhost ([127.0.0.1]:43075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uiXzL-0001df-9Y for submit@debbugs.gnu.org; Sun, 03 Aug 2025 08:38:55 -0400 Received: from mail.kubajecminek.cz ([144.91.101.54]:34102) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uiXzH-0001dP-5Z for 26345@debbugs.gnu.org; Sun, 03 Aug 2025 08:38:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; s=202503r; d=kubajecminek.cz; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1754224598; bh=6qx+ocyrdrNMxFaODzNd2Y7 jAaLcWghERiO/9BD7ksA=; b=ZWVAIzyLG1iXpzKCAwxMffDTJwl0bCfVARXCqLb6SY6ge6HKPw la+cLW/FW64rGpJBPiJPReMgYMeM5/cFr34NM7JGgpx5whqtaHMaa96GW+d34NlHnUcDljLQ1Nw SrcdG+8L5CJaB1ohtzweeBAq1Zqwr6j0+L3fJaZOZIXs1zpNZGI8jE6t9wxPK3X+lg6eLPM5JL3 RKHAI2O/wB/h+UnqulOUZMimv8QZo/AFUdnTkIhrm6b8WM3K4E5aIE8evC6QEPKCw7Z7Zk0K9K7 +X5JVZnxRRr8UoRJmtbYTAxnVQyvQ4rVfUpFu5SpuXRLJjIDos0xW4NXszzonOMoIlw==; DKIM-Signature: v=1; a=ed25519-sha256; s=202503e; d=kubajecminek.cz; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1754224598; bh=6qx+ocyrdrNMxFaODzNd2Y7 jAaLcWghERiO/9BD7ksA=; b=YnLKAbIBeU/FojVMzheC7KKTuJBuaVT2Jm1A2NeIj2RYfVKZGN R9GurkzAF/UshYk8+nicBmLYr8oNHfn07ZBg==; From: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= In-Reply-To: <877bzr3zk4.fsf@zephyr.silentflame.com> References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> <87cyaeoahv.fsf@zephyr.silentflame.com> <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> <14b81359-223e-4f03-9c5d-1711c98b8b2b@kubajecminek.cz> <87h5zol7qh.fsf@zephyr.silentflame.com> <042b052b-9b3f-463b-aebe-8848f52b38f4@kubajecminek.cz> <87frf7ht4f.fsf@zephyr.silentflame.com> <87a54qlnf6.fsf@kubajecminek.cz> <877bzr3zk4.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sun, 03 Aug 2025 14:36:38 +0200 Message-ID: <8734a8vay1.fsf@kubajecminek.cz> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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 (-) Sean Whitton writes: > Would you be able to test Dmitry's patch, please? With Dmitry's patch applied, everything works as expected. From unknown Thu Aug 14 22:20:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26345: [PATCH] Handle renamed files when cycling through revisions Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 04 Aug 2025 10:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Jakub =?UTF-8?Q?Je=C4=8Dm=C3=ADnek?= Cc: wojciech.siewierski@gmail.com, 26345@debbugs.gnu.org, Dmitry Gutov Received: via spool by 26345-submit@debbugs.gnu.org id=B26345.17543038798273 (code B ref 26345); Mon, 04 Aug 2025 10:38:01 +0000 Received: (at 26345) by debbugs.gnu.org; 4 Aug 2025 10:37:59 +0000 Received: from localhost ([127.0.0.1]:49381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uisZq-00029M-V4 for submit@debbugs.gnu.org; Mon, 04 Aug 2025 06:37:59 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:47384) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uisZn-000296-NN for 26345@debbugs.gnu.org; Mon, 04 Aug 2025 06:37:56 -0400 DKIM-Signature: a=rsa-sha256; b=ERGC4in33BLVK4vpTjw5sErkjEMppzpDawd3RBdKHfymw6v3pF08OZfoocuXMkkakMIkahfnDXHyaIxHeBV5tRxd2kPGKAqGI3T4X7DBWj3AR3fdqZgZC+3Jg2w8xa/gvSFfsIT837+sET7eDW3yLG4SY74Qa8Hblia1G2ASqKcvPq4VvHo3Wgqp8LQXFgdSBF3EvXRwesUeCNVxulClklb7cYUkUaXpj1G2eL5hIx4hxesY2i4s1v9pbQsS9fAW5GrfWlv2dwEpYooE5oUBcc4GUx8ltLozi5q/NhCjBqkgBrGdEj6MilfevjFuVEL1Om5LthR/wkODVqfdtHgnBw==; s=purelymail3; d=spwhitton.name; v=1; bh=A4rOklSa+H8DjmYBmBmU/K+nwlM5PcEPbU6XSoemmqU=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=XRUaf1Rmwd/CJop49qjVfGXdbsE215P0yl518L/kOxQQu1aCyFCT42xsWRczqinZO/o5XKBsnzKEDH43k9iiP0YfiqgLv+r8c6enIsmAgmFS3X4bDkMPodhfGGLWKUGR4nhWTs9IEwR5TC+//H0rwjqNdm7qU+ofPYu/3D0Xnw1x7RGCCks3E0dYLwhGQv2b7HpwbTYw82FQ2Min6MzimBrBHLcd/1RquBeLaK5FRCT/1wFe2t3ZUXL+8Qk64IYsvhoVVtFmtEibUojIGHPAv8sfSbKSxp+WkLSPe8/o0LdnUAbxmLFvuTsoauiaJVQ3sKBGnYCosrzrK2ycYB8alg==; s=purelymail3; d=purelymail.com; v=1; bh=A4rOklSa+H8DjmYBmBmU/K+nwlM5PcEPbU6XSoemmqU=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 26345@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -538560311; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Mon, 04 Aug 2025 10:37:49 +0000 (UTC) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id BAC2194012E; Mon, 04 Aug 2025 11:37:48 +0100 (BST) From: Sean Whitton In-Reply-To: <8734a8vay1.fsf@kubajecminek.cz> References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> <87cyaeoahv.fsf@zephyr.silentflame.com> <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> <14b81359-223e-4f03-9c5d-1711c98b8b2b@kubajecminek.cz> <87h5zol7qh.fsf@zephyr.silentflame.com> <042b052b-9b3f-463b-aebe-8848f52b38f4@kubajecminek.cz> <87frf7ht4f.fsf@zephyr.silentflame.com> <87a54qlnf6.fsf@kubajecminek.cz> <877bzr3zk4.fsf@zephyr.silentflame.com> <8734a8vay1.fsf@kubajecminek.cz> Date: Mon, 04 Aug 2025 11:37:48 +0100 Message-ID: <87qzxrid8j.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.0 (-) 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.0 (--) Hello, On Sun 03 Aug 2025 at 02:36pm +02, Jakub Je=C4=8Dm=C3=ADnek via "Bug report= s for GNU Emacs, the Swiss army knife of text editors" wrote: > Sean Whitton writes: > >> Would you be able to test Dmitry's patch, please? > > With Dmitry's patch applied, everything works as expected. Thanks for reporting back. Dmitry, I can install this if you are busy, else please go ahead, with many thanks for coming up with the fix! --=20 Sean Whitton From unknown Thu Aug 14 22:20:41 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Wojciech Siewierski Subject: bug#26345: closed (Re: bug#26345: [PATCH] Handle renamed files when cycling through revisions) Message-ID: References: <71196736-846b-4e59-a146-773034319fb4@yandex.ru> <3b0ce616-d7ae-8f63-3ed8-cab1a6feaae2@gmail.com> X-Gnu-PR-Message: they-closed 26345 X-Gnu-PR-Package: emacs Reply-To: 26345@debbugs.gnu.org Date: Tue, 05 Aug 2025 01:21:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1754356862-28802-1" This is a multi-part message in MIME format... ------------=_1754356862-28802-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26345: 25.1; vc-annotate in Git is unable to fully navigate the history if= the file was moved which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 26345@debbugs.gnu.org. --=20 26345: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26345 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1754356862-28802-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26345-done) by debbugs.gnu.org; 5 Aug 2025 01:20:10 +0000 Received: from localhost ([127.0.0.1]:53072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uj6La-0007NK-9v for submit@debbugs.gnu.org; Mon, 04 Aug 2025 21:20:10 -0400 Received: from forward501b.mail.yandex.net ([2a02:6b8:c02:900:1:45:d181:d501]:49990) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uj6LW-0007MU-SQ for 26345-done@debbugs.gnu.org; Mon, 04 Aug 2025 21:20:08 -0400 Received: from mail-nwsmtp-smtp-production-main-60.sas.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-60.sas.yp-c.yandex.net [IPv6:2a02:6b8:c23:4419:0:640:5be6:0]) by forward501b.mail.yandex.net (Yandex) with ESMTPS id F0FEB81581; Tue, 05 Aug 2025 04:19:57 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-60.sas.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id sJUVqJ3MaSw0-Hsh7VpgQ; Tue, 05 Aug 2025 04:19:57 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1754356797; bh=EHhGZRY9Et8sdrn3smNRsCvywcJhyHYqUpUkHhJLFjQ=; h=In-Reply-To:From:Subject:Message-ID:Cc:References:Date:To; b=HSHM531zpJvNpZA5vbmWb3RyG3D4kmBHzJNNBeYbBra4snIxvRWNhIn7RifgPI8Zs 2KiGARDbWMmrwdgsmcDeeUwO3F94XuLMg4ZBgB0x+tg0PW5qp+nBdCB80tFbkmj2ik W4MgeBlyBH41R47X+tW/JmeJ54SuiELhbRD4PQ7U= Authentication-Results: mail-nwsmtp-smtp-production-main-60.sas.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfauth.phl.internal (Postfix) with ESMTP id 7E5B4F4006E; Mon, 4 Aug 2025 21:19:54 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Mon, 04 Aug 2025 21:19:54 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdduudefkeefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpeffmhhithhr hicuifhuthhovhcuoegughhuthhovheshigrnhguvgigrdhruheqnecuggftrfgrthhtvg hrnhepfeelfffhjefhgeehtdefhedtieehkeehteetfeeljeekhfegteeivdehgfejueev necuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepughguhhtohhvodhmvghsmhhtphgruhhthhhpvghrshho nhgrlhhithihqddufeeffeelleehhedvqddvleegjeejjeejiedqughguhhtohhvpeephi grnhguvgigrdhruhesfhgrshhtmhgrihhlrdgtohhmpdhnsggprhgtphhtthhopeegpdhm ohguvgepshhmthhpohhuthdprhgtphhtthhopehsphifhhhithhtohhnsehsphifhhhith htohhnrdhnrghmvgdprhgtphhtthhopehkuhgsrgeskhhusggrjhgvtghmihhnvghkrdgt iidprhgtphhtthhopeifohhjtghivggthhdrshhivgifihgvrhhskhhisehgmhgrihhlrd gtohhmpdhrtghpthhtohepvdeifeeghedqughonhgvseguvggssghughhsrdhgnhhurdho rhhg X-ME-Proxy: Feedback-ID: ib1d9465d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 4 Aug 2025 21:19:52 -0400 (EDT) Message-ID: <71196736-846b-4e59-a146-773034319fb4@yandex.ru> Date: Tue, 5 Aug 2025 04:19:51 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#26345: [PATCH] Handle renamed files when cycling through revisions To: Sean Whitton , =?UTF-8?Q?Jakub_Je=C4=8Dm=C3=ADnek?= References: <8c2e4fc0-a46b-3107-9579-021b2b6cebcb@yandex.ru> <20250630202943.13127-1-kuba@kubajecminek.cz> <87cyaeoahv.fsf@zephyr.silentflame.com> <66074782-a255-41bb-a4ec-bbba95c6603c@yandex.ru> <14b81359-223e-4f03-9c5d-1711c98b8b2b@kubajecminek.cz> <87h5zol7qh.fsf@zephyr.silentflame.com> <042b052b-9b3f-463b-aebe-8848f52b38f4@kubajecminek.cz> <87frf7ht4f.fsf@zephyr.silentflame.com> <87a54qlnf6.fsf@kubajecminek.cz> <877bzr3zk4.fsf@zephyr.silentflame.com> <8734a8vay1.fsf@kubajecminek.cz> <87qzxrid8j.fsf@zephyr.silentflame.com> Content-Language: en-US From: Dmitry Gutov In-Reply-To: <87qzxrid8j.fsf@zephyr.silentflame.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26345-done Cc: 26345-done@debbugs.gnu.org, wojciech.siewierski@gmail.com 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.7 (-) On 04/08/2025 13:37, Sean Whitton wrote: >>> Would you be able to test Dmitry's patch, please? >> With Dmitry's patch applied, everything works as expected. > Thanks for reporting back. > > Dmitry, I can install this if you are busy, else please go ahead, with > many thanks for coming up with the fix! Thanks for confirming, now pushed to master: https://cgit.git.savannah.gnu.org/cgit/emacs.git/commit/?id=65c110b913f0aa539c34a77be812144c621021f8 All seems to be resolved, so closing. ------------=_1754356862-28802-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 3 Apr 2017 00:05:27 +0000 Received: from localhost ([127.0.0.1]:57878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cupUs-000401-9L for submit@debbugs.gnu.org; Sun, 02 Apr 2017 20:05:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cunKd-0000iN-81 for submit@debbugs.gnu.org; Sun, 02 Apr 2017 17:46:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cunKU-0004P7-Bc for submit@debbugs.gnu.org; Sun, 02 Apr 2017 17:46:38 -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, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:43499) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cunKU-0004Oo-7t for submit@debbugs.gnu.org; Sun, 02 Apr 2017 17:46:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cunKP-0001A4-Ss for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2017 17:46:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cunKM-0004GH-39 for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2017 17:46:29 -0400 Received: from mail-lf0-x235.google.com ([2a00:1450:4010:c07::235]:35597) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cunKL-0004Cp-Gj for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2017 17:46:25 -0400 Received: by mail-lf0-x235.google.com with SMTP id j90so63363971lfk.2 for ; Sun, 02 Apr 2017 14:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version; bh=ReUSTSwpzellgbGKgSxL29dfd/TF3zAdqBMOZ1oPeLQ=; b=WnDTWrWucr+TZ6Y+QqWuJfj/wgSwgjyJAPrZmHjoKmKOof6IC7Y2WGdckdf/BKpYBI sOgYhwzi2xHoa6Qgl34L0AHeZabiKPXuDTuPOMX7X59EjkeZsyhDkiQMJf5Q7bRip7cX vpdILkJZHzVmdNmS+UVnLKVy/M8TLsLsb50/EIXxE9mGOz2PjQD5j/Sz+GfOij1Xi3RN /bXWXzzrs3rh32sAeEdfqMGLyR5pPJqvPtOY0XPXqaJhcDVmOSku7bOVypFksYc2GKE1 fcXvJ7v9C3xe2pC/13erq8lw9UkpHp8IGKLZ/iJEfo8NR4o7wZ72buuzTDSoavENjNUP sxng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version; bh=ReUSTSwpzellgbGKgSxL29dfd/TF3zAdqBMOZ1oPeLQ=; b=hIlYs2pTPQ1Znq7Xhv6w08kmRzqiwkaJyxbnS7VD8iwhYVRUpzHFpdjHm13gCkN+Hj d7WXD2Xn+ZCseGxJnaspxHTwgqrdEBBfvO3SzfsFK3jIn66kAfnuxXo6jaFb2ByuZOhQ c74glDs4V6Et0Q0uFHf9Ji0EbazL3z7q+AlNaEXTD/BKIbWB9nOxpeGRPJSVzQrO2ALs Oo9qJihQazAjn6m0cbDokvFctLZF8boCyg6ADVpFwx42TNG/z+/76rZUTUlHIQGr8RC9 xq7rA1U/P2WrNlVua5Rsy7WY32YkcIkR54sYxfI5GI4uqcdsDuJyMKPU3av+jVV79BHy iTdQ== X-Gm-Message-State: AFeK/H22Gf/zzVHaii81EW8dxDg/ZnqnO5gKbDm1Ksa0Dp4KPjO+ilr53ILwZoC8KfXWQA== X-Received: by 10.25.229.6 with SMTP id c6mr3662526lfh.95.1491169581790; Sun, 02 Apr 2017 14:46:21 -0700 (PDT) Received: from [192.168.1.101] (host-37-190-211-219.dynamic.mm.pl. [37.190.211.219]) by smtp.googlemail.com with ESMTPSA id g4sm2197127lji.35.2017.04.02.14.46.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Apr 2017 14:46:20 -0700 (PDT) To: bug-gnu-emacs@gnu.org From: Wojciech Siewierski Subject: 25.1; vc-annotate in Git is unable to fully navigate the history if the file was moved Message-ID: <3b0ce616-d7ae-8f63-3ed8-cab1a6feaae2@gmail.com> Date: Sun, 2 Apr 2017 23:46:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="tnDpFuSkkOOP7qB22jIIDvtnA6VQ4dHCu" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sun, 02 Apr 2017 20:05:25 -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: -4.0 (----) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --tnDpFuSkkOOP7qB22jIIDvtnA6VQ4dHCu Content-Type: multipart/mixed; boundary="0F2v1MwESUOfEta9Hx61meJ9AWLim413i"; protected-headers="v1" From: Wojciech Siewierski To: bug-gnu-emacs@gnu.org Message-ID: <3b0ce616-d7ae-8f63-3ed8-cab1a6feaae2@gmail.com> Subject: 25.1; vc-annotate in Git is unable to fully navigate the history if the file was moved --0F2v1MwESUOfEta9Hx61meJ9AWLim413i Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable It seems some vc-git operations override `default-directory' with the parent directory of the files they operate on. It's a problem if they no longer exist like in the following scenario. Preparation steps in shell: $ git init $ mkdir olddir/ $ echo oldcontent > olddir/file.txt $ git add olddir/ $ git commit -m 'Initial commit' $ echo newcontent > olddir/file.txt $ git add olddir/ $ git commit -m 'Modify the file' $ git mv olddir/ newdir/ $ git commit -m 'Move the file' Reproduction: 1. Open newdir/file.txt in Emacs. 2. Press `C-x v g' to open `vc-annotate'. 3. Press `j' to jump to the revision from before the file was moved. 4. Try to move to the next (newer) revision with `n'. The error appears here. > apply: Setting current directory: No such file or directory, =2E../testrepo/olddir/ It seems in this scenario `vc-annotate' also has trouble with the regular navigation (`n' and `p') without the usage of `j' but the error message is not as clear. In GNU Emacs 25.1.1 (x86_64-unknown-linux-gnu, GTK+ Version 2.24.31) of 2017-01-08 built on localhost Windowing system distributor 'The X.Org Foundation', version 11.0.1180400= 0 System Description: Ubuntu 16.04.2 LTS Configured using: 'configure --disable-dependency-tracking --prefix=3D/nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1 --with-modules --with-x-toolkit=3Dgtk2 --with-xft' Configured features: XPM JPEG TIFF GIF PNG RSVG SOUND DBUS GSETTINGS NOTIFY LIBSELINUX GNUTLS LIBXML2 FREETYPE XFT ZLIB TOOLKIT_SCROLL_BARS GTK2 X11 MODULES Important settings: value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix Major mode: Org Minor modes in effect: TeX-PDF-mode: t magit-auto-revert-mode: t ido-vertical-mode: t flx-ido-mode: t yas-global-mode: t yas-minor-mode: t projectile-mode: t global-diff-hl-mode: t hl-line-mode: t global-company-mode: t company-mode: t org-bullets-mode: t recentf-mode: t bbyac-global-mode: t bbyac-mode: t beacon-mode: t volatile-highlights-mode: t global-git-commit-mode: t global-undo-tree-mode: t undo-tree-mode: t show-paren-mode: t minibuffer-depth-indicate-mode: t electric-pair-mode: t global-subword-mode: t subword-mode: t diff-auto-refine-mode: t shell-dirtrack-mode: t async-bytecomp-package-mode: t ivy-mode: t override-global-mode: t winner-mode: t tooltip-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t column-number-mode: t line-number-mode: t transient-mark-mode: t Recent messages: Type C-x 1 to delete the help window, C-M-v to scroll help. Quit When done with this frame, type C-x 5 0 Quit When done with this frame, type C-x 5 0 Quit [3 times] Type C-x 1 to delete the help window, C-M-v to scroll help. Mark set C-x C-g is undefined Quit Load-path shadows: /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/scala-m= ode-20170323.502/ob-scala hides /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-scala /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-texinfo hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-texinfo /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-publish hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-publish /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-org hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-org /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-odt hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-odt /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-md hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-md /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-man hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-man /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-latex hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-latex /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-icalendar hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-icalendar /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-html hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-html /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-beamer hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-beamer /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ox-ascii hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ox-ascii /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-w3m hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-w3m /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-version hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-version /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-timer hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-timer /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-table hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-table /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-src hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-src /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-rmail hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-rmail /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-protocol hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-protocol /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-plot hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-plot /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-pcomplete hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-pcomplete /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-mouse hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-mouse /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-mobile hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-mobile /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-mhe hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-mhe /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-macs hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-macs /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-macro hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-macro /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-loaddefs hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-loaddefs /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-list hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-list /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-irc hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-irc /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-install hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-install /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-inlinetask hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-inlinetask /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-info hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-info /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-indent hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-indent /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-id hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-id /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-habit hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-habit /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-gnus hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-gnus /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-footnote hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-footnote /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-feed hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-feed /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-faces hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-faces /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-eshell hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-eshell /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-entities hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-entities /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-element hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-element /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-docview hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-docview /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-datetree hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-datetree /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-ctags hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-ctags /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-crypt hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-crypt /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-compat hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-compat /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-colview hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-colview /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-clock hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-clock /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-capture hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-capture /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-bibtex hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-bibtex /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-bbdb hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-bbdb /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-attach hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-attach /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-archive hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-archive /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/org-agenda hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/org-agenda /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-tangle hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-tangle /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-table hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-table /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-sqlite hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-sqlite /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-sql hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-sql /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-shen hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-shen /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-screen hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-screen /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-scheme hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-scheme /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/scala-m= ode-20170323.502/ob-scala hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-scala /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-sass hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-sass /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-ruby hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-ruby /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-ref hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-ref /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-python hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-python /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-plantuml hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-plantuml /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-picolisp hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-picolisp /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-perl hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-perl /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-org hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-org /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-octave hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-octave /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-ocaml hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-ocaml /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-mscgen hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-mscgen /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-maxima hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-maxima /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-matlab hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-matlab /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-makefile hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-makefile /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-lob hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-lob /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-lisp hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-lisp /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-lilypond hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-lilypond /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-ledger hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-ledger /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-latex hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-latex /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-keys hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-keys /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-js hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-js /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-java hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-java /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-io hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-io /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-haskell hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-haskell /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-gnuplot hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-gnuplot /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-fortran hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-fortran /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-exp hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-exp /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-eval hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-eval /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-emacs-lisp hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-emacs-lisp /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-dot hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-dot /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-ditaa hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-ditaa /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-css hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-css /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-core hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-core /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-comint hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-comint /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-clojure hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-clojure /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-calc hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-calc /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-awk hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-awk /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-asymptote hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-asymptote /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-R hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-R /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/org-201= 70210/ob-C hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/org/ob-C /home/vifon/projects/configs/emacs-config/emacs.d/.cask/25.1/elpa/seq-2.1= 9/seq hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/emacs-lisp/seq ~/.emacs.d/skeletons/generic hides /nix/store/89cab82wdiyii22cxmf50f88vc1wj3y0-emacs-25.1/share/emacs/25.1/l= isp/emacs-lisp/generic Features: (shadow mail-extr emacsbug sendmail pulse debug eieio-opt speedbar sb-image ezimage dframe vc-annotate helm-projectile helm-files image-dired helm-tags helm-bookmark helm-adaptive helm-info helm-external helm-net helm-buffers helm-grep helm-regexp helm-elscreen helm-utils helm-locate helm-types c-c++-header breadcrumb find-file expand-region cperl-mode-expansions text-mode-expansions cc-mode-expansions the-org-mode-expansions python-el-fgallina-expansions latex-mode-expansions er-basic-expansions expand-region-core expand-region-custom cl-indent wdired slime hyperspec browse-url sort iedit iedit-lib dired-aux rst vim-line-open tramp-cache ispell tabify cal-move parse-time epa-file epa org-datetree org-capture haskell-doc inf-haskell haskell-decl-scan geiser-mode geiser-xref geiser-compile geiser-debug geiser-chibi geiser-mit geiser-chez geiser-chicken geiser-racket geiser-guile info-look geiser geiser-repl geiser-image geiser-company geiser-doc geiser-menu geiser-edit geiser-completion geiser-autodoc geiser-eval geiser-connection tq geiser-syntax geiser-log geiser-popup view geiser-impl geiser-custom geiser-base scheme dired-subtree dired-hacks-utils network-stream nsm starttls warnings git-rebase texmathp preview prv-emacs tex-buf indent-guide font-latex latex tex-ispell tex-style tex dbus tex-mode latexenc wgrep-ag wgrep ag vc-svn find-dired magit-obsolete magit-blame magit-stash magit-bisect magit-remote magit-commit magit-sequence magit-notes magit-worktree magit-branch magit-files magit-refs magit-status magit magit-repos magit-apply magit-wip magit-log magit-diff smerge-mode magit-core magit-autorevert autorevert filenotify magit-process magit-margin magit-mode magit-git crm magit-section magit-popup misearch multi-isearch smex ido-vertical-mode flx-ido ido vc-git org-table org-agenda company-rtags colir color counsel esh-util swiper org-clock ansible yasnippet rtags repeat bookmark projectile diff-hl vc-dir vc vc-dispatcher hl-line haskell haskell-completions haskell-load haskell-commands highlight-uses-mode haskell-modules haskell-sandbox haskell-repl haskell-debug haskell-interactive-mode haskell-presentation-mode haskell-collapse haskell-navigate-imports haskell-compile haskell-process haskell-session haskell-hoogle haskell-mode haskell-cabal haskell-utils haskell-font-lock haskell-indentation haskell-string haskell-sort-imports haskell-lexeme haskell-align-imports haskell-compat haskell-complete-module haskell-ghc-support dabbrev haskell-customize macrostep-c cmacexp macrostep sh-script smie executable company-files company-oddmuse company-clang company-dabbrev-code company-dabbrev company-keywords company-etags company-gtags company-capf company-cmake company-xcode company-semantic company-eclim company-template company-css company-nxml company-bbdb company-tern dash-functional tern url-http tls gnutls url-auth company flycheck jedi auto-complete jedi-core python-environment epc ctable concurrent deferred python perltidy cperl-lineup cperl-mode paredit yafolding org-bullets disp-table org-rmail org-mhe org-irc org-info org-gnus org-docview doc-view subr-x jka-compr image-mode org-bibtex bibtex org-bbdb org-w3m my-secret zenburn-theme recentf-merge recentf tree-widget wid-edit avy bbyac browse-kill-ring derived ecomplete racer rust-mode ggtags phi-search phi-search-core multiple-cursors mc-hide-unmatched-lines-mode mc-separate-operations rectangular-region-mode mc-mark-pop mc-mark-more mc-cycle-cursors mc-edit-lines multiple-cursors-core rect beacon etags xref project volatile-highlights highlight-symbol goto-last-change p4 ps-print ps-def lpr stgit ewoc git-commit with-editor tramp-sh server magit-utils log-edit message rfc822 mml mml-sec epg mailabbrev mail-utils gmm-utils mailheader pcvs-util add-log legalese finder diary-lib diary-loaddefs undo-tree diff dired-x pastes-from-web my-scratch my-global-settings cualess-global-mark avoid paren mb-depth elec-pair cap-words superword subword my-registers my-fixes disable-suspend fuck-you-slime lineup my-eshell my-org steam xml url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf url-util mailcap org-crypt ob-scala ensime ensime-mode ensime-sbt sbt-mode sbt-mode-rgrep grep sbt-mode-comint sbt-mode-buffer sbt-mode-project sbt-mode-vars ensime-http ensime-ui ensime-semantic-highlight ensime-doc ensime-search ensime-undo ensime-startup ensime-refactor diff-mode ensime-popup ensime-notes ensime-model ensime-inspector imenu ensime-goto-testfile ensime-editor popup ensime-debug gdb-mi bindat gud ensime-stacktrace ensime-inf ensime-overlay ensime-completion-util ensime-config ensime-util ensime-client ensime-vars url-gw scala-mode scala-mode-prettify-symbols scala-mode-imenu scala-mode-map scala-mode-fontlock scala-mode-indent scala-mode-paragraph scala-mode-syntax scala-mode-lib pp hideshow flymake arc-mode archive-mode ensime-macros cl ob-java ob-perl ob-python ob-C cc-mode cc-fonts cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs ob-haskell ob-sqlite ob-octave ob-gnuplot ob-dot ob-plantuml ob-ditaa ob-makefile ob-sed ob-awk ob-shell org-protocol org-element avl-tree org org-macro org-footnote org-pcomplete org-list org-faces org-entities noutline outline org-version ob-emacs-lisp ob ob-tangle org-src ob-ref ob-lob ob-table ob-keys ob-exp ob-comint tramp tramp-compat tramp-loaddefs trampver shell pcomplete ob-core ob-eval org-compat org-macs org-loaddefs format-spec find-func cal-menu calendar cal-loaddefs my-ibuffer ibuffer-vc ibuf-ext ibuffer my-helm helm-help helm helm-source eieio-compat helm-multi-match helm-lib dired helm-config helm-easymenu async-bytecomp async my-ivy ivy-hydra ivy flx delsel ivy-overlay ffap thingatpt url-parse auth-source eieio gnus-util time-date password-cache url-vars my-god-mode god-mode my-keys windmove my-fun my-mode-line my-skeletons skeletor compile comint ansi-color rx let-alist autoinsert skeleton my-hooks hydra lv key-chord use-package diminish bind-key easy-mmode tex-site eieio-core advice slime-autoloads info edmacro kmacro cask cl-seq cl-macs cask-bootstrap package-build mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums mm-util help-fns mail-prsvr json map lisp-mnt shut-up epl git commander f dash s ucs-normalize finder-inf package epg-config seq byte-opt gv bytecomp byte-compile cl-extra help-mode easymenu cconv cl-loaddefs pcase cl-lib my-compat winner ring cus-start cus-load 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 1451135 142112) (symbols 48 82760 0) (miscs 40 9828 3493) (strings 32 438521 140156) (string-bytes 1 8714254) (vectors 16 159814) (vector-slots 8 3567015 52260) (floats 8 3169 4363) (intervals 56 44066 417) (buffers 976 192)) --0F2v1MwESUOfEta9Hx61meJ9AWLim413i-- --tnDpFuSkkOOP7qB22jIIDvtnA6VQ4dHCu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJY4XEpAAoJEOWQKlKyR7jeGI8H/1kc8FT5p7oRAFtV5FgK9c49 LSFLQ+Pf1CDvhQnCIPo6AsWUYUsa5cUZBMlyJ7BaFj5hmpEDvzc4xHZ+XnIPZSeF FyXC4GALeaLmg9Lur8ROiPugZAIkesCDw6mqzVDShA1y7yV+L4zljDczd6AMHdKG oV/EMajtHqFu85grF3TBGA58j9sf7Sz+ztinJRJmCSLs5bcFIkD7Z7ZGVc0P/yqu k1Eu9GKazK1QRF2MN34o/wJv5tgIbqBl73aMl5ZaIYkc25EKGLB+zxZOHcePsr6A oUAX4VxLq1vmXdVUyUA6HXKYiWat3qDnolWqU4exgjh/s/vnLgUW58xZyk2kPcM= =0NFf -----END PGP SIGNATURE----- --tnDpFuSkkOOP7qB22jIIDvtnA6VQ4dHCu-- ------------=_1754356862-28802-1--