From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#50572: 28.0.50; [PATCH] fix VC to find the responsible backend with the most specific path. Date: Fri, 12 Nov 2021 14:05:17 +0200 Message-ID: <83a6i9ziiq.fsf@gnu.org> References: <877dfkxyt4.fsf@elite.giraud> <87cznef8ah.fsf@gnus.org> <86ilx5iaze.fsf@gmail.com> <87pmrdb0zv.fsf@gnus.org> <86mtmgx6gg.fsf@gmail.com> <87fe707b-f2b4-febd-d2ae-acc697b4cee1@yandex.ru> <87zgqgjeaz.fsf@gnus.org> <87cznbt2r1.fsf@elite.giraud> <87h7cn803w.fsf@gnus.org> <878rxzszl8.fsf@elite.giraud> <877ddiuhv7.fsf@gnus.org> <87y25x3e6g.fsf@elite.giraud> <87a6icoqkm.fsf@gnus.org> <87k0hditw7.fsf@elite.giraud> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39023"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 50572@debbugs.gnu.org, larsi@gnus.org, andrewjmoreton@gmail.com, dgutov@yandex.ru To: Manuel Giraud Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Nov 12 13:06:32 2021 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 1mlVKB-0009uL-EK for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 12 Nov 2021 13:06:31 +0100 Original-Received: from localhost ([::1]:59070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mlVKA-0000af-7E for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 12 Nov 2021 07:06:30 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:48694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlVJi-0000Ym-LP for bug-gnu-emacs@gnu.org; Fri, 12 Nov 2021 07:06:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:60327) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mlVJi-0005M3-Cv for bug-gnu-emacs@gnu.org; Fri, 12 Nov 2021 07:06:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mlVJi-00044d-7J for bug-gnu-emacs@gnu.org; Fri, 12 Nov 2021 07:06:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 12 Nov 2021 12:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50572 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 50572-submit@debbugs.gnu.org id=B50572.163671874415631 (code B ref 50572); Fri, 12 Nov 2021 12:06:02 +0000 Original-Received: (at 50572) by debbugs.gnu.org; 12 Nov 2021 12:05:44 +0000 Original-Received: from localhost ([127.0.0.1]:43640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlVJP-000442-P9 for submit@debbugs.gnu.org; Fri, 12 Nov 2021 07:05:43 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:47890) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlVJO-00043o-2c for 50572@debbugs.gnu.org; Fri, 12 Nov 2021 07:05:42 -0500 Original-Received: from [2001:470:142:3::e] (port=55364 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlVJI-0005JW-5N; Fri, 12 Nov 2021 07:05:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=cGVK8lXDhrJ/GWZlEaW+HDM3sORKPZlDhz6YO1OeE1c=; b=POjSvjiZiRJA ymZiCGgyQ9VjcX1NmZFOzWFSuEFsxbZe/yJjYZJO/MPt7DE6rzrxVsaYYpz6crciOYLvRfujTdCv/ cFtmGoQHUbdeWLVeyN1RZyUGUDwZ3YIY4kW/nXEQajTq7T3lXPJYkW31DcUhzXroMlhoPsaN787du 9aSkaYFoSXTHEUfVxBPWbDweti0xqOoLa3SicmCyX82x+3SGZAX8u55I50yZZrQgNrhISQAOecaA4 ZxZHGWf/5Mnf+782ElDN3lR8BgZzRq0zMe8fgZ791YYTnujpc3jcNiJOKm/3oA0N3rogMW6cit01X Wdotkawv+m4i6JaPalJIhA==; Original-Received: from [87.69.77.57] (port=3690 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlVJH-0006f3-IN; Fri, 12 Nov 2021 07:05:35 -0500 In-Reply-To: <87k0hditw7.fsf@elite.giraud> (message from Manuel Giraud on Fri, 12 Nov 2021 10:51:36 +0100) 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:219762 Archived-At: > From: Manuel Giraud > Date: Fri, 12 Nov 2021 10:51:36 +0100 > Cc: 50572@debbugs.gnu.org, Andy Moreton , > Dmitry Gutov > > > It's pushed to the trunk now -- can you adjust the patch to use that > > instead? > > There you go. > > >From 2e4e651b722673439be2654c7aae4202e8e73cd4 Mon Sep 17 00:00:00 2001 > From: Manuel Giraud > Date: Fri, 12 Nov 2021 10:46:56 +0100 > Subject: [PATCH] Find most specific backend for `vc-backend-for-registration'. > > --- > lisp/vc/vc.el | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el > index 4b56f1b795..b8f0425393 100644 > --- a/lisp/vc/vc.el > +++ b/lisp/vc/vc.el > @@ -945,7 +945,7 @@ vc-backend-for-registration > (dolist (backend vc-handled-backends) > (when (not (vc-call-backend backend 'registered file)) > (let* ((path (vc-call-backend backend 'responsible-p file)) > - (len (length path))) > + (len (and path (length (file-name-split path))))) > (when (and len (> len max)) > (setq max len bk backend))))) > (when bk Please don't use "path" for anything that is not PATH-style directory lists. Also, shouldn't the file name(s) be run through expand-file-name, to make sure they are absolute? Otherwise comparing the length will not DTRT.