From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andrii Kolomoiets Newsgroups: gmane.emacs.bugs Subject: bug#43464: 28.0.50; vc: Error calling vc-revert for repo root Date: Wed, 30 Sep 2020 12:13:41 +0300 Message-ID: References: <0b1c72d0-f8fb-a256-1563-1c43296c8edb@yandex.ru> <11761d79-1893-fdf3-843d-bea4a026fc7f@yandex.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29406"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (darwin) Cc: 43464@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Sep 30 11:14:10 2020 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 1kNYBe-0007YA-I4 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 30 Sep 2020 11:14:10 +0200 Original-Received: from localhost ([::1]:52872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNYBd-0005MD-53 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 30 Sep 2020 05:14:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNYBW-0005Ls-I6 for bug-gnu-emacs@gnu.org; Wed, 30 Sep 2020 05:14:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNYBW-0001oL-8t for bug-gnu-emacs@gnu.org; Wed, 30 Sep 2020 05:14:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNYBW-0005xO-4h for bug-gnu-emacs@gnu.org; Wed, 30 Sep 2020 05:14:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Andrii Kolomoiets Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 30 Sep 2020 09:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43464 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Original-Received: via spool by 43464-submit@debbugs.gnu.org id=B43464.160145723422877 (code B ref 43464); Wed, 30 Sep 2020 09:14:02 +0000 Original-Received: (at 43464) by debbugs.gnu.org; 30 Sep 2020 09:13:54 +0000 Original-Received: from localhost ([127.0.0.1]:58172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNYBO-0005wv-94 for submit@debbugs.gnu.org; Wed, 30 Sep 2020 05:13:54 -0400 Original-Received: from mail-wm1-f43.google.com ([209.85.128.43]:34947) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNYBK-0005wf-6a for 43464@debbugs.gnu.org; Wed, 30 Sep 2020 05:13:52 -0400 Original-Received: by mail-wm1-f43.google.com with SMTP id y15so905061wmi.0 for <43464@debbugs.gnu.org>; Wed, 30 Sep 2020 02:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=jG9rWu6E9BNwVHrX85h+8Hv7ZQsEBrNzDxHxCVl3fow=; b=App2NZ6Crw7ZpmYLjYFv2zIUL7oL1KliHTE4ju9tAHncHKYt6tY0c23JllsvGmCYto oz2Lzga0AQwMesm/lMTH7FgPE5yzvpz700Z9v2ZVmjfjOIEkl2zHj3krov+8kCf5Ldc+ +Jv2DlPvy6t9eSLQ6mboNTh2T0jTfBI56Kg71iq2k+jK7fyEVuL6rbxBAAcAkAJv5HFZ +ZZUSD2j7aRxOMc4OP3lda4j1Ai8XCjTRdR+qyWcYYbIZYJ82iOG6P4Hif4tDd917Om8 swUB7h3CYBD8U1nP8mrQg52+6ZcjCrz8q08ajHLvW94J1PXdP0mKfg8aMpu3qCyhsWAa LUjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=jG9rWu6E9BNwVHrX85h+8Hv7ZQsEBrNzDxHxCVl3fow=; b=nf2OnjNg2KPrpSUL4YzZPGZoplsueJ3zQDOtGKetf2YTL8+rcRX1mulKUeuqb3eBxo cIb4lkhLvqL7gnTlRb62t44eandUAXuZEwuUkgfm+eCTTGgPHIUnvla0wQ4tKWvdTPey YhDwxa9U6oxOIdMurMGrzgN9mCgLELQJkuyZotwF6d13IqbgVdXjHaoq9MKlrypu5yZ5 vhaic58jZzW7MTNPDf8c5WMAKfKhhEh5gkgydsZBMf0/ex7IG1xg2w1GaNZOpkJxn8x5 ZYdYkOSxTwg3r28GYvk1qM4OoHGJryne6Wbb+k+d95IZHM3HjlLfSzM6dB9MDGQabsEm ehuQ== X-Gm-Message-State: AOAM532ULGRlh7ORGuK/N+f0HpW7kd+O1aDb9H/Q4E3jofj3YDy6sv3j F9ovpeyRHOHExuVZmptlEGvFG+tK05Q= X-Google-Smtp-Source: ABdhPJz3uAUXs5U9lCKGq57nxxF0l64O+V5GN4VxJLxxFwaL2nBrNcEHoYCwNhVQUWjZmY4F7N3Omg== X-Received: by 2002:a7b:c103:: with SMTP id w3mr1870289wmi.24.1601457223895; Wed, 30 Sep 2020 02:13:43 -0700 (PDT) Original-Received: from muffinmac ([91.206.110.145]) by smtp.gmail.com with ESMTPSA id u66sm1600612wme.12.2020.09.30.02.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2020 02:13:42 -0700 (PDT) In-Reply-To: (Andrii Kolomoiets's message of "Thu, 24 Sep 2020 10:15:21 +0300") 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" Xref: news.gmane.io gmane.emacs.bugs:189321 Archived-At: --=-=-= Content-Type: text/plain Andrii Kolomoiets writes: > Dmitry Gutov writes: >> Could you explain both changes in that patch? > > The idea is to make the 'vc-backend' function to return backend for > directory. > > `vc-backend` should return correct backend for directory and the > behavior of `vc-registered` must be kept unchanged. Please see attached patch. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-vc-backend-for-directory.patch >From 8b097942a3fbaf5b6d27fa61b2d3e5357d79beb8 Mon Sep 17 00:00:00 2001 From: Andrii Kolomoiets Date: Wed, 30 Sep 2020 12:02:21 +0300 Subject: [PATCH] vc-backend for directory * lisp/vc/vc-hooks.el (vc-registered): Use 'responsible-p' vc backend function to find backend for directories. (vc-backend): Don't depend on 'vc-registered' result because it nil for directories; always read 'vc-backend' property. --- lisp/vc/vc-hooks.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index f09ceddcb3..b20e2e0b00 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -336,12 +336,15 @@ vc-registered ;; There is no file name handler. ;; Try vc-BACKEND-registered for each handled BACKEND. (catch 'found - (let ((backend (vc-file-getprop file 'vc-backend))) + (let ((backend (vc-file-getprop file 'vc-backend)) + (fn-result (if (file-directory-p file) + '(responsible-p) + '(registered . t)))) (mapc (lambda (b) - (and (vc-call-backend b 'registered file) + (and (vc-call-backend b (car fn-result) file) (vc-file-setprop file 'vc-backend b) - (throw 'found t))) + (throw 'found (cdr fn-result)))) (if (or (not backend) (eq backend 'none)) vc-handled-backends (cons backend vc-handled-backends)))) @@ -361,9 +364,8 @@ vc-backend (cond ((eq property 'none) nil) (property) ;; vc-registered sets the vc-backend property - (t (if (vc-registered file-or-list) - (vc-file-getprop file-or-list 'vc-backend) - nil))))) + (t (vc-registered file-or-list) + (vc-file-getprop file-or-list 'vc-backend))))) ((and file-or-list (listp file-or-list)) (vc-backend (car file-or-list))) (t -- 2.15.1 --=-=-=--