From unknown Thu Aug 14 21:44:21 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#57442 <57442@debbugs.gnu.org> To: bug#57442 <57442@debbugs.gnu.org> Subject: Status: 29.0.50; diff file name deduction fails for VC backend SRC Reply-To: bug#57442 <57442@debbugs.gnu.org> Date: Fri, 15 Aug 2025 04:44:21 +0000 retitle 57442 29.0.50; diff file name deduction fails for VC backend SRC reassign 57442 emacs submitter 57442 Wolfgang Scherer severity 57442 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 26 20:38:14 2022 Received: (at submit) by debbugs.gnu.org; 27 Aug 2022 00:38:14 +0000 Received: from localhost ([127.0.0.1]:54856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRjq2-0000b3-9U for submit@debbugs.gnu.org; Fri, 26 Aug 2022 20:38:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:41160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRjq0-0000aw-Ck for submit@debbugs.gnu.org; Fri, 26 Aug 2022 20:38:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRjpz-0004Nu-Pc for bug-gnu-emacs@gnu.org; Fri, 26 Aug 2022 20:38:11 -0400 Received: from mout.gmx.net ([212.227.17.22]:52845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRjpl-0003qs-Ow for bug-gnu-emacs@gnu.org; Fri, 26 Aug 2022 20:38:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1661560670; bh=cPbyiPEmCSxrKvDVdCCaycKMBEghZlLVkyJQRCTKWuA=; h=X-UI-Sender-Class:Date:To:Subject:From; b=UXqv9tj1UtBgvHBvCeLWZBuo3yCvMY3jgCBMVGmaxijlgiKZ9cI/SJLG/8Fz596Tg U+5rt0JnK7vUR+oWlf3lJOt+z5zCg05ALg9cA+r4rvt/lIdKVWiGHQvex9VdAJ2l2h 8BJ7zsHqOeLerZ11uUv050K2b/vDxhu4IB+8D4ks= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from sheckley.simul.de ([87.160.210.134]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M4s51-1oT6bp1eA3-0021U1 for ; Sat, 27 Aug 2022 02:37:50 +0200 Received: from [192.168.33.23] (franke.simul.de [192.168.33.23]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by sheckley.simul.de (Postfix) with ESMTPSA id BE8B81940149 for ; Sat, 27 Aug 2022 02:37:42 +0200 (CEST) Message-ID: <829397c5-e446-eb14-d840-924784c61e0d@gmx.de> Date: Sat, 27 Aug 2022 02:37:42 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 To: bug-gnu-emacs@gnu.org Subject: 29.0.50; diff file name deduction fails for VC backend SRC Content-Language: de-DE From: Wolfgang Scherer Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:BQ7xluWNL2L2CF0aZt/onMqXUcIlISRv0bpQuwq6XtFkN9HUwwR a7xAM7fmJ8Rb8jxnsue8utWBMawTCtPzFXYk189xgfg9cv0jmiD12pGZVKzDzgUrfPywHjL ClOtfC6K2Zfi2arPetASSFNbP7Tsi9vnReFVCv2JTutMlWKnY++ISsP/2Re2ictyodXZ2w0 SAD9YWHIX9kGFNyIXYTRg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:fR+z7fvbivg=:0KzooreoqdGQSzUPfxl21R jFrL/rgyPgbhpTKFZNQMKZ/lukw8VFigIOSVr3wXgTAoDR8qF2I/X1Z+6AAe/ihJLOs3EmCtW gnDZOQG81j3SKOdEbYRWKIudOVQCcQEXUx3p1qCQJ5LFrLzAJf84UNb+w+ehrbaLa8qILCMTv g83hGCTEANAl5PW1nD62TtPsWHUaClGMj6SvH5bfuxL04RIRpNSXzVaNz0Dev1sxL/HxOFMeG kSDiwmoSsTrL2oRc1Xkgf3W9Cv5FqxOg1uWTwf4uPTchsAlgvyduJAhLG8e1XeeCZ9y8Bfnec 1cNlkmD/KpL/vTsJg2D5bEiI6AW0uc/XMWc38K9DimIMM30jGLDFfz6kL6a38YP+7Wj1rz30x 72OBKfdhXNtjGsSyvztUJfbWURpFSN2Jyh+vn/QNb6MZIAbWRviSYX0Ue78gnXd03lUeu38Hn m2rt9NP8kYAkAQxDQhTUHVV73c24vfofZLeHRIdC0IxoXjo1uwPr+LJaMwEd7FICHSnnIR/n5 rXbeFfxJ7HTyIz3WZRom+tEXyQpvW8+2syRLANEkQbuklYmGHAmNtlOy0TOFZ/13G954Cue0j HG/KeWQrnZzxoNE/PWEckHCRe3CqgIIgMsV9bgCfOfxSQHHsLm29k80ux1nbObtw3zeMDBOcL rVaQV3OhO2DF6Ean5ZoFtHA8gadqZ7S098Cd3bNZh/ES8oRrnia8F//0xpEUpEkVQh2IcyJmi LCNNSyEIvyK75ImuoocYuuXb+ST716znBmCO19gz8fQwW+hYoy/+soaus+ZvkfeVXEfj0ibdV l91DTbHR6J9Yd3ZxZD+DPCh/9DjVxJyzZyZ/35/rIVBuhsffezeGzc5pK24rwjMMQQhxX3vmd r/8NBeWN6ohypww7v2kt3NAl/TYAlZoPch03IKXxmY/2K52VyfUNulbDxpcsdxTDG/CIj/Jot VMNN+uZDISEoKprycc77Y4yd3jv4qNWKBPtuIXWAGPVmmCY+MJdUYpuTfARbkWU/VLAeYwijW 6BW36M8OOTJUnFTvl6U31Pp1e5heW9kgrOD1Es+hyAUA4Ix7bm4Z4huxDGCkpI4mDHp8wv5VK N1DCjLrpCetlNg7KFS+6gjz/5bmA1OHdqJBei3luEfOTAidBDk5IfDHsg== Received-SPF: pass client-ip=212.227.17.22; envelope-from=Wolfgang.Scherer@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit 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.4 (--) Steps to reproduce: * invoke emacs 29.0.50 (or any earlier version) with -Q, * open a file under versino control with SRC backend, * perform some modifications * produce a diff with |C-x v =3D| |--- update-emacs-init.sh (r4) +++ update-emacs-init.sh (workfile) @@ -414= ,10 +414,41 @@ REMOVED_DIST_LOCAL_SITE_LISP=3D' +csharpmode.el +dvc +tex-s= ite-000.el tex-site.el -tex-site-000.el | The file names are annotated with the revsions in parentheses. Pressing RETURN on any line prompts for the file to be used: Use file /=E2=80=A6/update-emacs-init.sh (workfile): /=E2=80=A6/update-emacs-init.sh (workfile) However, the expected behavior is for |diff-find-file-name| to correctly d= educe the file name. Here is a sample advice, which solves the problem. It is just a hint as to why the filename recognition fails: |(defcustom vcx-diff-filename-remove-src-revison-always nil "If nil, only = remove parenthesized revision from diff file names, if VC backend is SRC."= :type 'boolean :group 'vc) (defun vcx-diff-filename-remove-src-revision (= file) "Remove parenthesized revision from diff file name. Depending on `vc= x-diff-filename-remove-src-revison-always', this is done only if the VC ba= ckend is SRC, or unconditionally." (or (and file (or vcx-diff-filename-rem= ove-src-revison-always (eq 'SRC (or diff-vc-backend (vc-responsible-backen= d ".")))) (save-match-data (let ((pos (string-match "\\( ([^)]*)\\)\\'" fi= le ))) (if pos (substring file 0 pos))))) file)) (defadvice diff-filename-= drop-dir (around vcx-diff-fn-rm-src-rev activate) "Also remove parenthesiz= ed revision from diff file names. Calls `vcx-diff-filename-remove-src-revi= sion' with the result of `diff-filename-drop-dir' or the original argument= ." (let ((file (ad-get-arg 0))) ad-do-it (setq ad-return-value (vcx-diff-f= ilename-remove-src-revision (or ad-return-value file))))) | In GNU Emacs 29.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.33, cairo version 1.16.0) of 2022-08-27 built on franke Repository revision: c1442f96db64d545007f25995596b399f638e399 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12101003 System Description: Ubuntu 22.04.1 LTS Configured features: ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS WEBP X11 XDBE XIM XINPUT2 XPM GTK3 ZLIB Important settings: value of $LANG: de_DE.UTF-8 locale-coding-system: utf-8-unix Major mode: Lisp Interaction Minor modes in effect: tooltip-mode: t global-eldoc-mode: t eldoc-mode: t show-paren-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t line-number-mode: t indent-tabs-mode: t transient-mark-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message mailcap yank-media puny dired dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc6068 epg-config gnus-util text-property-search time-date subr-x mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader cl-loaddefs cl-lib sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils rmc iso-transl tooltip eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic indonesian philippine 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 composite emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget keymap hashtable-print-readable backquote threads dbusbind inotify lcms2 dynamic-setting system-font-setting font-render-setting cairo move-toolbar gtk x-toolkit xinput2 x multi-tty make-network-process emacs) Memory information: ((conses 16 44930 7772) (symbols 48 6825 0) (strings 32 15965 1116) (string-bytes 1 425965) (vectors 16 9347) (vector-slots 8 154336 14252) (floats 8 22 22) (intervals 56 530 0) (buffers 1000 11)) =E2=80=8B