GNU logs - #68443, boring messages

Message sent to bug-gnu-emacs@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: bug#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted file.
Resent-From: Aleksandr Vityazev <avityazev@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 14 Jan 2024 08:01:03 +0000
Resent-Message-ID: <handler.68443.B.170521924629551 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 68443
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: 
To: 68443 <at> debbugs.gnu.org
X-Debbugs-Original-To: bug-gnu-emacs@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.170521924629551
          (code B ref -1); Sun, 14 Jan 2024 08:01:03 +0000
Received: (at submit) by debbugs.gnu.org; 14 Jan 2024 08:00:46 +0000
Received: from localhost ([127.0.0.1]:41604 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rOvQC-0007eh-Qa
	for submit <at> debbugs.gnu.org; Sun, 14 Jan 2024 03:00:46 -0500
Received: from lists.gnu.org ([2001:470:142::17]:42062)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <avityazev@HIDDEN>) id 1rOeV3-0002Iq-JY
 for submit <at> debbugs.gnu.org; Sat, 13 Jan 2024 08:56:38 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <avityazev@HIDDEN>)
 id 1rOeUs-00026e-V5
 for bug-gnu-emacs@HIDDEN; Sat, 13 Jan 2024 08:56:27 -0500
Received: from layka.disroot.org ([178.21.23.139])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <avityazev@HIDDEN>)
 id 1rOeUo-0000Wh-Da
 for bug-gnu-emacs@HIDDEN; Sat, 13 Jan 2024 08:56:25 -0500
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 83875418E1
 for <bug-gnu-emacs@HIDDEN>; Sat, 13 Jan 2024 14:56:18 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from layka.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id doaIGeymZbk2 for <bug-gnu-emacs@HIDDEN>;
 Sat, 13 Jan 2024 14:56:17 +0100 (CET)
From: Aleksandr Vityazev <avityazev@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1705154177; bh=Bvt8sRWOC7zwGZaRQKKxCHCVk3QPR0NgSg9Al7WUqNM=;
 h=From:To:Subject:Date;
 b=h4yE/iQKG3Dn/cX0NWOtOVSvxreAyHmyEyt6U9KickerZT3U2AOUuvLRq7MrGidBF
 DJVb+L4KdI8DFKc3z33Epn94RMnbFuPfmuOab/Y106DALYhQfbYuiapF0Dp17Nb/QV
 d/EC1Al+z/vTveD4EltPvWlbvS+lpOMT7urt+K+ed+eTN1k+TrUlNHFD8S9eVZlcTJ
 6GqihvG/T2LmWS8zlrZ1MEeRpWipK7fFJ8EyI6/wdvWsfGszpmwCRKjSG/EymW7sZp
 4rIzXwtv4KMncQBJ7thnEHgrsuA9sM3r7BDkdVOldC4MZO0o9rhZB1j3nHzCo9l4tB
 StRJIi0E0FDzw==
Date: Sat, 13 Jan 2024 16:56:15 +0300
Message-ID: <874jfhe3r4.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
Received-SPF: pass client-ip=178.21.23.139; envelope-from=avityazev@HIDDEN;
 helo=layka.disroot.org
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: 0.9 (/)
X-Mailman-Approved-At: Sun, 14 Jan 2024 03:00:40 -0500
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

Hi,

Steps to reproduce with emacs -q:

1. Enter git repository;
2. vc-delete-file some file;
3. vc-root-diff;
4. From *vc-diff* buffer vc-next-action;
5. In *vc-log* write summary and invoke vc-next-action;
6. get error (wrong-type-argument stringp nil)

Full backtrace:

Debugger entered--Lisp error: (wrong-type-argument stringp nil)
  file-directory-p(nil)
  #f(compiled-function (files comment) #<bytecode 0x1e31e0a127714b22>)((#(".gitignore" 0 10 (fontified t face (diff-file-header diff-header))) #("buffer.c" 0 8 (fontified t face (diff-file-header diff-header))) nil) #("Summary: Delete file.\n" 0 8 (jit-lock-defer-multiline t face log-edit-header fontified t field header) 8 9 (jit-lock-defer-multiline t fontified t field header) 9 21 (jit-lock-defer-multiline t face log-edit-summary fontified t field header) 21 22 (fontified t)))
  vc-finish-logentry()
  funcall-interactively(vc-finish-logentry)
  log-edit-done()
  funcall-interactively(log-edit-done)
  command-execute(log-edit-done)



In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version
3.24.37, cairo version 1.16.0)
System Description: Guix System

Configured using:
 'configure
 CONFIG_SHELL=/gnu/store/v9p25q9l5nnaixkhpap5rnymmwbhf9rp-bash-minimal-5.1.16/bin/bash
 SHELL=/gnu/store/v9p25q9l5nnaixkhpap5rnymmwbhf9rp-bash-minimal-5.1.16/bin/bash
 --prefix=/gnu/store/bm7n1h9d8x05wwbk727gckmwgf99whlv-emacs-rrr-next-30.0.50-46.d376462
 --enable-fast-install --with-pgtk --without-libsystemd
 --with-tree-sitter --with-native-compilation --with-cairo
 --with-modules --with-native-compilation=aot --disable-build-details'

Configured features:
ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG
JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 MODULES NATIVE_COMP
NOTIFY INOTIFY PDUMPER PGTK PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF
TOOLKIT_SCROLL_BARS TREE_SITTER WEBP XIM GTK3 ZLIB

Important settings:
  value of $EMACSLOADPATH: /home/user/.guix-home/profile/share/emacs/site-lisp:/gnu/store/bm7n1h9d8x05wwbk727gckmwgf99whlv-emacs-rrr-next-30.0.50-46.d376462/share/emacs/30.0.50/lisp
  value of $EMACSNATIVELOADPATH: /home/user/.guix-home/profile/lib/emacs/native-site-lisp
  value of $LANG: en_US.utf8
  locale-coding-system: utf-8-unix

Major mode: Debbugs

Minor modes in effect:
  header-line-indent-mode: t
  telega-adblock-mode: t
  telega-x-mode: t
  global-telega-mnz-mode: t
  telega-root-auto-fill-mode: t
  telega-active-video-chats-mode: t
  telega-active-locations-mode: t
  telega-patrons-mode: t
  telega-active-stories-mode: t
  server-mode: t
  eros-mode: t
  envrc-global-mode: t
  envrc-mode: t
  savehist-mode: t
  electric-pair-mode: t
  midnight-mode: t
  global-so-long-mode: t
  company-posframe-mode: t
  global-company-mode: t
  company-mode: t
  fancy-battery-mode: t
  reverse-im-mode: t
  global-guix-prettify-mode: t
  vertico-mode: t
  marginalia-mode: t
  mood-line-mode: t
  global-auto-revert-mode: t
  save-place-mode: t
  recentf-mode: t
  pixel-scroll-precision-mode: t
  tooltip-mode: t
  global-eldoc-mode: t
  show-paren-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  minibuffer-regexp-mode: t
  buffer-read-only: t
  column-number-mode: t
  line-number-mode: t
  transient-mark-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t

Load-path shadows:
/gnu/store/pgshdvjd1d05x4rs0bs7wg1rxh39qzac-emacs-soap-client-3.2.3/share/emacs/site-lisp/soap-client-3.2.3/soap-inspect hides /gnu/store/bm7n1h9d8x05wwbk727gckmwgf99whlv-emacs-rrr-next-30.0.50-46.d376462/share/emacs/30.0.50/lisp/net/soap-inspect
/gnu/store/pgshdvjd1d05x4rs0bs7wg1rxh39qzac-emacs-soap-client-3.2.3/share/emacs/site-lisp/soap-client-3.2.3/soap-client hides /gnu/store/bm7n1h9d8x05wwbk727gckmwgf99whlv-emacs-rrr-next-30.0.50-46.d376462/share/emacs/30.0.50/lisp/net/soap-client

Features:
(shadow nndoc debbugs-gnu debbugs-compat debbugs soap-client rng-xsd
rng-dt rng-util xsd-regexp av-guix plz guix-ui-package guix-license
guix-ui-store-item guix-package guix-location sh-script smie treesit
cc-mode cc-fonts cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine
cc-vars cc-defs tar-mode arc-mode archive-mode display-line-numbers
transmission calc-bin calc-ext calc calc-loaddefs calc-macs link-hint
smiley textsec uni-scripts idna-mapping ucs-normalize uni-confusable
textsec-check gnus-bcklg sort gnus-ml disp-table qp epa-file nnmaildir
nnfolder nnnil av-message ace-window face-remap telega-adblock telega-x
ol-telega telega-mnz telega-dired-dwim telega-obsolete telega
telega-tdlib-events telega-webpage telega-root emacsbug consult-xref
mm-archive network-stream url-http url-gw nsm url-auth multitran ispell
log-edit add-log goto-addr rect find-dired consult-imenu dabbrev
smerge-mode diff pulsar pulse jka-compr gnus-async gnus-cite gnus-cus
gnus-demon gnus-diary nndiary gnus-draft gnus-agent nnvirtual nntp
gnus-cache nndraft nnmh gnus-dup gnus-fun gnus-html url-queue url-cache
mm-url gnus-kill gnus-logic gnus-mh mh-comp mh-scan mh-gnus mh-e
mh-buffers mh-loaddefs gnus-registry registry eieio-base rmailsum rmail
gnus-salt gnus-score score-mode gnus-srvr gnus-topic gnus-uu yenc
gnus-vm nnselect copyright executable hl-line dired-x diff-hl-dired
gnus-dired denote project-rg rg rg-info-hack rg-menu rg-ibuffer
rg-result wgrep-rg wgrep rg-history rg-header ibuf-ext ibuffer
ibuffer-loaddefs grep misearch multi-isearch av-vc guix-devel
edit-indirect guix-misc guix-ui guix-ui-messages bui bui-list bui-info
bui-entry bui-core bui-history bui-button guix-read guix-help-vars
guix-repl guix-profiles guix-external guix-config guix-build-config
guix-geiser geiser-mode geiser-xref geiser-compile guix-guile
geiser-guile info-look info transient edmacro kmacro geiser geiser-debug
geiser-repl geiser-image geiser-capf geiser-doc geiser-menu
geiser-autodoc geiser-edit etags fileloop xref geiser-completion
geiser-eval geiser-connection tq geiser-syntax geiser-impl geiser-log
geiser-popup view geiser-custom geiser-base al-scheme arei arei-nrepl
queue sesman scheme tramp-cmds autoinsert embark-org embark-consult
embark consult mail-extr gnus-msg gnus-art mm-uu mml2015 mm-view
mml-smime smime gnutls dig gnus-sum shr pixel-fill kinsoku url-file
gnus-group gnus-undo gnus-start gnus-dbus gnus-cloud nnimap nnmail
mail-source utf7 nnoo gnus-spec gnus-int gnus-range gnus-win message
sendmail yank-media rfc822 mml mml-sec epa epg rfc6068 epg-config
mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045
ietf-drums mailabbrev gmm-utils mailheader gnus nnheader gnus-util
mail-utils range mm-util mail-prsvr cl-print telega-match telega-info
telega-chat visual-fill-column telega-modes image-mode exif
telega-filter telega-sort telega-company telega-emoji telega-user
telega-notifications telega-voip telega-ins telega-folders telega-inline
telega-msg telega-story telega-tme telega-sticker telega-i18n
telega-vvnote telega-util telega-topic rainbow-identifiers org-element
org-persist org-id org-refile avl-tree generator org ob ob-tangle ob-ref
ob-lob ob-table ob-exp org-macro org-src ob-comint org-pcomplete
org-list org-footnote org-faces org-entities noutline outline
ob-emacs-lisp ob-core ob-eval org-cycle org-table ol org-fold
org-fold-core org-keys oc org-loaddefs org-version org-compat org-macs
dired-aux color puny bindat telega-ffplay telega-media telega-tdlib
telega-server telega-core telega-customize svg dom cursor-sensor
dired-subtree dired-hacks-utils dired dired-loaddefs mule-util
vertico-repeat help-fns radix-tree server time av-skempo skempo tempo
skeleton mode-local derived package-lint-flymake package-lint let-alist
imenu finder finder-inf find-func lisp-mnt package browse-url url
url-proxy url-privacy url-expand url-methods url-history url-cookie
generate-lisp-file url-domsuf url-util mailcap url-handlers eros
flymake-guile flymake tramp-sh project diff-hl log-view pcvs-util vc-dir
ewoc vc debbugs-browse bug-reference envrc inheritenv savehist elec-pair
ffap midnight so-long company-files company-keywords
company-dabbrev-code company-dabbrev company-capf company-posframe
posframe company pcase thingatpt detached tramp-cache time-stamp tramp
trampver tramp-integration files-x tramp-message tramp-compat shell
pcomplete parse-time iso8601 time-date format-spec auth-source-pass
url-parse url-vars auth-source eieio password-cache json map byte-opt
tramp-loaddefs notifications appt diary-lib diary-loaddefs cal-menu
calendar cal-loaddefs fancy-battery battery dbus compile comint ansi-osc
ansi-color xml reverse-im cus-start avy quail guix-prettify guix-utils
bui-utils dash guix-auto-mode guix inspector-autoloads
graphql-ts-mode-autoloads devicetree-ts-mode-autoloads
ts-query-highlight-autoloads try-autoloads tmr-autoloads queue-autoloads
sesman-autoloads arei-autoloads pulsar-autoloads oauth2-autoloads
shikimori-autoloads al-scheme-autoloads av-autoloads hl-todo-autoloads
async-autoloads with-editor-autoloads password-store-autoloads
company-ebdb-autoloads ebdb-autoloads eieio-core cl-macs
ledger-mode-autoloads rde-ledger-autoloads plz-autoloads srht-autoloads
soap-client-autoloads debbugs-autoloads rde-gnus-autoloads
rde-browse-url-autoloads emms-autoloads rde-emms-autoloads
mastodon-alt-autoloads ts-autoloads persist-autoloads request-autoloads
mastodon-autoloads telega-x-autoloads telega-contrib-autoloads
rainbow-identifiers-autoloads visual-fill-column-autoloads
telega-autoloads rde-telega-autoloads rde-message-autoloads
denote-autoloads rde-denote-autoloads sdcwoc-autoloads
multitran-autoloads info-colors-autoloads esh-help-autoloads
elisp-demos-autoloads olivetti-autoloads kv-autoloads esxml-autoloads
nov-el-autoloads saveplace-pdf-view-autoloads tablist-autoloads
pdf-tools-autoloads rde-pdf-tools-autoloads daemons-autoloads
cuirass-autoloads magit-popup-autoloads edit-indirect-autoloads
bui-autoloads guix-autoloads rde-guix-autoloads geiser-guile-autoloads
geiser-autoloads diff-hl-autoloads agitate-autoloads
git-timemachine-autoloads git-link-autoloads rde-git-autoloads
package-lint-autoloads eros-autoloads rde-elisp-autoloads
flymake-guile-autoloads rde-flymake-autoloads ace-window-autoloads
wgrep-autoloads rg-autoloads project-rg-autoloads rde-project-autoloads
reverse-im-autoloads fancy-battery-autoloads sudo-edit-autoloads
rde-tramp-autoloads s-autoloads f-autoloads eimp-autoloads
dired-hacks-autoloads rde-dired-autoloads eshell-prompt-extras-autoloads
eshell-syntax-highlighting-autoloads rde-eshell-autoloads
rde-comint-autoloads detached-autoloads skempo-autoloads
rde-abbrev-autoloads link-hint-autoloads avy-autoloads
vertico-x-autoloads vertico-autoloads consult-autoloads
posframe-autoloads company-posframe-autoloads company-autoloads
pcmpl-args-autoloads marginalia-autoloads orderless-autoloads
rde-completion-autoloads almost-mono-white-autoloads mood-line-autoloads
rde-startup-autoloads rde-keymaps-autoloads rde-emacs-base-autoloads
rde-compile-autoloads rde-mpv-autoloads rde-sway-autoloads
rde-fonts-autoloads feature-loader-autoloads feature-loader rde-pass
rde-ebdb rde-ledger rde-tab-bar rde-srht rde-debbugs rde-gnus
rde-browse-url rde-emms rde-mastodon rde-telega rde-message rde-denote
rde-spelling rde-info rde-help rde-nov-el rde-pdf-tools
saveplace-pdf-view bookmark text-property-search rde-xref rde-guix
rde-geiser rde-git vc-git diff-mode easy-mmode vc-dispatcher rde-elisp
rde-flymake rde-eglot rde-window-ace rde-project rde-input-method
rde-battery rde-calendar rde-tramp rde-dired rde-eshell rde-comint
rde-proced rde-detached rde-shell rde-abbrev rde-avy rde-vertico
vertico-x vertico rde-completion marginalia compat orderless rde-window
rde-appearance almost-mono-white-theme almost-mono-themes mood-line
rde-emacs-base autorevert filenotify advice cap-words superword subword
saveplace recentf tree-widget rde-keymaps rde-compile rde-envrc
rde-bluetooth rde-transmission rde-mpv rde-sway comp cl-seq comp-cstr
cl-extra help-mode warnings gv comp-run bytecomp byte-compile
comp-common rx rde-fonts xdg fontaine rde-networking
inheritenv-autoloads envrc-autoloads dash-autoloads bluetooth-autoloads
transmission-autoloads mpv-autoloads compat-autoloads embark-autoloads
sway-autoloads fontaine-autoloads eiwc-autoloads guix-emacs cus-edit pp
cus-load icons wid-edit cl-loaddefs cl-lib pixel-scroll cua-base ring
subr-x rmc iso-transl tooltip cconv eldoc paren electric uniquify
ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/pgtk-win
pgtk-win term/common-win pgtk-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 theme-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 dynamic-setting system-font-setting
font-render-setting cairo gtk pgtk lcms2 multi-tty move-toolbar
make-network-process native-compile emacs)

Memory information:
((conses 16 2744491 768129) (symbols 48 78765 35)
 (strings 32 475567 143689) (string-bytes 1 12851799)
 (vectors 16 146471) (vector-slots 8 3443702 186575)
 (floats 8 214860 2010) (intervals 56 51972 7189) (buffers 992 86))


-- 
Best regards,
Aleksandr Vityazev

Message sent:


Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Aleksandr Vityazev <avityazev@HIDDEN>
Subject: bug#68443: Acknowledgement (30.0.50; Cannot commit from *vc-diff*
 if there is a deleted file.)
Message-ID: <handler.68443.B.170521924629551.ack <at> debbugs.gnu.org>
References: <874jfhe3r4.fsf@HIDDEN>
X-Gnu-PR-Message: ack 68443
X-Gnu-PR-Package: emacs
Reply-To: 68443 <at> debbugs.gnu.org
Date: Sun, 14 Jan 2024 08:01:04 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 bug-gnu-emacs@HIDDEN

If you wish to submit further information on this problem, please
send it to 68443 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
68443: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D68443
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to bug-gnu-emacs@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: bug#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted file.
Resent-From: Dmitry Gutov <dmitry@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 17 Jan 2024 04:26:01 +0000
Resent-Message-ID: <handler.68443.B68443.17054655488836 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68443
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: 
To: Aleksandr Vityazev <avityazev@HIDDEN>, 68443 <at> debbugs.gnu.org
Received: via spool by 68443-submit <at> debbugs.gnu.org id=B68443.17054655488836
          (code B ref 68443); Wed, 17 Jan 2024 04:26:01 +0000
Received: (at 68443) by debbugs.gnu.org; 17 Jan 2024 04:25:48 +0000
Received: from localhost ([127.0.0.1]:50341 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rPxUq-0002IR-HD
	for submit <at> debbugs.gnu.org; Tue, 16 Jan 2024 23:25:48 -0500
Received: from out4-smtp.messagingengine.com ([66.111.4.28]:43475)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dmitry@HIDDEN>) id 1rPxUn-0002IB-JQ
 for 68443 <at> debbugs.gnu.org; Tue, 16 Jan 2024 23:25:47 -0500
Received: from compute7.internal (compute7.nyi.internal [10.202.2.48])
 by mailout.nyi.internal (Postfix) with ESMTP id 4C2455C017C;
 Tue, 16 Jan 2024 23:25:38 -0500 (EST)
Received: from mailfrontend1 ([10.202.2.162])
 by compute7.internal (MEProxy); Tue, 16 Jan 2024 23:25:38 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc
 :content-transfer-encoding:content-type:content-type:date:date
 :from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to; s=fm1; t=1705465538;
 x=1705551938; bh=5tDT9H4xeDyZjNKZ4MdfQwp+5F4aSbJjpBJ3b0Mx6+8=; b=
 MKV5y7XbyPi2V96XDytq98824JHeC+X332lW4bHbtRnkatx1jWh/seIFMCQBWEXA
 xteBMhMlrzoTIeq24vyqdghMUqZ3HkFO0xRMhxsWkmp3aB17BJ2YupH8RhGOqvrE
 2NpT8BVp6IXv43XLlYHNkxBVJxoeBzIbEohSB9KZC7NZ4uIuev+e/rXtagOG/XWX
 J3F45nT9E99/9/pFVo/M4UAE5BhrRzJugswuE31OgQcrS1LRAgWvsuwNxr6HV+aj
 SDK4JcJcA8Hp9b6Zkd9tueyQflys0Z5Y7aYlHSkvl8GkoNwCFPluS4HdEGtlxwmE
 i2sfy/k4tUId/1GIHnPxcg==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:content-transfer-encoding:content-type
 :content-type:date:date:feedback-id:feedback-id:from:from
 :in-reply-to:in-reply-to:message-id:mime-version:references
 :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy
 :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1705465538; x=
 1705551938; bh=5tDT9H4xeDyZjNKZ4MdfQwp+5F4aSbJjpBJ3b0Mx6+8=; b=r
 xmZoNNKy4EtdmmUuJx5beo9604AUq0xajoVexKYjdlwSXbW5lceg0kjVr93iuAOW
 UoD8zS1MKGqtVR5Rto8fl0YVwWo7de2Hoi95g2GPAZ3U5EI4AHYA864uD5zv9p9A
 VGfNIZjhxMUcYRNZPk9rQkKJzCw2DV2MqU1DjoH7MkTsLMuaWuiLn5/Vx9HTgFQ3
 5huUTu1gQRtUJ+D+GjMsiYmMvZ5pVFr2AkA1sOs5rJMGbYsvcBaMws8x1hDMfD8E
 t2oYDVcuXE9dJE+s/xTxPH1c4G45jUK/bjD4cZI7XD3NYY+U/srm4qEBZl6qcX4/
 cyN0xjjR2km2fSd/p4qkw==
X-ME-Sender: <xms:wVanZWFB742k0_wpP38JhF_8ZFKs64kgXIdlXR7hB0DK-a98cy325w>
 <xme:wVanZXUY_g7s_Z4QRzZcRMmKeAQf1S3Klbj2ghdWnkle1vT9VAfumE_3UF03yWZT2
 WMoJCr445KhFmID-gA>
X-ME-Received: <xmr:wVanZQLgZaUtuG9OhB_Jfj2JPKBE6VpcwCcFZeJpijGbSeCaFyL5d5dCcj-BZUx9yLOjZw>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejgedgieelucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
 uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
 cujfgurhepkfffgggfuffvfhfhjggtgfesthejredttddvjeenucfhrhhomhepffhmihht
 rhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrghtth
 gvrhhnpedthfeuvddtveelgeeuleevvdejveehffevveehvdeuffdtfefhvdeugefgtefg
 tdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegumh
 hithhrhiesghhuthhovhdruggvvh
X-ME-Proxy: <xmx:wVanZQGZXXZgp9U4I5RTco0NyWHz74ppykz1z8iodNLn9kTtyfoRSQ>
 <xmx:wVanZcXPgKTBLuiJ1w4BGz9GR8CpnPobobZvIgubF7QOdkjoMet68A>
 <xmx:wVanZTMRBqZYvStnvV28eqGGsRPKVlGOZ9Bz1za2z-Iy7Wj5KcmVCA>
 <xmx:wlanZVc72l7pAAAYKROZx-cgRMAqqA4iAEMM4fsz2XkH7kV7aR96tg>
Feedback-ID: i0e71465a:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue,
 16 Jan 2024 23:25:36 -0500 (EST)
Message-ID: <9dfe6be4-afa8-430e-a45e-e651c479cb81@HIDDEN>
Date: Wed, 17 Jan 2024 06:25:34 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Content-Language: en-US
References: <874jfhe3r4.fsf@HIDDEN>
From: Dmitry Gutov <dmitry@HIDDEN>
In-Reply-To: <874jfhe3r4.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi! Thanks for the report.

On 13/01/2024 15:56, Aleksandr Vityazev via Bug reports for GNU Emacs, 
the Swiss army knife of text editors wrote:
> Hi,
> 
> Steps to reproduce with emacs -q:
> 
> 1. Enter git repository;
> 2. vc-delete-file some file;
> 3. vc-root-diff;
> 4. From *vc-diff* buffer vc-next-action;
> 5. In *vc-log* write summary and invoke vc-next-action;
> 6. get error (wrong-type-argument stringp nil)
> 
> Full backtrace:
> 
> Debugger entered--Lisp error: (wrong-type-argument stringp nil)
>    file-directory-p(nil)
>    #f(compiled-function (files comment) #<bytecode 0x1e31e0a127714b22>)((#(".gitignore" 0 10 (fontified t face (diff-file-header diff-header))) #("buffer.c" 0 8 (fontified t face (diff-file-header diff-header))) nil) #("Summary: Delete file.\n" 0 8 (jit-lock-defer-multiline t face log-edit-header fontified t field header) 8 9 (jit-lock-defer-multiline t fontified t field header) 9 21 (jit-lock-defer-multiline t face log-edit-summary fontified t field header) 21 22 (fontified t)))
>    vc-finish-logentry()
>    funcall-interactively(vc-finish-logentry)
>    log-edit-done()
>    funcall-interactively(log-edit-done)
>    command-execute(log-edit-done)

Try the patch below, seems to work here:

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 03efe0fdb31..83d580d98dd 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -3014,7 +3014,7 @@ diff-vc-deduce-fileset
        (goto-char (point-min))
        (while (progn (diff-file-next) (not (eobp)))
          (push (diff-find-file-name nil t) files)))
-    (list backend (nreverse files) nil nil 'patch)))
+    (list backend (delete nil (nreverse files)) nil nil 'patch)))

  (defun diff--filter-substring (str)
    (when diff-font-lock-prettify


(Eli, would this be suitable for emacs-29?)

Message sent to bug-gnu-emacs@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: bug#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted file.
Resent-From: Aleksandr Vityazev <avityazev@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 17 Jan 2024 10:57:02 +0000
Resent-Message-ID: <handler.68443.B68443.170548897628746 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68443
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: 
To: Dmitry Gutov <dmitry@HIDDEN>
Cc: 68443 <at> debbugs.gnu.org
Received: via spool by 68443-submit <at> debbugs.gnu.org id=B68443.170548897628746
          (code B ref 68443); Wed, 17 Jan 2024 10:57:02 +0000
Received: (at 68443) by debbugs.gnu.org; 17 Jan 2024 10:56:16 +0000
Received: from localhost ([127.0.0.1]:50946 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rQ3ai-0007Ta-Ez
	for submit <at> debbugs.gnu.org; Wed, 17 Jan 2024 05:56:16 -0500
Received: from layka.disroot.org ([178.21.23.139]:35474)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <avityazev@HIDDEN>) id 1rQ3ag-0007TQ-Bp
 for 68443 <at> debbugs.gnu.org; Wed, 17 Jan 2024 05:56:15 -0500
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id DB55440EBE;
 Wed, 17 Jan 2024 11:56:11 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from layka.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id kBpb77jT3Av7; Wed, 17 Jan 2024 11:56:11 +0100 (CET)
From: Aleksandr Vityazev <avityazev@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1705488971; bh=tNe/R8WwhCiuPGzrs0FEReux2j8L4NeGY0Z50DGEjpU=;
 h=From:To:Cc:Subject:In-Reply-To:References:Date;
 b=b/GvY9J3g0cMCtMlOnlaBajme0uTi0vKhNLM7pifwQSW69nM7krfqC/6pGPI4Nevz
 SEkD+6bygRoxVneNEjsISlMdcBPyXKvDjAILnb20FEl12jUMjHTwIqzezexVqXVjy7
 W3WQ1RNuZZopaXSgRXR6Z+ZPtD2K8ZFejpC6tTVjqmaKyDYD0MMpZcWHRCV4x402In
 WypgB7EwScsGTULO+qwY7ow9O3MhifVw9mmoGGv6y9bHVThW2OQQZCdylwjPv+q1m5
 8U8+rXJkYGNg/M7Q3n75ULM4cdlEwnvhHIwIFE9IiMCJoRa9pNv4yOIWl/jQCeCcdT
 7NwLMmlHoMvNg==
In-Reply-To: <9dfe6be4-afa8-430e-a45e-e651c479cb81@HIDDEN> (Dmitry Gutov's
 message of "Wed, 17 Jan 2024 06:25:34 +0200")
References: <874jfhe3r4.fsf@HIDDEN>
 <9dfe6be4-afa8-430e-a45e-e651c479cb81@HIDDEN>
Date: Wed, 17 Jan 2024 13:56:08 +0300
Message-ID: <877ck82ppz.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

On 2024-01-17 06:25, Dmitry Gutov wrote:

> Hi! Thanks for the report.
>
> On 13/01/2024 15:56, Aleksandr Vityazev via Bug reports for GNU Emacs,
> the Swiss army knife of text editors wrote:
>> Hi,
>> Steps to reproduce with emacs -q:
>> 1. Enter git repository;
>> 2. vc-delete-file some file;
>> 3. vc-root-diff;
>> 4. From *vc-diff* buffer vc-next-action;
>> 5. In *vc-log* write summary and invoke vc-next-action;
>> 6. get error (wrong-type-argument stringp nil)
>> Full backtrace:
>> Debugger entered--Lisp error: (wrong-type-argument stringp nil)
>>    file-directory-p(nil)
>>    #f(compiled-function (files comment) #<bytecode
>> 0x1e31e0a127714b22>)((#(".gitignore" 0 10 (fontified t face
>> (diff-file-header diff-header))) #("buffer.c" 0 8 (fontified t face
>> (diff-file-header diff-header))) nil) #("Summary: Delete file.\n" 0
>> 8 (jit-lock-defer-multiline t face log-edit-header fontified t field
>> header) 8 9 (jit-lock-defer-multiline t fontified t field header) 9
>> 21 (jit-lock-defer-multiline t face log-edit-summary fontified t
>> field header) 21 22 (fontified t)))
>>    vc-finish-logentry()
>>    funcall-interactively(vc-finish-logentry)
>>    log-edit-done()
>>    funcall-interactively(log-edit-done)
>>    command-execute(log-edit-done)
>
> Try the patch below, seems to work here:
>
> diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
> index 03efe0fdb31..83d580d98dd 100644
> --- a/lisp/vc/diff-mode.el
> +++ b/lisp/vc/diff-mode.el
> @@ -3014,7 +3014,7 @@ diff-vc-deduce-fileset
>        (goto-char (point-min))
>        (while (progn (diff-file-next) (not (eobp)))
>          (push (diff-find-file-name nil t) files)))
> -    (list backend (nreverse files) nil nil 'patch)))
> +    (list backend (delete nil (nreverse files)) nil nil 'patch)))

Yes with this patch the error is no longer present, but the deleted file
is not displayed in the *log-edit-files* buffer, unlike if you run
vc-next-action from *vc-dir*. Although this is another bug report.

>  (defun diff--filter-substring (str)
>    (when diff-font-lock-prettify
>
>
> (Eli, would this be suitable for emacs-29?)
>

-- 
Best regards,
Aleksandr Vityazev

Message sent to bug-gnu-emacs@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: bug#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted file.
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 17 Jan 2024 11:35:02 +0000
Resent-Message-ID: <handler.68443.B68443.170549129032202 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68443
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: 
To: Dmitry Gutov <dmitry@HIDDEN>
Cc: 68443 <at> debbugs.gnu.org, avityazev@HIDDEN
Received: via spool by 68443-submit <at> debbugs.gnu.org id=B68443.170549129032202
          (code B ref 68443); Wed, 17 Jan 2024 11:35:02 +0000
Received: (at 68443) by debbugs.gnu.org; 17 Jan 2024 11:34:50 +0000
Received: from localhost ([127.0.0.1]:50977 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rQ4C1-0008NK-JU
	for submit <at> debbugs.gnu.org; Wed, 17 Jan 2024 06:34:49 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:59510)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1rQ4By-0008N5-R0
 for 68443 <at> debbugs.gnu.org; Wed, 17 Jan 2024 06:34:47 -0500
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 <eliz@HIDDEN>)
 id 1rQ4Bs-0005Kg-4o; Wed, 17 Jan 2024 06:34:40 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=uqLyd0C1wuyaIkvxkPbqt6w2oITAPMCR0wcYRJFDkMA=; b=PdO1GrJRdDeo
 kzfSMw1elUB7Zn9rLKAKFcGPR2+v4gm78+OkfKBrMLBWD1johMd8oOfA9Hj7OfYBBuwQWqiVh5Sri
 30x6is/NH79WpXjPKL0ZHoMbcCzeJ3G6LP4IKQyAtE+57tSQaJUKV6obyGATbUz31mpLGrre8RzZn
 YRakyGmBnUw4/w9SaTPHQRphiJ6Fs3Np2IjOgeClTZs/q7+JRyscNPJeRqN/BUL4T5QSshSZOmpxw
 jclebeuPnofiqUtlMz13rULVuN2W50Qh4kxCqwDCYoC6tzMt37D7vWC/pOMXV8649X9LCPjJ8hBvq
 sSgZAU/Pyb8gLIhHRMeqvw==;
Date: Wed, 17 Jan 2024 13:34:31 +0200
Message-Id: <83ply0b3co.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <9dfe6be4-afa8-430e-a45e-e651c479cb81@HIDDEN> (message from
 Dmitry Gutov on Wed, 17 Jan 2024 06:25:34 +0200)
References: <874jfhe3r4.fsf@HIDDEN>
 <9dfe6be4-afa8-430e-a45e-e651c479cb81@HIDDEN>
X-Spam-Score: -1.6 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.6 (--)

> Date: Wed, 17 Jan 2024 06:25:34 +0200
> From: Dmitry Gutov <dmitry@HIDDEN>
> 
> Try the patch below, seems to work here:
> 
> diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
> index 03efe0fdb31..83d580d98dd 100644
> --- a/lisp/vc/diff-mode.el
> +++ b/lisp/vc/diff-mode.el
> @@ -3014,7 +3014,7 @@ diff-vc-deduce-fileset
>         (goto-char (point-min))
>         (while (progn (diff-file-next) (not (eobp)))
>           (push (diff-find-file-name nil t) files)))
> -    (list backend (nreverse files) nil nil 'patch)))
> +    (list backend (delete nil (nreverse files)) nil nil 'patch)))
> 
>   (defun diff--filter-substring (str)
>     (when diff-font-lock-prettify
> 
> 
> (Eli, would this be suitable for emacs-29?)

Yes, thanks.  Just do it soon, please, if you can.

Message sent to bug-gnu-emacs@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: bug#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted file.
Resent-From: Dmitry Gutov <dmitry@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 17 Jan 2024 11:38:02 +0000
Resent-Message-ID: <handler.68443.B68443.170549142832436 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68443
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: 
To: Aleksandr Vityazev <avityazev@HIDDEN>, Juri Linkov <juri@HIDDEN>
Cc: 68443 <at> debbugs.gnu.org
Received: via spool by 68443-submit <at> debbugs.gnu.org id=B68443.170549142832436
          (code B ref 68443); Wed, 17 Jan 2024 11:38:02 +0000
Received: (at 68443) by debbugs.gnu.org; 17 Jan 2024 11:37:08 +0000
Received: from localhost ([127.0.0.1]:50982 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rQ4EG-0008R6-5q
	for submit <at> debbugs.gnu.org; Wed, 17 Jan 2024 06:37:08 -0500
Received: from out5-smtp.messagingengine.com ([66.111.4.29]:37759)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dmitry@HIDDEN>) id 1rQ4EE-0008QZ-7t
 for 68443 <at> debbugs.gnu.org; Wed, 17 Jan 2024 06:37:07 -0500
Received: from compute6.internal (compute6.nyi.internal [10.202.2.47])
 by mailout.nyi.internal (Postfix) with ESMTP id 217285C00F9;
 Wed, 17 Jan 2024 06:36:58 -0500 (EST)
Received: from mailfrontend1 ([10.202.2.162])
 by compute6.internal (MEProxy); Wed, 17 Jan 2024 06:36:58 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc
 :cc:content-transfer-encoding:content-type:content-type:date
 :date:from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to; s=fm1; t=1705491418;
 x=1705577818; bh=SrG6H5LHnWmhPvti/+U5WUH/k19C4IgfXwzEvzOm4Mw=; b=
 agKdm7fe5wQU2T0oAhFI9QsgqTNPC4OiV4PxZseFrZIsmmfylZtfwXeJQ1g+QivZ
 pMC7EOXUp3GDt/LEpNxVW4veJHIMKlgKqGJJpq8EDxfR+w8Y3xINiDSfOFLAj2E3
 /HsN2Ks6bnw5rBIBR5jM6EdybGn9zuQ0eBkm1JyEXAkkY0Bv99uTrPwdOwRqYjcw
 fhxcjL+PN67OrHroA/sabs4KNxbZGR9dhWRCiTNpam3m7Xgola1Ri4T/Ez9tDS/h
 kGKWZYGbBK1hsqPgaGrvrKhdamAW1ui+6FfoRbYRAbiEUJpFUQW5USbFjIwWpV8Q
 9W6cSo20Zk/1azIhEVBS+g==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:cc:content-transfer-encoding
 :content-type:content-type:date:date:feedback-id:feedback-id
 :from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy
 :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1705491418; x=
 1705577818; bh=SrG6H5LHnWmhPvti/+U5WUH/k19C4IgfXwzEvzOm4Mw=; b=U
 Ru7iwQhhhFAshEh5Bn/uVAaNKUgDb28OPMpdWyIpfxx+GT0ZRjZDnPJwZHnF4LE1
 bv8oHVv4aquQ+/Aq2WvGuMQhylQtv2MAl1aEjounmFBEecBb/8k4FM1NVJhBxkoy
 iAmy5SaFNF22Kn/m/Og0/E3THrm+qsuBby9B/D4rcyUlQ6K9MhEklvMiqpxLK/hM
 BKUL6gRsehTDzqCyq/B9t+lyJMitUziOjZhSe3fiFqctxil0hfAyCLPlZ6UWI/04
 U/QrMOmGDIKv8zZen3Xep04O+SmZoUUsSLVRNz85tZzXuBih4Uqu0o8UmE9ts+jA
 f+9tsgNbuKZ2D75rU95xQ==
X-ME-Sender: <xms:2bunZdKM6qbXW0qFg_Ux9tHCjw1z0IvQYK2BRHEU-izSFBa6IPofTg>
 <xme:2bunZZK98AGwoZ8JiNJu6qB5Yp_5CAvxDAI9RJxxxdrhSLo2CkALLszufzCJ49lVM
 PuKUcPvg9HVs8em1-4>
X-ME-Received: <xmr:2bunZVs7ynMQdQzn_GM4HK_CTNDzXG_ezQRUqnWUY_O2xczyGHdPoccVZNjNh1Z6b7Liig>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejhedgvdeiucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
 uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
 cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpeffmhhi
 thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth
 htvghrnhepteduleejgeehtefgheegjeekueehvdevieekueeftddvtdevfefhvdevgedu
 jeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug
 hmihhtrhihsehguhhtohhvrdguvghv
X-ME-Proxy: <xmx:2bunZeZzNuUKAnUG9P02SF94Gsgm80by3nbzCfN9IkWO5KUIewKngA>
 <xmx:2bunZUbBmwzGSRh_Z4TVSP4fdNx4oJue3wDiOoqzeY9_RM8ZLZFgFQ>
 <xmx:2bunZSDLZK-9cdvG0a2_PvEpB5yQcptbpySnqdnF68Tgh1O8m4yJRw>
 <xmx:2runZfzVlRNs41ZtgDgquIwMSXX33oYntXU1gZXrXtJ9U5gsbhF9_Q>
Feedback-ID: i0e71465a:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed,
 17 Jan 2024 06:36:56 -0500 (EST)
Message-ID: <f2c6dafa-0412-4bc6-81a7-9a877e9e12f4@HIDDEN>
Date: Wed, 17 Jan 2024 13:36:53 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Content-Language: en-US
References: <874jfhe3r4.fsf@HIDDEN>
 <9dfe6be4-afa8-430e-a45e-e651c479cb81@HIDDEN> <877ck82ppz.fsf@HIDDEN>
From: Dmitry Gutov <dmitry@HIDDEN>
In-Reply-To: <877ck82ppz.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

On 17/01/2024 12:56, Aleksandr Vityazev wrote:
> On 2024-01-17 06:25, Dmitry Gutov wrote:
> 
>> Hi! Thanks for the report.
>>
>> On 13/01/2024 15:56, Aleksandr Vityazev via Bug reports for GNU Emacs,
>> the Swiss army knife of text editors wrote:
>>> Hi,
>>> Steps to reproduce with emacs -q:
>>> 1. Enter git repository;
>>> 2. vc-delete-file some file;
>>> 3. vc-root-diff;
>>> 4. From *vc-diff* buffer vc-next-action;
>>> 5. In *vc-log* write summary and invoke vc-next-action;
>>> 6. get error (wrong-type-argument stringp nil)
>>> Full backtrace:
>>> Debugger entered--Lisp error: (wrong-type-argument stringp nil)
>>>     file-directory-p(nil)
>>>     #f(compiled-function (files comment) #<bytecode
>>> 0x1e31e0a127714b22>)((#(".gitignore" 0 10 (fontified t face
>>> (diff-file-header diff-header))) #("buffer.c" 0 8 (fontified t face
>>> (diff-file-header diff-header))) nil) #("Summary: Delete file.\n" 0
>>> 8 (jit-lock-defer-multiline t face log-edit-header fontified t field
>>> header) 8 9 (jit-lock-defer-multiline t fontified t field header) 9
>>> 21 (jit-lock-defer-multiline t face log-edit-summary fontified t
>>> field header) 21 22 (fontified t)))
>>>     vc-finish-logentry()
>>>     funcall-interactively(vc-finish-logentry)
>>>     log-edit-done()
>>>     funcall-interactively(log-edit-done)
>>>     command-execute(log-edit-done)
>>
>> Try the patch below, seems to work here:
>>
>> diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
>> index 03efe0fdb31..83d580d98dd 100644
>> --- a/lisp/vc/diff-mode.el
>> +++ b/lisp/vc/diff-mode.el
>> @@ -3014,7 +3014,7 @@ diff-vc-deduce-fileset
>>         (goto-char (point-min))
>>         (while (progn (diff-file-next) (not (eobp)))
>>           (push (diff-find-file-name nil t) files)))
>> -    (list backend (nreverse files) nil nil 'patch)))
>> +    (list backend (delete nil (nreverse files)) nil nil 'patch)))
> 
> Yes with this patch the error is no longer present, but the deleted file
> is not displayed in the *log-edit-files* buffer, unlike if you run
> vc-next-action from *vc-dir*. Although this is another bug report.

Right, that's still a remaining problem. diff-find-file-name doesn't 
really want to "find" files that don't exist on disk, so it might need a 
replacement for such cases.

Splitting reports should not be necessary, but we can install the first 
fix separately.

Message sent to bug-gnu-emacs@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: bug#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted file.
Resent-From: Juri Linkov <juri@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 17 Jan 2024 16:46:02 +0000
Resent-Message-ID: <handler.68443.B68443.170550991716297 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68443
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: 
To: Dmitry Gutov <dmitry@HIDDEN>
Cc: 68443 <at> debbugs.gnu.org, Aleksandr Vityazev <avityazev@HIDDEN>
Received: via spool by 68443-submit <at> debbugs.gnu.org id=B68443.170550991716297
          (code B ref 68443); Wed, 17 Jan 2024 16:46:02 +0000
Received: (at 68443) by debbugs.gnu.org; 17 Jan 2024 16:45:17 +0000
Received: from localhost ([127.0.0.1]:53139 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rQ92S-0004E6-Km
	for submit <at> debbugs.gnu.org; Wed, 17 Jan 2024 11:45:16 -0500
Received: from relay7-d.mail.gandi.net ([217.70.183.200]:43973)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <juri@HIDDEN>) id 1rQ92Q-0003rN-PE
 for 68443 <at> debbugs.gnu.org; Wed, 17 Jan 2024 11:45:15 -0500
Received: by mail.gandi.net (Postfix) with ESMTPSA id 0BA6C20004;
 Wed, 17 Jan 2024 16:45:05 +0000 (UTC)
From: Juri Linkov <juri@HIDDEN>
In-Reply-To: <f2c6dafa-0412-4bc6-81a7-9a877e9e12f4@HIDDEN> (Dmitry Gutov's
 message of "Wed, 17 Jan 2024 13:36:53 +0200")
Organization: LINKOV.NET
References: <874jfhe3r4.fsf@HIDDEN>
 <9dfe6be4-afa8-430e-a45e-e651c479cb81@HIDDEN>
 <877ck82ppz.fsf@HIDDEN>
 <f2c6dafa-0412-4bc6-81a7-9a877e9e12f4@HIDDEN>
Date: Wed, 17 Jan 2024 18:32:50 +0200
Message-ID: <86ttnc2iu5.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain
X-GND-Sasl: juri@HIDDEN
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

>>> diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
>>> index 03efe0fdb31..83d580d98dd 100644
>>> --- a/lisp/vc/diff-mode.el
>>> +++ b/lisp/vc/diff-mode.el
>>> @@ -3014,7 +3014,7 @@ diff-vc-deduce-fileset
>>>         (goto-char (point-min))
>>>         (while (progn (diff-file-next) (not (eobp)))
>>>           (push (diff-find-file-name nil t) files)))
>>> -    (list backend (nreverse files) nil nil 'patch)))
>>> +    (list backend (delete nil (nreverse files)) nil nil 'patch)))
>> Yes with this patch the error is no longer present, but the deleted file
>> is not displayed in the *log-edit-files* buffer, unlike if you run
>> vc-next-action from *vc-dir*. Although this is another bug report.
>
> Right, that's still a remaining problem. diff-find-file-name doesn't really
> want to "find" files that don't exist on disk, so it might need
> a replacement for such cases.

Indeed, the problem is that diff-find-file-name doesn't get the name
of the deleted file even when called with OLD=t:

    ;; Use file-regular-p to avoid
    ;; /dev/null, directories, etc.
    ((or (null file) (file-regular-p file))
     file)

Message sent to bug-gnu-emacs@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: bug#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted file.
Resent-From: Dmitry Gutov <dmitry@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 17 Jan 2024 23:27:02 +0000
Resent-Message-ID: <handler.68443.B68443.170553399012733 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68443
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: 
To: Eli Zaretskii <eliz@HIDDEN>
Cc: 68443 <at> debbugs.gnu.org, avityazev@HIDDEN
Received: via spool by 68443-submit <at> debbugs.gnu.org id=B68443.170553399012733
          (code B ref 68443); Wed, 17 Jan 2024 23:27:02 +0000
Received: (at 68443) by debbugs.gnu.org; 17 Jan 2024 23:26:30 +0000
Received: from localhost ([127.0.0.1]:53924 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rQFIk-0003JJ-5y
	for submit <at> debbugs.gnu.org; Wed, 17 Jan 2024 18:26:30 -0500
Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:49555)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dmitry@HIDDEN>) id 1rQFIe-0003Iy-Kk
 for 68443 <at> debbugs.gnu.org; Wed, 17 Jan 2024 18:26:28 -0500
Received: from compute3.internal (compute3.nyi.internal [10.202.2.43])
 by mailout.west.internal (Postfix) with ESMTP id 38A603200B43;
 Wed, 17 Jan 2024 18:26:17 -0500 (EST)
Received: from mailfrontend1 ([10.202.2.162])
 by compute3.internal (MEProxy); Wed, 17 Jan 2024 18:26:17 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc
 :cc:content-transfer-encoding:content-type:content-type:date
 :date:from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to; s=fm1; t=1705533976;
 x=1705620376; bh=Vvg/v9ZtLn8j3DG0Qd2PzLlt8/W23yHSkQVrjt0exhU=; b=
 cSG0EGcQqoKtN6I9vcpgNrP2orGnIwSK21rVhpzki6lTOx5OdrHQ0i/BgDOKK+0E
 H6w7vL+NuNyvcnjjJnCFjLHvJFe+yBwWQPWgjZS5GGi+lr/ngLyrZxdOu6eX/+8U
 jpWG2ee6lstClPGj6I+L6X2mmNVmZob0L6au7ronHkB4Z1lJqFWA8o2iszm6R/YG
 ZKOaisWxz4Rj9OyNdIFR+81jd6PlwmRxPVdrKRrIjcme+w74sSRFMTq5bhs2km1f
 7Qz8CIM98j2K4pTNckQqPIOlWGa6avwMkx6yVioGLVrh2yjWDEF22p9pigbb05no
 eVauQFz4m/9Jp8RvYeF67Q==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:cc:content-transfer-encoding
 :content-type:content-type:date:date:feedback-id:feedback-id
 :from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy
 :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1705533976; x=
 1705620376; bh=Vvg/v9ZtLn8j3DG0Qd2PzLlt8/W23yHSkQVrjt0exhU=; b=A
 Gt+o8e3S/Y6M7b1AnwOi5tDC1OS+R0PaTBY311khGuDEbCTW6L885WA5QqHfieaI
 YeegTPVpQLZsvQZQPmB08IjDxS0ZWtpdpIfEldUXt4qAaFOe2HoOa5IxTINKgoi6
 61Rkxdc/nwkYbPK1Mp1OSWxSGkCCQtoOyIuve4xzEE4ftpWDlN4IydB48c41BIh/
 kk0i1m2rRh0JXYfhM9ozZ4ooAZ2xGN9QzWbJbI9cixiBHsVp8DczDxevgLzrJnNQ
 uWROX3gc35APS0MDBOiDdha1rGnHqa2lhXGQc9Y2zWw7Lw1Ev2yWsWF2FiRhZ/9d
 /QGqoU4nXzaDJlmh5kb9g==
X-ME-Sender: <xms:GGKoZdSpXMkBOQYuSsl55uE0c59p33ZSy43BQJedrvEh_6miiRgNUw>
 <xme:GGKoZWzjbqyRv8fMQ5XiKybWd6f6tiGvPXg18-fE9kD9ZHbP3Bb6mYrZ30ZofcVc2
 uWZbW3L1SuhyYHl9uE>
X-ME-Received: <xmr:GGKoZS01elKzq44oVJK3U74Y22iTfDcM7DV4LMxDy2c2cm7dx3Tog4jBesp7yYMlvAFxew>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejiedgtdekucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
 uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
 cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpeffmhhi
 thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth
 htvghrnhepteduleejgeehtefgheegjeekueehvdevieekueeftddvtdevfefhvdevgedu
 jeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug
 hmihhtrhihsehguhhtohhvrdguvghv
X-ME-Proxy: <xmx:GGKoZVB-LjoN10k7w5viutUaLHZAtwAw83x7zbUnrV0UcqUiIY_ivQ>
 <xmx:GGKoZWhsS5mMOh8RdfZ-qcxuda3Pswj9Zo4fid_rpajA--npz68_-A>
 <xmx:GGKoZZo0SamQucnQFjjiEVgUsJMtrHzRWlDKqY3M9ndTJgygrWy-aQ>
 <xmx:GGKoZaYDWW2XGsbZl4a6pSKiwAXgUl1rOnies_FIBWqrPkBRwso-Pg>
Feedback-ID: i0e71465a:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed,
 17 Jan 2024 18:26:15 -0500 (EST)
Message-ID: <a3985a1f-5f51-4386-94aa-349393e4046d@HIDDEN>
Date: Thu, 18 Jan 2024 01:26:12 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Content-Language: en-US
References: <874jfhe3r4.fsf@HIDDEN>
 <9dfe6be4-afa8-430e-a45e-e651c479cb81@HIDDEN> <83ply0b3co.fsf@HIDDEN>
From: Dmitry Gutov <dmitry@HIDDEN>
In-Reply-To: <83ply0b3co.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

On 17/01/2024 13:34, Eli Zaretskii wrote:
>> Date: Wed, 17 Jan 2024 06:25:34 +0200
>> From: Dmitry Gutov<dmitry@HIDDEN>
>>
>> Try the patch below, seems to work here:
>>
>> diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
>> index 03efe0fdb31..83d580d98dd 100644
>> --- a/lisp/vc/diff-mode.el
>> +++ b/lisp/vc/diff-mode.el
>> @@ -3014,7 +3014,7 @@ diff-vc-deduce-fileset
>>          (goto-char (point-min))
>>          (while (progn (diff-file-next) (not (eobp)))
>>            (push (diff-find-file-name nil t) files)))
>> -    (list backend (nreverse files) nil nil 'patch)))
>> +    (list backend (delete nil (nreverse files)) nil nil 'patch)))
>>
>>    (defun diff--filter-substring (str)
>>      (when diff-font-lock-prettify
>>
>>
>> (Eli, would this be suitable for emacs-29?)
> Yes, thanks.  Just do it soon, please, if you can.

Thanks, installed.

Message sent to bug-gnu-emacs@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: bug#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted file.
Resent-From: Juri Linkov <juri@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 18 Jan 2024 08:06:01 +0000
Resent-Message-ID: <handler.68443.B68443.17055651459890 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68443
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: 
To: Dmitry Gutov <dmitry@HIDDEN>
Cc: 68443 <at> debbugs.gnu.org, Aleksandr Vityazev <avityazev@HIDDEN>
Received: via spool by 68443-submit <at> debbugs.gnu.org id=B68443.17055651459890
          (code B ref 68443); Thu, 18 Jan 2024 08:06:01 +0000
Received: (at 68443) by debbugs.gnu.org; 18 Jan 2024 08:05:45 +0000
Received: from localhost ([127.0.0.1]:54281 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rQNPF-0002ZR-5n
	for submit <at> debbugs.gnu.org; Thu, 18 Jan 2024 03:05:45 -0500
Received: from relay3-d.mail.gandi.net ([2001:4b98:dc4:8::223]:33027)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <juri@HIDDEN>) id 1rQNPC-0002ZB-4U
 for 68443 <at> debbugs.gnu.org; Thu, 18 Jan 2024 03:05:42 -0500
Received: by mail.gandi.net (Postfix) with ESMTPSA id 2958A60006;
 Thu, 18 Jan 2024 08:05:30 +0000 (UTC)
From: Juri Linkov <juri@HIDDEN>
In-Reply-To: <86ttnc2iu5.fsf@HIDDEN> (Juri Linkov's message of "Wed, 
 17 Jan 2024 18:32:50 +0200")
Organization: LINKOV.NET
References: <874jfhe3r4.fsf@HIDDEN>
 <9dfe6be4-afa8-430e-a45e-e651c479cb81@HIDDEN>
 <877ck82ppz.fsf@HIDDEN>
 <f2c6dafa-0412-4bc6-81a7-9a877e9e12f4@HIDDEN>
 <86ttnc2iu5.fsf@HIDDEN>
Date: Thu, 18 Jan 2024 09:50:44 +0200
Message-ID: <868r4nqf5n.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain
X-GND-Sasl: juri@HIDDEN
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

>>> Yes with this patch the error is no longer present, but the deleted file
>>> is not displayed in the *log-edit-files* buffer, unlike if you run
>>> vc-next-action from *vc-dir*. Although this is another bug report.
>>
>> Right, that's still a remaining problem. diff-find-file-name doesn't really
>> want to "find" files that don't exist on disk, so it might need
>> a replacement for such cases.
>
> Indeed, the problem is that diff-find-file-name doesn't get the name
> of the deleted file even when called with OLD=t:
>
>     ;; Use file-regular-p to avoid
>     ;; /dev/null, directories, etc.
>     ((or (null file) (file-regular-p file))
>      file)

This can be fixed by adding special-casing to diff-vc-deduce-fileset
that will check whether the diff output is for git diff,
then will remove a/ and b/ prefixes from file names
without checking whether these files really exist.

Message sent to bug-gnu-emacs@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: bug#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted file.
Resent-From: Dmitry Gutov <dmitry@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 18 Jan 2024 16:48:02 +0000
Resent-Message-ID: <handler.68443.B68443.17055964425888 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68443
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: 
To: Juri Linkov <juri@HIDDEN>
Cc: 68443 <at> debbugs.gnu.org, Aleksandr Vityazev <avityazev@HIDDEN>
Received: via spool by 68443-submit <at> debbugs.gnu.org id=B68443.17055964425888
          (code B ref 68443); Thu, 18 Jan 2024 16:48:02 +0000
Received: (at 68443) by debbugs.gnu.org; 18 Jan 2024 16:47:22 +0000
Received: from localhost ([127.0.0.1]:56572 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rQVY1-0001Wu-RK
	for submit <at> debbugs.gnu.org; Thu, 18 Jan 2024 11:47:22 -0500
Received: from out5-smtp.messagingengine.com ([66.111.4.29]:50101)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dmitry@HIDDEN>) id 1rQVXz-0001WB-S4
 for 68443 <at> debbugs.gnu.org; Thu, 18 Jan 2024 11:47:20 -0500
Received: from compute4.internal (compute4.nyi.internal [10.202.2.44])
 by mailout.nyi.internal (Postfix) with ESMTP id 07BF85C0051;
 Thu, 18 Jan 2024 11:47:12 -0500 (EST)
Received: from mailfrontend1 ([10.202.2.162])
 by compute4.internal (MEProxy); Thu, 18 Jan 2024 11:47:12 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc
 :cc:content-transfer-encoding:content-type:content-type:date
 :date:from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to; s=fm1; t=1705596432;
 x=1705682832; bh=zYoaJgnZwNREZLydKUNHIBeRMYEY70hwTCpS+l0V2Gs=; b=
 aPdp0xg2+qSsZzhw3QvhxFR+yQpfnCyCFtGjwHQmeiIa/N7BE53XgHeaxFNzgs4k
 WuPaLII6AoyFUVFOm7C/u7BM/3AzKjLDgKBom8ASe/AjFybhnMuZ0tg4E+9t3eU+
 iLIQEw1ee734cs+dOpCASqq3TGrDYZmQYLwW9zmC1brCFdR8wB67kLmiORC+etn/
 W4ja4ivTs8+sRKzuvpaANUNKdF/iMYTX8QF2PlytlYRoVK90pR7nJt1vj5BGlxd5
 3apNZwV4NzWEiTkc7ZslfRLX6tCecf080FsFHZ8bKRQY4zgDNDfiQhkkApfJqCsP
 8nT2DfOKEB9pKL1L5sAGVw==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:cc:content-transfer-encoding
 :content-type:content-type:date:date:feedback-id:feedback-id
 :from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy
 :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1705596432; x=
 1705682832; bh=zYoaJgnZwNREZLydKUNHIBeRMYEY70hwTCpS+l0V2Gs=; b=N
 pHetCKfNedlqzbpXU7dmehny4ZsuYABO88vE+Kaw3fHFuIo/KttnKzvUeBastpKm
 CvVdZZd2PGbJptcAc4gyeMrR1Rut8HsHJjileONQiJHUzpctfT7H/v93amhzdbwK
 9BiTqBidwNibFJBJkJLFCo3qaMulzmkE1bNSYCD3NRvw1Yi6DtSnRFrJcBUV4sfX
 6IopReini9vP4blwCK1FUWVygZV68sw3KqqgX2w5fG8pLQNeLuJVCt+gH/INEbxS
 v8RaF7eaGxLwf9YlAvRgJRRaFtsVUWQlBbAf837wnzFqctdI9W9hWCPxi6Az3Jkb
 6Q28TZQt7iIMnVmxVuSeA==
X-ME-Sender: <xms:D1apZVoAfNVRLXc_mRumeJCmOAw1597xV1crMQTxWn8SXBHHX2emfg>
 <xme:D1apZXoeC_X05COe_u-t-zX1BVejdXCLQjOa30WyTYTpwI51QvZvyh3aAQvAiUZow
 auy8a6mFgtVQIRa_yY>
X-ME-Received: <xmr:D1apZSPu9S6k4hDfeHJITayXGkphPzeiIfuOMlknh_2tkyp-RLHkw0IVVATSky_daYwaNQ>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejkedgieekucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
 uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
 cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpeffmhhi
 thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth
 htvghrnhepteduleejgeehtefgheegjeekueehvdevieekueeftddvtdevfefhvdevgedu
 jeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug
 hmihhtrhihsehguhhtohhvrdguvghv
X-ME-Proxy: <xmx:D1apZQ5D0Rn0jlog58_jHi0-Oufl9uZdyZe46EjkEqxscAjB_QXXgw>
 <xmx:D1apZU7lgzF9O4gMjLjRN5VCysYBRsjwT5MnIIDfNE1VcdTZBcq_XA>
 <xmx:D1apZYhS-x3IDcaw3sNr3ONST7qQ4kmUeTBwHE1BE8c6gCGw3kCB5A>
 <xmx:EFapZSRi_MpCcM0zGf4VEwkV59IAeBy9jK_3OFcRSmz7o2OsGX0G9A>
Feedback-ID: i0e71465a:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu,
 18 Jan 2024 11:47:10 -0500 (EST)
Message-ID: <74a14c44-698f-4b7f-9e3f-48501774510d@HIDDEN>
Date: Thu, 18 Jan 2024 18:47:07 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Content-Language: en-US
References: <874jfhe3r4.fsf@HIDDEN>
 <9dfe6be4-afa8-430e-a45e-e651c479cb81@HIDDEN> <877ck82ppz.fsf@HIDDEN>
 <f2c6dafa-0412-4bc6-81a7-9a877e9e12f4@HIDDEN>
 <86ttnc2iu5.fsf@HIDDEN> <868r4nqf5n.fsf@HIDDEN>
From: Dmitry Gutov <dmitry@HIDDEN>
In-Reply-To: <868r4nqf5n.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

On 18/01/2024 09:50, Juri Linkov wrote:
>>>> Yes with this patch the error is no longer present, but the deleted file
>>>> is not displayed in the*log-edit-files*  buffer, unlike if you run
>>>> vc-next-action from*vc-dir*. Although this is another bug report.
>>> Right, that's still a remaining problem. diff-find-file-name doesn't really
>>> want to "find" files that don't exist on disk, so it might need
>>> a replacement for such cases.
>> Indeed, the problem is that diff-find-file-name doesn't get the name
>> of the deleted file even when called with OLD=t:
>>
>>      ;; Use file-regular-p to avoid
>>      ;; /dev/null, directories, etc.
>>      ((or (null file) (file-regular-p file))
>>       file)
> This can be fixed by adding special-casing to diff-vc-deduce-fileset
> that will check whether the diff output is for git diff,
> then will remove a/ and b/ prefixes from file names
> without checking whether these files really exist.

For git, or maybe hg/bzr as well.

Worth a try.
Last modified: Sat, 20 Jan 2024 12:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.