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 19:46:51 +0200 Organization: LINKOV.NET Message-ID: <864jsfygsw.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> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40771"; 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 18:52:36 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 1pKNTI-000AOz-4q for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 24 Jan 2023 18:52:36 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKNT7-0007jm-Jx; Tue, 24 Jan 2023 12:52:27 -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 1pKNSl-0007iu-De for bug-gnu-emacs@gnu.org; Tue, 24 Jan 2023 12:52: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 1pKNSl-0004EQ-34 for bug-gnu-emacs@gnu.org; Tue, 24 Jan 2023 12:52:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pKNSk-0003EI-VD for bug-gnu-emacs@gnu.org; Tue, 24 Jan 2023 12:52: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 17:52: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.167458269412361 (code B ref 60897); Tue, 24 Jan 2023 17:52:02 +0000 Original-Received: (at 60897) by debbugs.gnu.org; 24 Jan 2023 17:51:34 +0000 Original-Received: from localhost ([127.0.0.1]:57510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKNSH-0003DJ-Qz for submit@debbugs.gnu.org; Tue, 24 Jan 2023 12:51:34 -0500 Original-Received: from relay4-d.mail.gandi.net ([217.70.183.196]:39089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKNSH-0003D6-0S for 60897@debbugs.gnu.org; Tue, 24 Jan 2023 12:51:33 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 44FE6E0009; Tue, 24 Jan 2023 17:51:23 +0000 (UTC) In-Reply-To: <83v8kxidu2.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 23 Jan 2023 15:24:05 +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:254059 Archived-At: >> >> > (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) >> >> There is another string= call that fails inside vc-resynch-window >> called from vc-resynch-buffer. > > How about replacing string= in these two cases with something smarter, > which would expand-file-name? Comparing file names as simple strings > is wrought with trouble anyway. This works as well: diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index e1a3eff448d..8a0cdef4726 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el @@ -608,7 +608,7 @@ 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-prefix-p file buffer-file-name) (if keep (when (file-exists-p file) (when reset-vc-info @@ -643,7 +643,7 @@ 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-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)