From unknown Tue Jun 17 01:48:48 2025 X-Loop: help-debbugs@gnu.org Subject: bug#68174: 30.0.50; Project and VC disagree about what repository we're in Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: juri@linkov.net, bug-gnu-emacs@gnu.org Resent-Date: Sun, 31 Dec 2023 13:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68174 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 68174@debbugs.gnu.org Cc: juri@linkov.net X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: juri@linkov.net Received: via spool by submit@debbugs.gnu.org id=B.1704029187684 (code B ref -1); Sun, 31 Dec 2023 13:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 31 Dec 2023 13:26:27 +0000 Received: from localhost ([127.0.0.1]:45822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJvpi-0000Ay-NP for submit@debbugs.gnu.org; Sun, 31 Dec 2023 08:26:26 -0500 Received: from lists.gnu.org ([2001:470:142::17]:59466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJvpg-0000Ag-9w for submit@debbugs.gnu.org; Sun, 31 Dec 2023 08:26:24 -0500 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 1rJvpY-0002S0-Np for bug-gnu-emacs@gnu.org; Sun, 31 Dec 2023 08:26:16 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJvpR-0004uU-Tu for bug-gnu-emacs@gnu.org; Sun, 31 Dec 2023 08:26:16 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 080315C00F9 for ; Sun, 31 Dec 2023 08:26:09 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 31 Dec 2023 08:26:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; h=cc:content-type:content-type:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to; s=fm1; t=1704029169; x=1704115569; bh=UkygHtmZ9kvqbmTVI5zji6tiKDvOkyXF cRZIiU7BTis=; b=sTp6GY3FfIdIJQoK35etpd/xCimAS1rtdPgEQWrquqNsXNDd 2m1q19/jM1CaYUIUBZOOtDp9cf2G+EWmPuM9ZsJbonOpg9ga9fHgzo8PUdv1oh62 Gtbi6ML1SFTM3pTb14ftcIOGW+gwW7wCOBZ5rDQ3vkmNwtPOQ8wC/PjAFd4IUp3k q0DV9NTFR69X0kX0MMImEniSYn1UtXKTEc5pmCWn2HDEsibJ2GeF6IHbF+jKZFva aNkOw/j2EWHcujU32ljKPpOuOX3EYTtilTjLarIT0A1o3TRsdSXVAOKlvM3WkOxT GXwbYY6DWGfRQjwTKcA3vv6VcHp7C6u2rFEmTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1704029169; x=1704115569; bh=UkygHtmZ9kvqbmTVI5zji6tiKDvOkyXFcRZ IiU7BTis=; b=JCo/E8daic3VRGtHGKGGvvzpJ6WCUtqyQnWlYvH5pkBNa2w2PhM aK4T3IgNdRgxj1J1CEzVJWrXurh5gXmvUe2pPYLGs6fdgrVm3WXfO4UqgGg30zaP ZZtYys/DKMdSYhKvl8gZQqaomMLK9h1KcPZmvP5ABcfIuCN644vv/8+m4yiZZJRu C2KGy4dxAJPGXAlbRWgBwNYeBT8f5WhfQ8lbG+3fGbsQxRvyiFclLjyL2fjCBa7Z x2SBBPKuyMTbFTYKVBkWSSjt9LKjJ0TAAeuK0FaTMUzlbq4ib03oZHrN/2TIC0cQ razE6d/OU/iDmDz6fNEZpUSvy+w3HMr77bg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdefkedgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkfgggtgesthdttddttd ertdenucfhrhhomhepufgvrghnucghhhhithhtohhnuceoshhpfihhihhtthhonhesshhp fihhihhtthhonhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeffgfehgefggfehuedvte fhkedutdfggfdtueekgeektdetffdtgefhvdfgtdejleenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsphifhhhithhtohhnsehsphifhhhith htohhnrdhnrghmvg X-ME-Proxy: Feedback-ID: i23c04076:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sun, 31 Dec 2023 08:26:08 -0500 (EST) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id D39F39409EF; Sun, 31 Dec 2023 13:26:06 +0000 (GMT) From: Sean Whitton Date: Sun, 31 Dec 2023 13:26:06 +0000 Message-ID: <87bka6y041.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=66.111.4.27; envelope-from=spwhitton@spwhitton.name; helo=out3-smtp.messagingengine.com X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) X-debbugs-cc: juri@linkov.net Hello, 1. emacs -q 2. (setopt vc-deduce-backend-nonvc-modes t) 3. C-x C-f ~/src/dotfiles/.emacs.d/init.el RET 4. C-x p p ~/src/emacs/ RET o C-x v L 5. (project-root (project-current)) => "~/src/emacs/" 6. C-x v + - git pull is attempted in ~/src/dotfiles/. You're in a *vc-change-log* for emacs.git, and (project-current) returns the correct project. But C-x v + operates in ~/src/dotfiles/. -- Sean Whitton From unknown Tue Jun 17 01:48:48 2025 X-Loop: help-debbugs@gnu.org Subject: bug#68174: 30.0.50; Project and VC disagree about what repository we're in Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 02 Jan 2024 03:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68174 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Sean Whitton , 68174@debbugs.gnu.org Cc: juri@linkov.net Received: via spool by 68174-submit@debbugs.gnu.org id=B68174.170416629613844 (code B ref 68174); Tue, 02 Jan 2024 03:32:01 +0000 Received: (at 68174) by debbugs.gnu.org; 2 Jan 2024 03:31:36 +0000 Received: from localhost ([127.0.0.1]:49163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKVV9-0003bE-PF for submit@debbugs.gnu.org; Mon, 01 Jan 2024 22:31:36 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:57453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKVV6-0003Uy-MP for 68174@debbugs.gnu.org; Mon, 01 Jan 2024 22:31:33 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id B86455C00D7; Mon, 1 Jan 2024 22:31:24 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 01 Jan 2024 22:31:24 -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=1704166284; x=1704252684; bh=Wt6LpcP5uz9W9l/W7yalRgbXLkYbLEj3ikABwmaEWr8=; b= Is8H8gEk3xw6Bw5S4Fp+vllWBdwd7leaRvXmgZmbEgQifyHBtRO5SDopZllZQXkF 5xXkr4I2Ywzb6q+5QWPJlQcd/NAdnXBlkghahALQa9QjYQeFAYc26w1os7MMFBeZ TU6D6cWN90R2r3A8gGjj/NUks0uFgP4e7KzZ5zL95WI5pYngyuJhbVHDPm7/Cy9R XTdtLhkXmaLvsv+HnTsJmJ7tvg0Azpolrg8ARvyIRxwYiCQ4OWjeHRDF3Ih2ymuL R0Weq/XRETv0u4tYqaZkIXRZ2Vjn8VICoMKZuddoAYW/bTqdrpEV3m4qmXSj6R9p uxe6LcSb/2WitgawELD4hw== 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=1704166284; x= 1704252684; bh=Wt6LpcP5uz9W9l/W7yalRgbXLkYbLEj3ikABwmaEWr8=; b=y Rn0ONgiVI+Y5H8cMhgLj116KKoj3Jv/me/lHLyKdrEuv0XYqVVaCfyGgP72a2mNU 8Hx4NMyez5iSCkSJpDUE/lafz7mVJr9IC4ZxwgmZeJa3ofyyzsxsMBk8ElwVVXWu aG5BCWufI2CezeDRyGz232P2ESWvp7+oRG1CKWQEcAKWkkVmfF14p6tQO1M2ux4w bDCcqg7iQ+BKcLJVOQjHneWVaP0KKd7lgJfrJJHnuf0krlmLF0EEz6XwgjSa5Slo oJ0mzcTynMzOxVL3Aej0pY+O7b1ydk16057GfYG+NKUCyTMu2gFYgtXsULR588EQ USSTCChzdXhIm07sxXDHQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdeguddgieduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhepteduleejgeehtefgheegjeekueehvdevieekueeftddvtdevfefhvdevgedu jeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug hmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 1 Jan 2024 22:31:23 -0500 (EST) Message-ID: <8c47be44-ea77-48b5-bbdf-53b4e245f7a7@gutov.dev> Date: Tue, 2 Jan 2024 05:31:20 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US References: <87bka6y041.fsf@zephyr.silentflame.com> From: Dmitry Gutov In-Reply-To: <87bka6y041.fsf@zephyr.silentflame.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi! On 31/12/2023 15:26, Sean Whitton wrote: > X-debbugs-cc:juri@linkov.net > > Hello, > > 1. emacs -q > 2. (setopt vc-deduce-backend-nonvc-modes t) > 3. C-x C-f ~/src/dotfiles/.emacs.d/init.el RET > 4. C-x p p ~/src/emacs/ RET o C-x v L > 5. (project-root (project-current)) => "~/src/emacs/" > 6. C-x v + > - git pull is attempted in ~/src/dotfiles/. > > You're in a*vc-change-log* for emacs.git, and (project-current) returns > the correct project. But C-x v + operates in ~/src/dotfiles/. Thanks for the report. 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). 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) From unknown Tue Jun 17 01:48:48 2025 X-Loop: help-debbugs@gnu.org Subject: bug#68174: 30.0.50; Project and VC disagree about what repository we're in 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 X-GNU-PR-Keywords: To: Dmitry Gutov Cc: 68174@debbugs.gnu.org, juri@linkov.net Received: via spool by 68174-submit@debbugs.gnu.org id=B68174.170418575729593 (code B ref 68174); Tue, 02 Jan 2024 08:56:02 +0000 Received: (at 68174) by debbugs.gnu.org; 2 Jan 2024 08:55:57 +0000 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 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 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) 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 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 2 Jan 2024 03:55:44 -0500 (EST) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id 972AD940D39; Tue, 2 Jan 2024 08:55:42 +0000 (GMT) From: Sean Whitton In-Reply-To: <8c47be44-ea77-48b5-bbdf-53b4e245f7a7@gutov.dev> (Dmitry Gutov's message of "Tue, 2 Jan 2024 05:31:20 +0200") References: <87bka6y041.fsf@zephyr.silentflame.com> <8c47be44-ea77-48b5-bbdf-53b4e245f7a7@gutov.dev> Date: Tue, 02 Jan 2024 08:55:42 +0000 Message-ID: <8734vgqfld.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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 From unknown Tue Jun 17 01:48:48 2025 X-Loop: help-debbugs@gnu.org Subject: bug#68174: 30.0.50; Project and VC disagree about what repository we're in 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 X-GNU-PR-Keywords: To: Sean Whitton , Eli Zaretskii Cc: 68174@debbugs.gnu.org, juri@linkov.net Received: via spool by 68174-submit@debbugs.gnu.org id=B68174.170420106431136 (code B ref 68174); Tue, 02 Jan 2024 13:12:01 +0000 Received: (at 68174) by debbugs.gnu.org; 2 Jan 2024 13:11:04 +0000 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 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 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) 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 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 2 Jan 2024 08:10:53 -0500 (EST) Message-ID: <2a278850-2241-4e43-b81f-1cefdfe7d930@gutov.dev> Date: Tue, 2 Jan 2024 15:10:53 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US References: <87bka6y041.fsf@zephyr.silentflame.com> <8c47be44-ea77-48b5-bbdf-53b4e245f7a7@gutov.dev> <8734vgqfld.fsf@zephyr.silentflame.com> From: Dmitry Gutov In-Reply-To: <8734vgqfld.fsf@zephyr.silentflame.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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. From unknown Tue Jun 17 01:48:48 2025 X-Loop: help-debbugs@gnu.org Subject: bug#68174: 30.0.50; Project and VC disagree about what repository we're in 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 X-GNU-PR-Keywords: To: Dmitry Gutov Cc: juri@linkov.net, 68174@debbugs.gnu.org, spwhitton@spwhitton.name Received: via spool by 68174-submit@debbugs.gnu.org id=B68174.170420217510355 (code B ref 68174); Tue, 02 Jan 2024 13:30:02 +0000 Received: (at 68174) by debbugs.gnu.org; 2 Jan 2024 13:29:35 +0000 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 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 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==; Date: Tue, 02 Jan 2024 15:28:59 +0200 Message-Id: <83v88bzwx0.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <2a278850-2241-4e43-b81f-1cefdfe7d930@gutov.dev> (message from Dmitry Gutov on Tue, 2 Jan 2024 15:10:53 +0200) 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> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > 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. From unknown Tue Jun 17 01:48:48 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Sean Whitton Subject: bug#68174: closed (Re: bug#68174: 30.0.50; Project and VC disagree about what repository we're in) Message-ID: References: <08d721c2-905e-4818-8c87-b1de6481d0e6@gutov.dev> <87bka6y041.fsf@zephyr.silentflame.com> X-Gnu-PR-Message: they-closed 68174 X-Gnu-PR-Package: emacs Reply-To: 68174@debbugs.gnu.org Date: Wed, 03 Jan 2024 00:14:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1704240842-21087-1" This is a multi-part message in MIME format... ------------=_1704240842-21087-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #68174: 30.0.50; Project and VC disagree about what repository we're in which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 68174@debbugs.gnu.org. --=20 68174: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D68174 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1704240842-21087-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 68174-done) by debbugs.gnu.org; 3 Jan 2024 00:13:30 +0000 Received: from localhost ([127.0.0.1]:51588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKosw-0005T4-Pj for submit@debbugs.gnu.org; Tue, 02 Jan 2024 19:13:30 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:44931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKosr-0005Sn-2m for 68174-done@debbugs.gnu.org; Tue, 02 Jan 2024 19:13:25 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id CABFB5C00B7; Tue, 2 Jan 2024 19:13:12 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Tue, 02 Jan 2024 19:13:12 -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=1704240792; x=1704327192; bh=CHSlHTiOI1tOacXhwl4Ru5eU9RGrGgjI35KovkRZWuk=; b= nNs+qhK/8wkBxcW83U1+fgdvseL6lFBirGw21hCtWsE/5V2akTrOAlAeSs3PyAJ/ opwIaWqIIWbilFo/B361EIbs0qE6geu0TC/TQcLMb7rc2cLndRSaNg5xuat3yoi5 70QHptvZOy19aRLHFDlzR9jkIDBeaFhlVs/YNpMHLqXF6qbwfnfT++nFNny/SHXv 65Gz7/3oPaTAl/CxEOMpIq6Xoerte9jyv5ZB1Szk4NTuvgTQE4P68Jsqb7XGipUe 2BlZ+ttf6KbS7v4ZW0d3hChGkZJRrmmlpKy29Ud+A6hT4h+jCgkRfDKeWsfCfjeM ZwrudyfO5l1s50yWkLUiOA== 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=1704240792; x= 1704327192; bh=CHSlHTiOI1tOacXhwl4Ru5eU9RGrGgjI35KovkRZWuk=; b=C S447M8f2dujKqsTUwvIj7+Khy49YCW9OYppRtItjXkSshGWlQshujtJMV3Z+hUPP fyFoP8iGsrp7D9zeAEl9aBO6tYTKd1qcOKfQFORtAOMrrr0ceY3WJ3Lw+0Z12Ft0 z08ucLorV9UvXYr0UqXVazlur4/Oc5YwfS/v4O4UhhJj4tSRtWMpe8vnwv25Du35 ipyhY5zKvhGUyvUTEj492RXCqrjKRU95hQeKClLquh7kW2S2jx5f5rPnqm6yXc7n wRxeejOK6NDxOB9NISn2bk1gR3D7R9hRFP2gj8DBfqNPyItigvcgRXpvHY4fLx4Z jH/bZQENQIQBnbKraDJVg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdeggedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhepteduleejgeehtefgheegjeekueehvdevieekueeftddvtdevfefhvdevgedu jeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug hmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 2 Jan 2024 19:13:11 -0500 (EST) Message-ID: <08d721c2-905e-4818-8c87-b1de6481d0e6@gutov.dev> Date: Wed, 3 Jan 2024 02:13:07 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#68174: 30.0.50; Project and VC disagree about what repository we're in To: Eli Zaretskii 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> <83v88bzwx0.fsf@gnu.org> Content-Language: en-US From: Dmitry Gutov In-Reply-To: <83v88bzwx0.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 68174-done Cc: juri@linkov.net, 68174-done@debbugs.gnu.org, spwhitton@spwhitton.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Version: 30.1 On 02/01/2024 15:28, Eli Zaretskii wrote: >> 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. It's not a trivial transformation, but it's semantically sound: log-view-mode saves -- or one might say caches -- the backend and the fileset in its own variables locally (referenced in the diff above). The commands in log-view.el (of which there are several) use those vars rather than look up vc-parent-buffer, so the values should be correct. > And the use > case is pretty rare, AFAICT. So I tend to be happier with this on > master. Ok, I'll push it to master for now. ------------=_1704240842-21087-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 31 Dec 2023 13:26:27 +0000 Received: from localhost ([127.0.0.1]:45822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJvpi-0000Ay-NP for submit@debbugs.gnu.org; Sun, 31 Dec 2023 08:26:26 -0500 Received: from lists.gnu.org ([2001:470:142::17]:59466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJvpg-0000Ag-9w for submit@debbugs.gnu.org; Sun, 31 Dec 2023 08:26:24 -0500 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 1rJvpY-0002S0-Np for bug-gnu-emacs@gnu.org; Sun, 31 Dec 2023 08:26:16 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJvpR-0004uU-Tu for bug-gnu-emacs@gnu.org; Sun, 31 Dec 2023 08:26:16 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 080315C00F9 for ; Sun, 31 Dec 2023 08:26:09 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 31 Dec 2023 08:26:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; h=cc:content-type:content-type:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to; s=fm1; t=1704029169; x=1704115569; bh=UkygHtmZ9kvqbmTVI5zji6tiKDvOkyXF cRZIiU7BTis=; b=sTp6GY3FfIdIJQoK35etpd/xCimAS1rtdPgEQWrquqNsXNDd 2m1q19/jM1CaYUIUBZOOtDp9cf2G+EWmPuM9ZsJbonOpg9ga9fHgzo8PUdv1oh62 Gtbi6ML1SFTM3pTb14ftcIOGW+gwW7wCOBZ5rDQ3vkmNwtPOQ8wC/PjAFd4IUp3k q0DV9NTFR69X0kX0MMImEniSYn1UtXKTEc5pmCWn2HDEsibJ2GeF6IHbF+jKZFva aNkOw/j2EWHcujU32ljKPpOuOX3EYTtilTjLarIT0A1o3TRsdSXVAOKlvM3WkOxT GXwbYY6DWGfRQjwTKcA3vv6VcHp7C6u2rFEmTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1704029169; x=1704115569; bh=UkygHtmZ9kvqbmTVI5zji6tiKDvOkyXFcRZ IiU7BTis=; b=JCo/E8daic3VRGtHGKGGvvzpJ6WCUtqyQnWlYvH5pkBNa2w2PhM aK4T3IgNdRgxj1J1CEzVJWrXurh5gXmvUe2pPYLGs6fdgrVm3WXfO4UqgGg30zaP ZZtYys/DKMdSYhKvl8gZQqaomMLK9h1KcPZmvP5ABcfIuCN644vv/8+m4yiZZJRu C2KGy4dxAJPGXAlbRWgBwNYeBT8f5WhfQ8lbG+3fGbsQxRvyiFclLjyL2fjCBa7Z x2SBBPKuyMTbFTYKVBkWSSjt9LKjJ0TAAeuK0FaTMUzlbq4ib03oZHrN/2TIC0cQ razE6d/OU/iDmDz6fNEZpUSvy+w3HMr77bg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdefkedgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkfgggtgesthdttddttd ertdenucfhrhhomhepufgvrghnucghhhhithhtohhnuceoshhpfihhihhtthhonhesshhp fihhihhtthhonhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeffgfehgefggfehuedvte fhkedutdfggfdtueekgeektdetffdtgefhvdfgtdejleenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsphifhhhithhtohhnsehsphifhhhith htohhnrdhnrghmvg X-ME-Proxy: Feedback-ID: i23c04076:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sun, 31 Dec 2023 08:26:08 -0500 (EST) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id D39F39409EF; Sun, 31 Dec 2023 13:26:06 +0000 (GMT) From: Sean Whitton To: bug-gnu-emacs@gnu.org Subject: 30.0.50; Project and VC disagree about what repository we're in Date: Sun, 31 Dec 2023 13:26:06 +0000 Message-ID: <87bka6y041.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=66.111.4.27; envelope-from=spwhitton@spwhitton.name; helo=out3-smtp.messagingengine.com X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) X-debbugs-cc: juri@linkov.net Hello, 1. emacs -q 2. (setopt vc-deduce-backend-nonvc-modes t) 3. C-x C-f ~/src/dotfiles/.emacs.d/init.el RET 4. C-x p p ~/src/emacs/ RET o C-x v L 5. (project-root (project-current)) => "~/src/emacs/" 6. C-x v + - git pull is attempted in ~/src/dotfiles/. You're in a *vc-change-log* for emacs.git, and (project-current) returns the correct project. But C-x v + operates in ~/src/dotfiles/. -- Sean Whitton ------------=_1704240842-21087-1-- From unknown Tue Jun 17 01:48:48 2025 X-Loop: help-debbugs@gnu.org Subject: bug#68174: 30.0.50; Project and VC disagree about what repository we're in Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 03 Jan 2024 12:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68174 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov Cc: juri@linkov.net, 68174@debbugs.gnu.org, spwhitton@spwhitton.name Received: via spool by 68174-submit@debbugs.gnu.org id=B68174.170428569513126 (code B ref 68174); Wed, 03 Jan 2024 12:42:01 +0000 Received: (at 68174) by debbugs.gnu.org; 3 Jan 2024 12:41:35 +0000 Received: from localhost ([127.0.0.1]:51954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rL0Yx-0003Pd-EQ for submit@debbugs.gnu.org; Wed, 03 Jan 2024 07:41:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rL0Ys-0003PM-Gs for 68174@debbugs.gnu.org; Wed, 03 Jan 2024 07:41:33 -0500 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 1rL0Yj-0008Qq-Ol; Wed, 03 Jan 2024 07:41:22 -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=V+KPeyIXrJMA/lfU+XnO7qqh3WWxDp3XmNSdLrf8TI0=; b=EB3sYjBqLXmd DghE2NAfQt9caSf4FvuBAhHB6QVDdWSDS3iv0RWvNNWdQLLRWIkvlfWP6Byb0I9oiiV6ta6Avq08y j5eiDqrc5b4Q5fCME4HOweRFrQvB4vuHOJ8QioUxXwF6375+FU2wpn334yUQiIRRZiy2bDP2oBNy2 1e7NtqN/tz3HCcrxp7ZGqW1E7XzdZ6V7MnWNojG0cFBesE27pGciYxzFSONT6fMS9jjWF3UPE8OHX /+RZeya/6BBXBu4161fn64E6lJRlNrsWI2oO+xeEFP8XhXPtnYSyGNcA2oWK9mxjcgJ8wjcfN8D7L 3oYMOW2G5zb7O0qcdWjYQA==; Date: Wed, 03 Jan 2024 14:41:03 +0200 Message-Id: <83cyuizj1c.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <08d721c2-905e-4818-8c87-b1de6481d0e6@gutov.dev> (message from Dmitry Gutov on Wed, 3 Jan 2024 02:13:07 +0200) 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> <83v88bzwx0.fsf@gnu.org> <08d721c2-905e-4818-8c87-b1de6481d0e6@gutov.dev> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Wed, 3 Jan 2024 02:13:07 +0200 > Cc: spwhitton@spwhitton.name, 68174-done@debbugs.gnu.org, juri@linkov.net > From: Dmitry Gutov > > > 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. > > It's not a trivial transformation, but it's semantically sound: > log-view-mode saves -- or one might say caches -- the backend and the > fileset in its own variables locally (referenced in the diff above). The > commands in log-view.el (of which there are several) use those vars > rather than look up vc-parent-buffer, so the values should be correct. Thanks. Let's see if there are some use cases which actually benefit from an ad-hoc decision at that place instead of using the stashed values.