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#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted file. Date: Thu, 18 Jan 2024 18:47:07 +0200 Message-ID: <74a14c44-698f-4b7f-9e3f-48501774510d@gutov.dev> References: <874jfhe3r4.fsf@disroot.org> <9dfe6be4-afa8-430e-a45e-e651c479cb81@gutov.dev> <877ck82ppz.fsf@disroot.org> <86ttnc2iu5.fsf@mail.linkov.net> <868r4nqf5n.fsf@mail.linkov.net> 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="18363"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla Thunderbird Cc: 68443@debbugs.gnu.org, Aleksandr Vityazev To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jan 18 17:48:21 2024 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 1rQVYz-0004Vb-6O for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 18 Jan 2024 17:48:21 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQVYg-0002qC-Q0; Thu, 18 Jan 2024 11:48:02 -0500 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 1rQVYf-0002pr-1h for bug-gnu-emacs@gnu.org; Thu, 18 Jan 2024 11:48:01 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQVYe-00088A-QO for bug-gnu-emacs@gnu.org; Thu, 18 Jan 2024 11:48:00 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQVYg-0001aC-ET for bug-gnu-emacs@gnu.org; Thu, 18 Jan 2024 11:48:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 18 Jan 2024 16:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68443 X-GNU-PR-Package: emacs Original-Received: via spool by 68443-submit@debbugs.gnu.org id=B68443.17055964425888 (code B ref 68443); Thu, 18 Jan 2024 16:48:02 +0000 Original-Received: (at 68443) by debbugs.gnu.org; 18 Jan 2024 16:47:22 +0000 Original-Received: from localhost ([127.0.0.1]:56572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQVY1-0001Wu-RK for submit@debbugs.gnu.org; Thu, 18 Jan 2024 11:47:22 -0500 Original-Received: from out5-smtp.messagingengine.com ([66.111.4.29]:50101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQVXz-0001WB-S4 for 68443@debbugs.gnu.org; Thu, 18 Jan 2024 11:47:20 -0500 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 07BF85C0051; Thu, 18 Jan 2024 11:47:12 -0500 (EST) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 18 Jan 2024 11:47:12 -0500 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:subject:subject:to:to; s=fm1; t=1705596432; x=1705682832; bh=zYoaJgnZwNREZLydKUNHIBeRMYEY70hwTCpS+l0V2Gs=; b= aPdp0xg2+qSsZzhw3QvhxFR+yQpfnCyCFtGjwHQmeiIa/N7BE53XgHeaxFNzgs4k WuPaLII6AoyFUVFOm7C/u7BM/3AzKjLDgKBom8ASe/AjFybhnMuZ0tg4E+9t3eU+ iLIQEw1ee734cs+dOpCASqq3TGrDYZmQYLwW9zmC1brCFdR8wB67kLmiORC+etn/ W4ja4ivTs8+sRKzuvpaANUNKdF/iMYTX8QF2PlytlYRoVK90pR7nJt1vj5BGlxd5 3apNZwV4NzWEiTkc7ZslfRLX6tCecf080FsFHZ8bKRQY4zgDNDfiQhkkApfJqCsP 8nT2DfOKEB9pKL1L5sAGVw== 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:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1705596432; x= 1705682832; bh=zYoaJgnZwNREZLydKUNHIBeRMYEY70hwTCpS+l0V2Gs=; b=N pHetCKfNedlqzbpXU7dmehny4ZsuYABO88vE+Kaw3fHFuIo/KttnKzvUeBastpKm CvVdZZd2PGbJptcAc4gyeMrR1Rut8HsHJjileONQiJHUzpctfT7H/v93amhzdbwK 9BiTqBidwNibFJBJkJLFCo3qaMulzmkE1bNSYCD3NRvw1Yi6DtSnRFrJcBUV4sfX 6IopReini9vP4blwCK1FUWVygZV68sw3KqqgX2w5fG8pLQNeLuJVCt+gH/INEbxS v8RaF7eaGxLwf9YlAvRgJRRaFtsVUWQlBbAf837wnzFqctdI9W9hWCPxi6Az3Jkb 6Q28TZQt7iIMnVmxVuSeA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejkedgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhepteduleejgeehtefgheegjeekueehvdevieekueeftddvtdevfefhvdevgedu jeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug hmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 18 Jan 2024 11:47:10 -0500 (EST) Content-Language: en-US In-Reply-To: <868r4nqf5n.fsf@mail.linkov.net> 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:278436 Archived-At: On 18/01/2024 09:50, Juri Linkov wrote: >>>> Yes with this patch the error is no longer present, but the deleted file >>>> is not displayed in the*log-edit-files* buffer, unlike if you run >>>> vc-next-action from*vc-dir*. Although this is another bug report. >>> Right, that's still a remaining problem. diff-find-file-name doesn't really >>> want to "find" files that don't exist on disk, so it might need >>> a replacement for such cases. >> Indeed, the problem is that diff-find-file-name doesn't get the name >> of the deleted file even when called with OLD=t: >> >> ;; Use file-regular-p to avoid >> ;; /dev/null, directories, etc. >> ((or (null file) (file-regular-p file)) >> file) > This can be fixed by adding special-casing to diff-vc-deduce-fileset > that will check whether the diff output is for git diff, > then will remove a/ and b/ prefixes from file names > without checking whether these files really exist. For git, or maybe hg/bzr as well. Worth a try.