From: Juri Linkov <juri@linkov.net>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 60897@debbugs.gnu.org, epg@pretzelnet.org
Subject: bug#60897: 29.0.60; vc-revert fails to revert buffer
Date: Tue, 24 Jan 2023 20:18:32 +0200 [thread overview]
Message-ID: <86y1prvls7.fsf@mail.linkov.net> (raw)
In-Reply-To: <83ilgvhko6.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 24 Jan 2023 20:06:17 +0200")
>> (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)
next prev parent reply other threads:[~2023-01-24 18:18 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-18 1:09 bug#60897: 29.0.60; vc-revert fails to revert buffer Eric Gillespie
2023-01-18 17:29 ` Juri Linkov
2023-01-21 0:54 ` Eric Gillespie
2023-01-22 17:12 ` Juri Linkov
2023-01-22 17:17 ` Juri Linkov
2023-01-22 19:50 ` Eli Zaretskii
2023-01-23 7:51 ` Juri Linkov
2023-01-23 13:24 ` Eli Zaretskii
2023-01-24 17:46 ` Juri Linkov
2023-01-24 18:06 ` Eli Zaretskii
2023-01-24 18:18 ` Juri Linkov [this message]
2023-01-24 18:36 ` Eli Zaretskii
2023-01-24 18:49 ` Juri Linkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86y1prvls7.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=60897@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=epg@pretzelnet.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).