From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Wolfgang Scherer Newsgroups: gmane.emacs.bugs Subject: bug#37182: 24.5; 24.5.1: C-u vc-dir-mark-all-files should not mark directories Date: Sun, 25 Aug 2019 19:54:22 +0200 Message-ID: <814aa9a9-c771-7637-6bfc-839f423eea22@gmx.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="129547"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 To: 37182@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Aug 25 20:42:48 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1i1xTU-000Xap-7k for geb-bug-gnu-emacs@m.gmane.org; Sun, 25 Aug 2019 20:42:48 +0200 Original-Received: from localhost ([::1]:45672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i1xTS-0000TU-Vw for geb-bug-gnu-emacs@m.gmane.org; Sun, 25 Aug 2019 14:42:47 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56948) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i1xSl-0000TK-Ov for bug-gnu-emacs@gnu.org; Sun, 25 Aug 2019 14:42:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i1xSk-0002LW-QL for bug-gnu-emacs@gnu.org; Sun, 25 Aug 2019 14:42:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:36269) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i1xSk-0002LO-Ns for bug-gnu-emacs@gnu.org; Sun, 25 Aug 2019 14:42:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i1xSk-0007bU-JD for bug-gnu-emacs@gnu.org; Sun, 25 Aug 2019 14:42:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Wolfgang Scherer Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 25 Aug 2019 18:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37182 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.156675851429203 (code B ref -1); Sun, 25 Aug 2019 18:42:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 25 Aug 2019 18:41:54 +0000 Original-Received: from localhost ([127.0.0.1]:45090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i1xSb-0007aw-HQ for submit@debbugs.gnu.org; Sun, 25 Aug 2019 14:41:54 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:54057) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i1wio-00063G-Km for submit@debbugs.gnu.org; Sun, 25 Aug 2019 13:54:35 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46041) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i1win-0007MG-97 for bug-gnu-emacs@gnu.org; Sun, 25 Aug 2019 13:54:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i1wim-00027A-6A for bug-gnu-emacs@gnu.org; Sun, 25 Aug 2019 13:54:33 -0400 Original-Received: from mout.gmx.net ([212.227.15.19]:44501) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i1wil-00024J-QV for bug-gnu-emacs@gnu.org; Sun, 25 Aug 2019 13:54:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1566755664; bh=/Ldnw+CJK882XV0yrthEn30lSJGEV+DnUjbwxuggZRQ=; h=X-UI-Sender-Class:To:From:Subject:Date; b=K5LiXfBP4u9hmX4Z9bMExG/kKJ72zZfDxFK2LC8T+HI+RwPwjd2NpOtPZVHrEzVT6 nLR65cibDLdbNGwn9+svDDsbiveRjr5OCwlzU9iJnMTfs3Ubrl+mO+j4OGbF/q6sFs d21FGOKAIb8uQLtFvOB/XIELJ/8ddvdLE0TSdx8Q= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Original-Received: from sheckley.simul.de ([87.144.35.29]) by mail.gmx.com (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MjS5A-1iTsh02e8g-00kyPN for ; Sun, 25 Aug 2019 19:54:24 +0200 Original-Received: from [127.0.0.1] (sheckley.simul.de [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by sheckley.simul.de (Postfix) with ESMTPSA id 04E7F1940560 for ; Sun, 25 Aug 2019 19:54:22 +0200 (CEST) Openpgp: preference=signencrypt Autocrypt: addr=Wolfgang.Scherer@gmx.de; prefer-encrypt=mutual; keydata= xsDiBEb46IgRBACMHOAb1KNo1Ylk+ebri+4R+bG4tyKlqBlrpv8D9/ZwRdXSGt+0DyCHoaAd 7KW7noHapLe87DunABOjKG4nqTGv+dRiWuUBlp3I4aYRFDVa3Da+XnIYkMHKqhK59VEHQCdp Km42nuLS7TS+n99at9YwzTG6VBdOlBKTlRFngOjVLwCg1RGXJ6X3EjS1FKCQeXziURVpWlkD /2zY6Ayhxi62TS84VjikXrrmjXykAAaAmMVEyKKYb9L5pGlqiZz9g/K9xw1EUoZTYuaufquD v4rAGR58K/3V4CYfJLEeshMWiaXHvMmlxMznlG16/um4MvmR8B3r+cx0nOPK1JBdD2qrkNnF Mw8FB+zouLFB4Gt2IUC5IlOmZ8OQA/4qdU53CItzWsCr9Nux4L0qUlRweSmCnV8xGQ2wP5XI MawIQxxREvSrsYDG8cNnYETMg4iQFfIktwAoxCJvuFAwIB6ZxHGF4FcEZm64CXc2u7CmFLqt rVhXhIfMz9oEYC+HhGczGamn9ofbGTFd2hJEtPcQgWNR4f7+aKknmi2+OM0fV29sZmdhbmcg U2NoZXJlciA8d3NAc3ctYW10LndzPsJhBBMRAgAhBQJYmz3YAhsjBQsJCAcCBhUICQoLAgQW AgMBAh4BAheAAAoJEIUCr3Gr112VZZoAoLTBSTp1qGuNhLdXY04iaWCMYmHCAJ4kHPtQ6nTw kEq9qCHgVgXDaY7wjs7ATQRG+OiIEAQAhi0wjcxvA4tychg2NQuwBIf9LX/46l+74+QbewCn a4a+mw/9s5KY Content-Language: de-DE X-Provags-ID: V03:K1:Z0qCcxK5D1P8uBKseze0emo9yuqKfKWMkh7+x6MzJSO3XxuRmHA 8uY/NOXBKIPWSlhrKYOTf/rYhKFWm3aVzWc1+9O7XcfAqPfOrbFk7Q8UI5p5/OduSsSFLqD AzzykSZiL3LoNst291jzj6DF838T9ADiGCWozqNrfubT7wugFLZmzqqWLHTy7gd1JLS8DXP mDs/Sw9ZPpWR2X+xrDNNA== X-UI-Out-Filterresults: notjunk:1;V03:K0:fK4JpJy33n4=:n8duO1s4g/SenSfO9nAcsE UzF9tUcy3o9LGyTh3JXRioGrenmkDne1CzMU8GI2kJyhE30lHo6fFHBUEfOYfigZVcEQA4GgU zFHWvJUUCkNRrM5UkI9nBJQfHkB+6mxZTnszuUKemZsQLKrc+mrNCOM5mLb2HFHcwZuvWSapm yqa1iTmmK0jcV+7WBdmvgvAfDX6FX2/1YbmkGbIyStBi0t/v8CWb0FQL70Hp/GY0ew45Zzc1C KIR2NDAaBfXsmNEgjYQ7DiQYqVUxA0WLdrL+u3M74cyE/nepknUVVwHKL2efqji51mmu+OVyN MdsJLy5WwRWgWfwNLuOU2re7zOHhiN06Qd0OYjDKlL+pDdFknOoRHsfdO6kRDfClJNOEB1j0t Xicd240RFUwRMugFAw5giypTVWQ+qAySGjhAiJzVo3TBvWSliKgyc4R/CrZ23IPR2IMBAOdr0 5xtz6c9RxQ68onAKLV+RcpPmbRDltjd9+xsk5K2/OBu3UZba9Q8Z3pR2DmZMz6qwjGE8C0ElR uDzKM9eCZcZaMq3y/SOhTVyDlR02JKSRO0aIyh4E6RlgLM0GiOB9H/5s65SxLzhkhGVGL0Ifb 4bFulpIkNkVlyg4ZPXCM1cxWXSJeyveOGvjRd3Gljzzvxes1242KeS5GuZWhmt+oePbXxNfo2 2lwXH8fz1o1mt2xVktnNU1zmxxgFtCbQl7H+fEAKRGzDC8ByKMRrAYll4JlKJkjZVSoSyjToP ypQdovBlY9ww1eWcaSafdyr1KO7Qznve05lrAvKh6/TAxD+AWfqR0CIghq2VEFdJJbO8xs8i X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Mailman-Approved-At: Sun, 25 Aug 2019 14:41:51 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:165851 Archived-At: In a *vc-dir* buffer of a mercurial or git repository, it appears to be the intention, that marking both a directory and files inside the directory is invalid. 1. When a directory is marked, =C2=A0=C2=A0 - trying to mark a file in the directory raises the error: =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 vc-dir-mark-file: Parent directory `.= /' is already marked =C2=A0=C2=A0 - trying to mark all files with `C-u M' raises the error: =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Cannot mark all files, directory `./'= marked 2. When a file is marked, =C2=A0=C2=A0 - trying to mark the parent directory raises the error: =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 vc-dir-mark-file: File `xx' in this d= irectory is already marked 3. However, when no directories are marked, =C2=A0=C2=A0 - marking all files with the key sequence `C-u M', results in= all =C2=A0=C2=A0=C2=A0=C2=A0 directories and all files to be marked =C2=A0=C2=A0 - trying to mark all files again with `C-u M' raises the erro= r: =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Cannot mark all files, directory `./'= marked This behavior is inconsistent. The following patch against the savannah repository fixes it: diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index 9a6f6bb..567da65 100644 =2D-- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -667,7 +667,8 @@ share the same state." =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0vc-ewoc) =C2=A0=C2=A0=C2=A0=C2=A0 (ewoc-map =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0(lambda (filearg) -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0 (unless (vc-dir-fileinfo->marked filearg) +=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0 (unless (or (vc-dir-fileinfo->directory f= ilearg) +=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 (vc-dir-fileinfo->marked filearg)) =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 (setf (vc-dir-fileinfo->= marked filearg) t) =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 t)) =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0vc-ewoc))