From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#60897: 29.0.60; vc-revert fails to revert buffer Date: Sun, 22 Jan 2023 19:17:21 +0200 Organization: LINKOV.NET Message-ID: <868rhu5w0u.fsf@mail.linkov.net> References: <29401.1674004194@hassadar.pretzelnet.org> <86edrr4zcz.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17541"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: 60897@debbugs.gnu.org To: Eric Gillespie Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jan 22 18:18:14 2023 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 1pJdyw-0004Rc-Ba for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 22 Jan 2023 18:18:14 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJdyn-0008IZ-0V; Sun, 22 Jan 2023 12:18:05 -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 1pJdyl-0008HC-EC for bug-gnu-emacs@gnu.org; Sun, 22 Jan 2023 12:18:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJdyk-0007nR-Gu for bug-gnu-emacs@gnu.org; Sun, 22 Jan 2023 12:18:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJdyk-0005ge-Cu for bug-gnu-emacs@gnu.org; Sun, 22 Jan 2023 12:18:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 22 Jan 2023 17:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60897 X-GNU-PR-Package: emacs Original-Received: via spool by 60897-submit@debbugs.gnu.org id=B60897.167440788021850 (code B ref 60897); Sun, 22 Jan 2023 17:18:02 +0000 Original-Received: (at 60897) by debbugs.gnu.org; 22 Jan 2023 17:18:00 +0000 Original-Received: from localhost ([127.0.0.1]:52580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJdyi-0005gM-HW for submit@debbugs.gnu.org; Sun, 22 Jan 2023 12:18:00 -0500 Original-Received: from relay8-d.mail.gandi.net ([217.70.183.201]:45835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJdyg-0005g8-9l for 60897@debbugs.gnu.org; Sun, 22 Jan 2023 12:17:58 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 3A9981BF205; Sun, 22 Jan 2023 17:17:50 +0000 (UTC) In-Reply-To: <86edrr4zcz.fsf@mail.linkov.net> (Juri Linkov's message of "Wed, 18 Jan 2023 19:29:16 +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:253953 Archived-At: > But as you noticed it doesn't refresh the buffer. This is because > vc-deduce-fileset in the diff buffer now returns relative file names, > not absolute as vc-resynch-buffer expects. > > Expanding relative file names to absolute is not possible in > diff-vc-deduce-fileset, because then C-x v v will fail in > vc-default-checkin-patch that expects relative file names. > > So I think the right place to do this is before trying to compare > relative names with (string= buffer-file-name file): > > diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el > @@ -643,6 +643,8 @@ vc-resynch-buffers-in-directory > > (defun vc-resynch-buffer (file &optional keep noquery reset-vc-info) > "If FILE is currently visited, resynch its buffer." > + (unless (file-name-absolute-p file) > + (setq file (expand-file-name file (vc-root-dir)))) > (if (string= buffer-file-name file) > (vc-resynch-window file keep noquery reset-vc-info) > (if (file-directory-p file) Eli, is this ok for the emacs-29 branch? I'm unsure because vc-resynch-buffer is used in too many places, so this change is not localized to vc-revert.