From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#68174: 30.0.50; Project and VC disagree about what repository we're in Date: Tue, 02 Jan 2024 15:28:59 +0200 Message-ID: <83v88bzwx0.fsf@gnu.org> References: <87bka6y041.fsf@zephyr.silentflame.com> <8c47be44-ea77-48b5-bbdf-53b4e245f7a7@gutov.dev> <8734vgqfld.fsf@zephyr.silentflame.com> <2a278850-2241-4e43-b81f-1cefdfe7d930@gutov.dev> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35812"; mail-complaints-to="usenet@ciao.gmane.io" Cc: juri@linkov.net, 68174@debbugs.gnu.org, spwhitton@spwhitton.name To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jan 02 14:30:10 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rKeqP-00098i-QK for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 02 Jan 2024 14:30:10 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKeqH-0002TI-VW; Tue, 02 Jan 2024 08:30:02 -0500 Original-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 ) id 1rKeqG-0002Si-C2 for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2024 08:30:00 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rKeqG-0000Zk-3P for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2024 08:30:00 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKeqI-0002ii-FM for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2024 08:30:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 02 Jan 2024 13:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68174 X-GNU-PR-Package: emacs Original-Received: via spool by 68174-submit@debbugs.gnu.org id=B68174.170420217510355 (code B ref 68174); Tue, 02 Jan 2024 13:30:02 +0000 Original-Received: (at 68174) by debbugs.gnu.org; 2 Jan 2024 13:29:35 +0000 Original-Received: from localhost ([127.0.0.1]:49619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKepq-0002gw-NP for submit@debbugs.gnu.org; Tue, 02 Jan 2024 08:29:35 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:45702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKepo-0002gj-NG for 68174@debbugs.gnu.org; Tue, 02 Jan 2024 08:29:33 -0500 Original-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 1rKepg-0000WP-96; Tue, 02 Jan 2024 08:29:24 -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=Ha/HbqCsh4bahMVfik9SY/q7CpRXklm7aIuOAKtRodY=; b=rPmcbPHaxrxB ieg3mmSd+ZqPvmrNwnExiXcyD02pME2vYViUOJJjtl3foh2QAWHUflgf8gs1ndOR98SzkKAt5hjBW yYSWjL8BYTv0dFTU3RbNqRNHRZbX9y46mjuDrEgG/zzyPkDsjr/0K200DliHX4GvCtb+vlZLj2DCv JsPatEZEfvrgOn8rK5UDcnvqrQWR1SOfBM9sOmkKN4gVZxSQB6TW4weDTJ8Ag3d9BXptPqQUvF29t 4xZbggV4oOgB4P7Q4uZakyCXiSEGS3jIvypmtIyV6eeatp0lGs95klmUQ2kdi3BKLLz5yl4fBbS0c aEJ/+VsDJxSNCxFnUloTfw==; In-Reply-To: <2a278850-2241-4e43-b81f-1cefdfe7d930@gutov.dev> (message from Dmitry Gutov on Tue, 2 Jan 2024 15:10:53 +0200) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:277240 Archived-At: > Date: Tue, 2 Jan 2024 15:10:53 +0200 > Cc: 68174@debbugs.gnu.org, juri@linkov.net > From: Dmitry Gutov > > 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. If it's safe, you'd need to convince me. Because just by looking at it, I don't have a clear idea what else it could affect. And the use case is pretty rare, AFAICT. So I tend to be happier with this on master.