From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sean Whitton 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 08:55:42 +0000 Message-ID: <8734vgqfld.fsf@zephyr.silentflame.com> References: <87bka6y041.fsf@zephyr.silentflame.com> <8c47be44-ea77-48b5-bbdf-53b4e245f7a7@gutov.dev> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11920"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 68174@debbugs.gnu.org, juri@linkov.net To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jan 02 09:56:20 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 1rKaZO-0002mz-Ke for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 02 Jan 2024 09:56:20 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKaZ9-00074m-AI; Tue, 02 Jan 2024 03:56:03 -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 1rKaZ7-00073w-PP for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2024 03:56:02 -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 1rKaZ6-0002pY-Ek for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2024 03:56:00 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKaZ8-0007hW-8p for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2024 03:56:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 02 Jan 2024 08:56: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.170418575729593 (code B ref 68174); Tue, 02 Jan 2024 08:56:02 +0000 Original-Received: (at 68174) by debbugs.gnu.org; 2 Jan 2024 08:55:57 +0000 Original-Received: from localhost ([127.0.0.1]:49405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKaZ2-0007hF-Tq for submit@debbugs.gnu.org; Tue, 02 Jan 2024 03:55:57 -0500 Original-Received: from out5-smtp.messagingengine.com ([66.111.4.29]:41465) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKaYz-0007gz-W2 for 68174@debbugs.gnu.org; Tue, 02 Jan 2024 03:55:55 -0500 Original-Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 747435C018B; Tue, 2 Jan 2024 03:55:45 -0500 (EST) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 02 Jan 2024 03:55:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; h=cc:cc: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=1704185745; x= 1704272145; bh=Bzav9nbfv6F09iO9Sp3CMRF2huxTds37hwTlQvN3umM=; b=X QbPhRmVGYFAS+2J6qVsgiyDC1Cezz7ZxMOvT7XTl7AALUUoleow9udCmlI7vIwXQ 9WXw9Xa4+veTyHMfY/xSLX6fcwvh4vrQwvDFKX52gVUB6EHzGFfduHEViFJlPqfI uNdsYdfrUIPDMxZdlZAp2qLSkLesukI0L9tkZak0UjHc27YYiIDVtP1WT/kbXACw l2se5P4c8JS4hng5KDHGh867leBlyGxjG/ePF14Xwa1wKkeMvOJOFuezumvFJs3y PnyIHnQDjzqkTzAGiogtuY2hWpkjcjRF1MhwGNdD62obJnM5AQJHealr4BbYCcUX jVGIvrgKvIzOjtacT3lmw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc: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=1704185745; x=1704272145; bh=Bzav9nbfv6F09iO9Sp3CMRF2huxT ds37hwTlQvN3umM=; b=HyQEgmDpcrg0XQogJg8DO47uz6Q3KXyh/V1PLHhtf/wc tC2/v6FQQHg2mpYt4f2akg7+4W0gcY4YbNdOGdMcQGMSEVwqldRuS1jTuQqlZxf3 Tzf0NMqswbxe+fhK6IONaW5gS1UkUETXRoeroP+DCyffdOoLt9m+lbE0xwxnb7Rz VYSDmzDeaLSGbAszCaQXvE5SDbpRWdO9ixqsbFKIZz3emWVHqeoHYI9lsXDDcYXp ifKmedpNeB8xmRiA/pltUJfIAG0fIISVCHIPkGkYc36QXwJbRPnu6Try9E9oKLnK SDTVipMmi8YTUOPDl/z/VAaqrtV5dBux9r9j0LiJUQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdeguddguddvjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufgjfhffkfgfgggtsehttddttddtredtnecuhfhrohhmpefuvggr nhcuhghhihhtthhonhcuoehsphifhhhithhtohhnsehsphifhhhithhtohhnrdhnrghmvg eqnecuggftrfgrthhtvghrnheptdffvdffueeluedvteekvdevhefghedvgeevgffhvedu keeggeelveegjeekteeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepshhpfihhihhtthhonhesshhpfihhihhtthhonhdrnhgrmhgv X-ME-Proxy: Feedback-ID: i23c04076:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 2 Jan 2024 03:55:44 -0500 (EST) Original-Received: by zephyr.silentflame.com (Postfix, from userid 1000) id 972AD940D39; Tue, 2 Jan 2024 08:55:42 +0000 (GMT) In-Reply-To: <8c47be44-ea77-48b5-bbdf-53b4e245f7a7@gutov.dev> (Dmitry Gutov's message of "Tue, 2 Jan 2024 05:31:20 +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:277219 Archived-At: Hello, On Tue 02 Jan 2024 at 05:31am +02, Dmitry Gutov wrote: > I general, the problem looks unsolvable (or at least hard) because various > VC-related buffers look back on the fileset that spawned them through the > variable vc-parent-buffer. And that one is often just set to the buffer that > was previous before the current one was created (in vc-setup-buffer). Hmm. This would be unfortunate. > 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! -- Sean Whitton