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 05:31:20 +0200 Message-ID: <8c47be44-ea77-48b5-bbdf-53b4e245f7a7@gutov.dev> References: <87bka6y041.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="40809"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla Thunderbird Cc: juri@linkov.net To: Sean Whitton , 68174@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jan 02 04:32: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 1rKVVg-000AMF-6J for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 02 Jan 2024 04:32:09 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKVVb-0006GO-HX; Mon, 01 Jan 2024 22:32: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 1rKVVY-0006Fj-2R for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2024 22:32: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 1rKVVX-0004Rg-QO for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2024 22:31:59 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKVVZ-0003bt-Sr for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2024 22:32: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 03:32: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.170416629613844 (code B ref 68174); Tue, 02 Jan 2024 03:32:01 +0000 Original-Received: (at 68174) by debbugs.gnu.org; 2 Jan 2024 03:31:36 +0000 Original-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 Original-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 Original-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) Original-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 Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 1 Jan 2024 22:31:23 -0500 (EST) Content-Language: en-US In-Reply-To: <87bka6y041.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:277211 Archived-At: 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)