From: Dmitry Gutov <dmitry@gutov.dev>
To: Juri Linkov <juri@linkov.net>
Cc: 68443@debbugs.gnu.org, Aleksandr Vityazev <avityazev@disroot.org>
Subject: bug#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted file.
Date: Thu, 18 Jan 2024 18:47:07 +0200 [thread overview]
Message-ID: <74a14c44-698f-4b7f-9e3f-48501774510d@gutov.dev> (raw)
In-Reply-To: <868r4nqf5n.fsf@mail.linkov.net>
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.
next prev parent reply other threads:[~2024-01-18 16:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-13 13:56 bug#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted file Aleksandr Vityazev via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-01-17 4:25 ` Dmitry Gutov
2024-01-17 10:56 ` Aleksandr Vityazev via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-01-17 11:36 ` Dmitry Gutov
2024-01-17 16:32 ` Juri Linkov
2024-01-18 7:50 ` Juri Linkov
2024-01-18 16:47 ` Dmitry Gutov [this message]
2024-01-17 11:34 ` Eli Zaretskii
2024-01-17 23:26 ` Dmitry Gutov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=74a14c44-698f-4b7f-9e3f-48501774510d@gutov.dev \
--to=dmitry@gutov.dev \
--cc=68443@debbugs.gnu.org \
--cc=avityazev@disroot.org \
--cc=juri@linkov.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.