From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#62693: 28.2; VC: CVS: Fix lost file reporting and enable reverting it Date: Sat, 15 Apr 2023 01:59:28 +0300 Message-ID: References: <2029306.bkXEbi1Pq8@ravel> <12836994.tY86fQioq2@ravel> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38669"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Cc: 62693@debbugs.gnu.org To: Olivier Certner , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Apr 15 01:00:25 2023 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 1pnSP0-0009ov-Md for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 15 Apr 2023 01:00:24 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnSOi-0004qj-P7; Fri, 14 Apr 2023 19:00:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pnSOh-0004qI-68 for bug-gnu-emacs@gnu.org; Fri, 14 Apr 2023 19:00:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pnSOg-0002IF-IT for bug-gnu-emacs@gnu.org; Fri, 14 Apr 2023 19:00:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnSOg-0006Pp-2R for bug-gnu-emacs@gnu.org; Fri, 14 Apr 2023 19:00:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Apr 2023 23:00:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62693 X-GNU-PR-Package: emacs Original-Received: via spool by 62693-submit@debbugs.gnu.org id=B62693.168151318024593 (code B ref 62693); Fri, 14 Apr 2023 23:00:01 +0000 Original-Received: (at 62693) by debbugs.gnu.org; 14 Apr 2023 22:59:40 +0000 Original-Received: from localhost ([127.0.0.1]:47886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnSOJ-0006Ob-Ik for submit@debbugs.gnu.org; Fri, 14 Apr 2023 18:59:39 -0400 Original-Received: from new3-smtp.messagingengine.com ([66.111.4.229]:54503) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnSOH-0006OJ-CI for 62693@debbugs.gnu.org; Fri, 14 Apr 2023 18:59:37 -0400 Original-Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailnew.nyi.internal (Postfix) with ESMTP id 09C0F582375; Fri, 14 Apr 2023 18:59:32 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Fri, 14 Apr 2023 18:59:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm1; t= 1681513172; x=1681516772; bh=zvWdxeWW4WrMcC5Y7CZShNeiuG6GRwhcvv9 C+NhjcqI=; b=H28StsufKcGZEqASzBSFyqEUuATTR+oh3CGP6kpGfuyf89kis6+ c2wyrbTkJPdMmtFL0pzmEc7zFWDFigLYBjvrn7/eJ2kmleU8iRAjahCA46rb+MWX XOfg1Zmqb7VBoeiBIo31ML/gqKspKw4ZZpVVawbxJ4yOJYQ63vR41t/nK4rlVZ5l hIW2AzHzDE6R7KiKRaOgylI+rQo32Rvr3+4CDTvfGJB6n6kLzx6lfeoMx9YUXtFq LKGA0ylH0gwzXgjau6zPtjnI3qAluPwl5IsdybzHxJ8j/ysTJYO4j1fhnHAmk+pP rO7eaxXYq4H691GzctQjxnwIbyXZQX5JIpg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1681513172; x=1681516772; bh=zvWdxeWW4WrMcC5Y7CZShNeiuG6GRwhcvv9 C+NhjcqI=; b=e33ZO5sQ5jRqXIKttzQbEpFNyy8JGSZDJykD9p+kNmuS9aJw9YG 23CYz5r5FkhYIG56TMi+dvG2js1Os5+OAZTV4KXptk2Sk33xxgBbDAx++K3H8hkK g57rcRdW4I348aRswZMPiiyNgaWiPO3uYXG51NN47S30ofu7ZmA3LqMwBZCWE+Tt BYwCR5MgC5qJO2DkSj3iXRMV5Yxoczg4tw1aGKs7o0iktSfhgw7zJ5U1TW8A0eju ElL/jdmO0j/a3s1OnMBeQSO2Do1ZGK+Qtk6jaw/Oywdb+b09w0cjxsnQQvfazGFH nrzK9Q39MDjl8A7rhJ59JFleHVPvxIzoXiw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeluddgudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhepiefgteevheevveffheeltdeukeeiieekueefgedugfefgefhudelgfefveel vdevnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug hmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 14 Apr 2023 18:59:30 -0400 (EDT) Content-Language: en-US In-Reply-To: <12836994.tY86fQioq2@ravel> 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:259985 Archived-At: On 13/04/2023 19:40, Olivier Certner wrote: > Hi, > > Thanks for looking at this. > >> - Could you explain what kind of files are not listed and when? I'm >> guessing this has to do with the file name? I've tried to reproduce the >> problem with a file name that contained a space, and couldn't see it. > > It's not that files are not listed, they are so always. As said, the problem > is their name. For example, if I remove an INSTALL file in a repository, > `INSTALL' is the name listed in a VC dir buffer, *quotes included*. Then, no > VC operation can work because there is indeed no file by this name (with > quotes, both in the filesystem or known by CVS). So the actual file name is not the problem -- the problem happens with removed files? Okay, I can see that now: when the file is removed, it's displayed (incorrectly) with quotes around its name. Patches 2 and 3 do fix the remove - vc-dir - vc-revert scenario. Eli, do we want these fixes in emacs-29? These are again not regressions, but I'm guessing users of CVS are foremost to benefit from adding this to the upcoming release. >> - Could you give an example of the repository CVS root which is >> recognized by the current code incorrectly? > > Just run (vc-cvs-parse-root "/your/local/path/to/some/CVS/repo") and you'll > see... > > I've found more occurences of problems with this function, so my initial fix > is not enough. I went ahead and rewrote it completely. So please forget about > the original first patch, and consider it replaced by the attached one. The > commit message there explains how you can reproduce the bugs I found and shows > that the new version fixes them. Thank you. What was the effect of wrong local/nonlocal recognition, though? Some misbehavior related to cvs-stay-local? Regarding the new patch, it's great to see the list of examples, but could you instead move it to a test or several inside test/lisp/vc/vc-cvs-tests.el? This file does not exist yet, but you can use vc-git-test.el as an example, in the same directory.