From: Dmitry Gutov <dgutov@yandex.ru>
To: Andrii Kolomoiets <andreyk.mad@gmail.com>
Cc: 43464@debbugs.gnu.org
Subject: bug#43464: 28.0.50; vc: Error calling vc-revert for repo root
Date: Thu, 8 Oct 2020 01:47:29 +0300 [thread overview]
Message-ID: <fbff5fc9-d8cb-bae4-05a7-be1822eccfd5@yandex.ru> (raw)
In-Reply-To: <m2sgaquqg2.fsf@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1986 bytes --]
On 07.10.2020 16:16, Andrii Kolomoiets wrote:
> Dmitry Gutov <dgutov@yandex.ru> writes:
>
>> On 05.10.2020 09:02, Andrii Kolomoiets wrote:
>>> Dmitry Gutov <dgutov@yandex.ru> writes:
>>>
>>>> Where is that vc-backend called from, in our scenario?
>>> It's called from 'vc-call'. The 'vc-revert-file' used it twice
>>> to call the 'make-version-backups-p' and the 'revert' backend functions.
>>
>> Then a change in vc-revert-file could be sufficient.
>
> Can you please advice me what this change should look like? Get rid of
> calling 'vc-call'?
Yes. How about the attached patch?
> In this case the function 'vc-version-backup-file'
> must be changed as well.
Does it actually make sense to use it on a directory?
>>>> Could we make do with changing that code to use vc-responsible-backend
>>>> instead of vc-backend instead? If it's not a function called
>>>> frequently.
>>> I went a little different way and made the 'vc-backend' return
>>> correct
>>> backend for directories. In case you missed it somehow here is the link
>>> to the message:
>>> https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-09/msg02508.html
>>
>> Like I explained, it will create a cache entry that is never invalidated.
>
> In what way VC backend for directory could be changed? Like 'rm -rf .hg
> && git init'? We can make the 'vc-backend' function to ignore cached
> backend for directories. Though I think it's not efficient.
Something like that. Or 'git init' inside a subdirectory. Not a frequent
occurrence, but if we start using directories and files interchangeably
in more places, we are likely to start caching other properties on them,
too. So it's better to use a different function to detect which backend
a directory belongs to.
Also, your patch makes vc-registered work on directories. What does it
mean to have a directory "registered"? It's not a well-defined notion,
given that most of contemporary VC systems don't track directories, only
the files inside them.
[-- Attachment #2: vc-revert-dirs.diff --]
[-- Type: text/x-patch, Size: 1129 bytes --]
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 3852a64550..8efd9fd560 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2788,14 +2788,21 @@ vc-version-backup-file
backup-file)))))
(defun vc-revert-file (file)
- "Revert FILE back to the repository working revision it was based on."
+ "Revert FILE back to the repository working revision it was based on.
+FILE can be a plain file or a directory, and in the latter case
+all files inside that directory will be reverted."
(with-vc-properties
(list file)
- (let ((backup-file (vc-version-backup-file file)))
+ (let* ((dir (file-directory-p file))
+ (backup-file (unless dir (vc-version-backup-file file))))
(when backup-file
(copy-file backup-file file 'ok-if-already-exists)
(vc-delete-automatic-version-backups file))
- (vc-call revert file backup-file))
+ (vc-call-backend
+ (if dir
+ (vc-backend file)
+ (vc-responsible-backend file))
+ 'revert file backup-file))
`((vc-state . up-to-date)
(vc-checkout-time . ,(file-attribute-modification-time
(file-attributes file)))))
next prev parent reply other threads:[~2020-10-07 22:47 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-17 7:29 bug#43464: 28.0.50; vc: Error calling vc-revert for repo root Andrii Kolomoiets
2020-09-17 16:10 ` Lars Ingebrigtsen
2020-09-18 9:00 ` Dmitry Gutov
2020-09-18 9:30 ` Andrii Kolomoiets
2020-09-18 13:30 ` Dmitry Gutov
2020-09-18 15:45 ` Andrii Kolomoiets
2020-09-22 19:48 ` Dmitry Gutov
2020-09-24 7:15 ` Andrii Kolomoiets
2020-09-30 9:13 ` Andrii Kolomoiets
2020-10-04 22:32 ` Dmitry Gutov
2020-10-05 6:02 ` Andrii Kolomoiets
2020-10-05 10:19 ` Dmitry Gutov
2020-10-07 13:16 ` Andrii Kolomoiets
2020-10-07 22:47 ` Dmitry Gutov [this message]
2020-10-11 20:28 ` Andrii Kolomoiets
2020-10-13 11:59 ` Dmitry Gutov
2020-09-18 13:18 ` Lars Ingebrigtsen
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=fbff5fc9-d8cb-bae4-05a7-be1822eccfd5@yandex.ru \
--to=dgutov@yandex.ru \
--cc=43464@debbugs.gnu.org \
--cc=andreyk.mad@gmail.com \
/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).