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#66113: Apply the entire diff buffer Date: Sun, 24 Sep 2023 13:58:59 +0300 Message-ID: <57031fed-65d6-731b-756b-093a20065f1c@gutov.dev> References: <86o7hx4a11.fsf@mail.linkov.net> <86v8c2u34b.fsf@mail.linkov.net> <9cb6c329-8a81-414a-00e0-b3d8aa73d037@gutov.dev> <86msxep69i.fsf@mail.linkov.net> <86lecwvjw4.fsf@mail.linkov.net> <095e4596-7c67-21e2-a69f-c0b7945773a3@gutov.dev> <86a5tcxbw7.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="39392"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Cc: 66113@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Sep 24 13:00:04 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 1qkMqJ-000A4O-MT for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 24 Sep 2023 13:00:04 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qkMqA-0004dQ-19; Sun, 24 Sep 2023 06:59:54 -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 1qkMq7-0004ce-LD for bug-gnu-emacs@gnu.org; Sun, 24 Sep 2023 06:59:51 -0400 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 1qkMq7-0004tP-DF for bug-gnu-emacs@gnu.org; Sun, 24 Sep 2023 06:59:51 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qkMqI-0003Lg-UP for bug-gnu-emacs@gnu.org; Sun, 24 Sep 2023 07: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: Sun, 24 Sep 2023 11:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66113 X-GNU-PR-Package: emacs Original-Received: via spool by 66113-submit@debbugs.gnu.org id=B66113.169555316812793 (code B ref 66113); Sun, 24 Sep 2023 11:00:02 +0000 Original-Received: (at 66113) by debbugs.gnu.org; 24 Sep 2023 10:59:28 +0000 Original-Received: from localhost ([127.0.0.1]:41158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkMpj-0003KH-Qn for submit@debbugs.gnu.org; Sun, 24 Sep 2023 06:59:28 -0400 Original-Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:56161) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkMpe-0003Js-5i for 66113@debbugs.gnu.org; Sun, 24 Sep 2023 06:59:26 -0400 Original-Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 361853200976; Sun, 24 Sep 2023 06:59:04 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Sun, 24 Sep 2023 06:59:04 -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= 1695553143; x=1695639543; bh=aClTR6OyUjNKx+0qdMftdisQJzZdj6HIDyT qNjjnPa8=; b=VRqOBG5t6U72MRNG7JsLQtFkJ2inFJ2RfXAnbWOezcpE99sQUfH xXkMrpo+9QmehKWVjNz1srtfcxZNJIkxE9/9vp+7lsruD+t3lbggGRq8U18itt6e I8CPN9lPgQn5CWO7X3ZybHFR+bDLVwzhnRneTGvuzosk9upxbAODZWW/6oR9HCOz pmPakCZeX+dJIyArK+ZWDpwAtJmt9Qy3EeufYJUgr5eC+kz13z/Rajfk7cwgP4GT jmqIA1XkOwKMEuv7EWHrvoN3YG+HfF7AgO0t292VvfxTC7y5xa015becAAzloLtA lnIKVVSlGRbMbKNtd+bR8GUoz2uP/1nEDSA== 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=fm2; t= 1695553143; x=1695639543; bh=aClTR6OyUjNKx+0qdMftdisQJzZdj6HIDyT qNjjnPa8=; b=VtTMopEKc7H/bnrWPviVFSIdYGkrnA+bPxS6UwA+ftNklA++kv5 55b2gjqnlh7LLmDx+KcjeWNuFfBMVbD+Ec9ohO7Kj0gArxaz7PW/8wm+15z325h7 ePMC177leAwsvz2yIl5Y950751k0dFR6zoc7bWCPclVfkiFcCgyIr8Z3h1tCevD8 rcJbwD6cIT7myERiDMkkKj3MM6oRClCLv45YZjLFSvBLO7SqaLV25fIk6jc6NThd 5sMI0qNMdvRn0AeJ/h34ZZUy76rIhkBVXI5Rx2AQqHhB3625yy9159+feRjA5Z8W HR92B8aEwOSr7t6PT0gIDpXsE4LodJUWA1g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudelvddgfeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhephfeutdekveeggeetteekfeejffegudduudfhueevleeftdffffeggeeivddv jeelnecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepughmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 24 Sep 2023 06:59:02 -0400 (EDT) Content-Language: en-US In-Reply-To: <86a5tcxbw7.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:271231 Archived-At: On 24/09/2023 10:34, Juri Linkov wrote: >> Sorry, was there supposed to be a call to diff-test-hunk here? Or I'm just >> not following the implementation. > diff-test-hunk was just an example of implementation. But the same way as > diff-apply-hunk is not used here, also only the logic of diff-test-hunk is used. Fair enough. >> I tried testing it out too. There is a patch where the third hunk doesn't >> apply (errors with "can't find the text to patch" in regular usage). This >> command ends with cryptic "No next hunk". > This is what I expected that diff-hunk-next might signal an error > that we should catch, but still couldn't find a patch that fails > with such error. So I will try to construct such a patch manually. Try the patch attached to this message: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63896#5