From: Dmitry Gutov <dmitry@gutov.dev>
To: Sean Whitton <spwhitton@spwhitton.name>, Eli Zaretskii <eliz@gnu.org>
Cc: 68174@debbugs.gnu.org, juri@linkov.net
Subject: bug#68174: 30.0.50; Project and VC disagree about what repository we're in
Date: Tue, 2 Jan 2024 15:10:53 +0200 [thread overview]
Message-ID: <2a278850-2241-4e43-b81f-1cefdfe7d930@gutov.dev> (raw)
In-Reply-To: <8734vgqfld.fsf@zephyr.silentflame.com>
On 02/01/2024 10:55, Sean Whitton wrote:
>> This particular case though seems fixed with this patch, please test:
>>
>> diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
>> index 3cd835a9d6b..82051740b8f 100644
>> --- a/lisp/vc/vc.el
>> +++ b/lisp/vc/vc.el
>> @@ -1074,6 +1074,7 @@ vc-expand-dirs
>>
>> (defvar vc-dir-backend)
>> (defvar log-view-vc-backend)
>> +(defvar log-view-vc-fileset)
>> (defvar log-edit-vc-backend)
>> (defvar diff-vc-backend)
>> (defvar diff-vc-revisions)
>> @@ -1155,6 +1156,8 @@ vc-deduce-fileset
>> (vc-state buffer-file-name)
>> (vc-checkout-model backend buffer-file-name))
>> (list backend (list buffer-file-name))))
>> + ((derived-mode-p 'log-view-mode)
>> + (list log-view-vc-backend log-view-vc-fileset))
>> ((and (buffer-live-p vc-parent-buffer)
>> ;; FIXME: Why this test? --Stef
>> (or (buffer-file-name vc-parent-buffer)
> Yup, that works, thanks!
Very good.
Eli, do you think we could add this to emacs-29 as well?
It would help the users of 29.2 avoid the described bug when/if they
upgrade to the latest project.el. Probably not very urgent, but OTOH the
change looks pretty safe.
next prev parent reply other threads:[~2024-01-02 13:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-31 13:26 bug#68174: 30.0.50; Project and VC disagree about what repository we're in Sean Whitton
2024-01-02 3:31 ` Dmitry Gutov
2024-01-02 8:55 ` Sean Whitton
2024-01-02 13:10 ` Dmitry Gutov [this message]
2024-01-02 13:28 ` Eli Zaretskii
2024-01-03 0:13 ` Dmitry Gutov
2024-01-03 12:41 ` Eli Zaretskii
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2a278850-2241-4e43-b81f-1cefdfe7d930@gutov.dev \
--to=dmitry@gutov.dev \
--cc=68174@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=juri@linkov.net \
--cc=spwhitton@spwhitton.name \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).