From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs 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 Message-ID: <2a278850-2241-4e43-b81f-1cefdfe7d930@gutov.dev> References: <87bka6y041.fsf@zephyr.silentflame.com> <8c47be44-ea77-48b5-bbdf-53b4e245f7a7@gutov.dev> <8734vgqfld.fsf@zephyr.silentflame.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19360"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla Thunderbird Cc: 68174@debbugs.gnu.org, juri@linkov.net To: Sean Whitton , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jan 02 14:12:17 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 1rKeZ6-0004pL-TV for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 02 Jan 2024 14:12:17 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKeYq-0006WF-Nr; Tue, 02 Jan 2024 08:12:00 -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 1rKeYp-0006W4-LW for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2024 08:11:59 -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 1rKeYp-0006BT-BW for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2024 08:11:59 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKeYr-00087a-O8 for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2024 08:12:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 02 Jan 2024 13:12:01 +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.170420106431136 (code B ref 68174); Tue, 02 Jan 2024 13:12:01 +0000 Original-Received: (at 68174) by debbugs.gnu.org; 2 Jan 2024 13:11:04 +0000 Original-Received: from localhost ([127.0.0.1]:49609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKeXw-000866-Ch for submit@debbugs.gnu.org; Tue, 02 Jan 2024 08:11:04 -0500 Original-Received: from out3-smtp.messagingengine.com ([66.111.4.27]:34141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKeXu-00085b-OS for 68174@debbugs.gnu.org; Tue, 02 Jan 2024 08:11:03 -0500 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 0CC7E5C01CA; Tue, 2 Jan 2024 08:10:55 -0500 (EST) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 02 Jan 2024 08:10:55 -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=1704201055; x=1704287455; bh=b3ky1GwnOdW3aiEubnZkkyQ1C6Aql++G2cp2H0Ky++w=; b= o4oj7/JAbiCyjw/xMiwGat+xWYkEQqVvQfRsPTQ9gs9kdfQ/0uANQRMHSOM25w+F X1Lsz946zwNfnDXSqZK+gHX/3rHjUkWHSleN/iTeESKFEBFI9RWxLMUfHMRPzNqW L0BdzqlDKfojhFwghMcEGYrtgTPQi0smfcBNIQtMUK5Pfndy1vQ+rENQJIfLl6Kd uBtKbfi+AC7QxYn/ZZh+JT3IJ9u4acgpqAb15M/C65lXTaCnmaBdecqVuSR0Dj8Y gKBeerKz4LYkaf4qN0D82U395fdmqLW0QyjLjd4rhNmRr0AA3cYOZDUbi6qFRlPq zbH+W4G3R2vzK7NWPMZgeA== 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=fm2; t=1704201055; x= 1704287455; bh=b3ky1GwnOdW3aiEubnZkkyQ1C6Aql++G2cp2H0Ky++w=; b=O zkSPSrKmkWwNYEBcTyZ0jfJ9NEW+jwXIJ8ROCXVjkmrNZTWqr62au0hshf4An6r6 ad8WEYsOpvBXKuL32g/8cl81bpOMNptm2/H6LkGZTcL7Ol6s9Jg2+4KsOIRYbCts FjEXYs7oa0k+xKK9i9YXliD0jY8dXodMDMvxih+CZaZLVl+2IvtjLJ6EpNjy+ffQ cC5ugsjwrgz3Z4emRH4KWrA7UPXBjAGDHWs5HXsZob1OHv6djIN1RBlb75zF7tA0 Tp+Exh4EpM82SZqg6vhvtPd+gPx9l88iAhjtczGBoYkAyUs/UxXVbA5VyX5xO6Y1 S3nQj8+7YOk5F/gzJTVMQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdegvddggeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhepteduleejgeehtefgheegjeekueehvdevieekueeftddvtdevfefhvdevgedu jeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug hmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 2 Jan 2024 08:10:53 -0500 (EST) Content-Language: en-US In-Reply-To: <8734vgqfld.fsf@zephyr.silentflame.com> 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:277239 Archived-At: 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.