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: Tue, 24 Jan 2023 20:18:32 +0200 Organization: LINKOV.NET Message-ID: <86y1prvls7.fsf@mail.linkov.net> References: <29401.1674004194@hassadar.pretzelnet.org> <86edrr4zcz.fsf@mail.linkov.net> <868rhu5w0u.fsf@mail.linkov.net> <83cz76jqm5.fsf@gnu.org> <86v8kx3czh.fsf@mail.linkov.net> <83v8kxidu2.fsf@gnu.org> <864jsfygsw.fsf@mail.linkov.net> <83ilgvhko6.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26271"; 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, epg@pretzelnet.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jan 24 19:20:30 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 1pKNuI-0006fg-EN for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 24 Jan 2023 19:20:30 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKNtu-00089w-Hv; Tue, 24 Jan 2023 13:20:06 -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 1pKNtr-00089i-7c for bug-gnu-emacs@gnu.org; Tue, 24 Jan 2023 13:20: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 1pKNtq-0001fh-Va for bug-gnu-emacs@gnu.org; Tue, 24 Jan 2023 13:20:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pKNtq-0003uk-H6 for bug-gnu-emacs@gnu.org; Tue, 24 Jan 2023 13:20: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: Tue, 24 Jan 2023 18:20: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.167458438415015 (code B ref 60897); Tue, 24 Jan 2023 18:20:02 +0000 Original-Received: (at 60897) by debbugs.gnu.org; 24 Jan 2023 18:19:44 +0000 Original-Received: from localhost ([127.0.0.1]:57539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKNtY-0003u7-GB for submit@debbugs.gnu.org; Tue, 24 Jan 2023 13:19:44 -0500 Original-Received: from relay7-d.mail.gandi.net ([217.70.183.200]:47897) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKNtX-0003tv-Qf for 60897@debbugs.gnu.org; Tue, 24 Jan 2023 13:19:44 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id DEA0420007; Tue, 24 Jan 2023 18:19:34 +0000 (UTC) In-Reply-To: <83ilgvhko6.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 24 Jan 2023 20:06:17 +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:254063 Archived-At: >> (defun vc-resynch-buffer (file &optional keep noquery reset-vc-info) >> "If FILE is currently visited, resynch its buffer." >> - (if (string= buffer-file-name file) >> + (if (string-prefix-p file buffer-file-name) >> (vc-resynch-window file keep noquery reset-vc-info) >> (if (file-directory-p file) >> (vc-resynch-buffers-in-directory file keep noquery reset-vc-info) > > I'm confused: I though the problem was that FILE was some relative > form of buffer-file-name, which is why you wanted to run it through > expand-file-name, to make it absolute. But if this is the case, > i.e. you have file = "foo" and buffer-file-name = /path/to/foo, then > string-prefix-p will not do the job, right? And even if it did, you > could have false positives. > > Maybe I just don't understand what this if clause is trying to test? I tried to avoid expand-file-name, but maybe it's unavoidable. In this case I can't find a solution simpler than this: diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index e1a3eff448d..fd5f655a0f6 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el @@ -608,7 +608,10 @@ vc-resynch-window difference between the buffer and the file is due to modifications by the dispatcher client code, rather than user editing!" - (and (string= buffer-file-name file) + (and (string= buffer-file-name + (if (file-name-absolute-p file) + file + (expand-file-name file (vc-root-dir)))) (if keep (when (file-exists-p file) (when reset-vc-info @@ -643,7 +646,10 @@ vc-resynch-buffers-in-directory (defun vc-resynch-buffer (file &optional keep noquery reset-vc-info) "If FILE is currently visited, resynch its buffer." - (if (string= buffer-file-name file) + (if (string= buffer-file-name + (if (file-name-absolute-p file) + file + (expand-file-name file (vc-root-dir)))) (vc-resynch-window file keep noquery reset-vc-info) (if (file-directory-p file) (vc-resynch-buffers-in-directory file keep noquery reset-vc-info)