From unknown Fri Aug 15 17:21:06 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60259: [PATCH] Add some diff-fixup-modifs tests Resent-From: Daniel =?UTF-8?Q?Mart=C3=ADn?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 22 Dec 2022 18:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60259 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 60259@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16717329936428 (code B ref -1); Thu, 22 Dec 2022 18:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Dec 2022 18:16:33 +0000 Received: from localhost ([127.0.0.1]:36157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8Q7N-0001fc-D4 for submit@debbugs.gnu.org; Thu, 22 Dec 2022 13:16:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:55930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8Q7L-0001fW-Id for submit@debbugs.gnu.org; Thu, 22 Dec 2022 13:16:31 -0500 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 1p8Q7L-0003iY-DB for bug-gnu-emacs@gnu.org; Thu, 22 Dec 2022 13:16:31 -0500 Received: from sonic308-18.consmr.mail.ir2.yahoo.com ([77.238.178.146]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p8Q7J-000552-Be for bug-gnu-emacs@gnu.org; Thu, 22 Dec 2022 13:16:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.es; s=s2048; t=1671732981; bh=ilQNTpFi/3WmBMkARScp8lCM6sRuV+ktCd2CpGecd8M=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=WhVvVeoMpecElUBxQCTaEuD9QTuZIMeNUG3ZHAzfXXaN9mq0Xp+9Sakt9oXrwhu4OH9n4Cnh7FYbPj7Ab/o2Cq/rn2lyTwPk0wU46KNnfJlXbtNKd8G3KW9OfN96fyHx21/kDgwHuCJdBZ2JHvpKPRa/ZlX7z0l7zZBBV7QMo+VSaaUC42IN7glEn7hUc6cpAdW6l/jqrTk4LQefUWVJ4MfF3jPqUGRYC2ge9l1zTwEY6ool2MZh9QeO+8RRCmmU5ogH9Ta5Qc3FS/dJdtQ/TcnphZ9ApfkaXmVVEwvOB9iqkuIBxIcvYDdRAXRTG6csbE0wq2g/l/xvB31n9Fa26g== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1671732981; bh=r5B1OePeDdiXxupE5se3ojvkWMW7GeVnZz6sz8k1DN2=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=ir8EOEG82beN9nKbDnZM70WBWX4CN2XHn0ZCA3n2SknTuhqUY53vqaJWHXSP430n2qUKYFO0L0U9ziGtVKgHYyQl08ay58dBebDzC1eEgAaNVW3O1n7EXi1e9c9g160W1AcOJXGnzjaaj6MyVTG7Zciy6A5MtKThr8TUuz07ngn1tWOe/VSdi8qdIvCxoDORkkKsmJQyEwncA4fCqC635rzkyCJi06ghZYD3QkhGcSGWTQfzUg4/6zpnuVNxapVIYrUs2h1chJTCOWtzFXRfC8yYXroNRBhc5QAhrb75DULdzEkus5nRhdpcHQXDgANUnMAzVx/8Ua9Upcw3urGhrg== X-YMail-OSG: bxtx4SQVM1lWl3E3zx1x7haJSP.QGlT3OCaQ2DWJEbTWorQK3KVcXdKh3u0JSrC dB3uPEF0ECKSrOK1mOP2JkkaE.L3KthRulkObMOLF8J65p7.bGWlm4yML4U0zedLBysmmqQwxzOK rNtR7dZh8AAUj5UqjeXyPpi_VVD_w7cZyjNVeqnYWL4u88LZO6LhbeY77V24pOKQKr41.Y14kXI_ I7.ZpA5pAB32XOdmWM76opKi3bT_T5tzNNXa7jFYa96cKk47aU1STLmvhjPO0F5T7fb4xq6QaBXB b9ZejmklW0FqoSPXdMejRT5giTGLFRUbanVygbxgOs44.sHnsOocUQsmbxPoLFJQx6NO96G.H_L5 LSGOEeogw4tO1AZJH8YKQvIiBJ7vrZ7_PrIxSr5JbRl6_.qY_i31Sn2IOAeepsZi255Zl3ejMthB Kqp3byYPhoP.YGgtv4az0LVDHvG0KH.f70UpPjaQKFK4ESO9ixdGO7VfoLqaYfpC14x_PA5CDjP9 9Llf1nkSo6x5O.kw2lN1bARLxk_VoDUZVcaX3m9W5rnS2rq0rtmcpvY5mJDP9rvDEsuTT5XyP6VF dABaNJmpIujtIZjfkgaIrOt38jAGbGCLwS0yIfEFVp.m7m2DK5d7WQxxY7dx5kQ9isX.zC8NxC1N 4yyVDbRUJzFRAtSOhbH4DTGkO0uW5btv4cXUortLedYca_FGfjmFmLeV352rz0ViIHdFTj06L1dF fApXkSNEio1mLgNbIgPqwOKgjg3kbVkS.iV8ojBqn3QaFdZiDi.2REYwJSmAHnXvE77T_KInvaTc cu5fUWicA0mofY19fBFHtibD5R8BRbVCLGEF25P.O7fHI95_2xdeAlyjc7QcFOs3He7XjiY9yge_ rGiVwL2HnOx9iKU8IiDmNJvR_4rc9DnRmYjMlmfqqEA1od4yFOujvV8gibtl48yqX2PEIb71vr7u 7srp8lnwarB3sofvnpeB_Ylv.CtCGfRgePPBJ9JgCsJEklS72y9aCZjLVUemioYoP4vGEPJf8K.. t22wgjHwUgJQfOixdaSEkxeNwg0T9c1k9ltdyDeC25R3Px3ZH3XU9vPQObDi_l75bLefJab0lH5w TMxJ0NK8GCpvqNgI5O3XoUjQGNgf1qaK0RKnCQ4oGpbNvi3LX6gVE642qvi68LwlfxuiKIAfeBoW p1HTnR0.wzU2NWlLawHXzDWdZMiv5JjelrClP9AZN9NyXcWjhOitquUrig4X2JC27Vf7P3yY6e9t YPDS5tPh21XmVRo2byJTqK0ePuISGnDYs6jK5BAIwXE.lXDeyGw7ecldld6RkHiiUSm2FiuXZRdq mT_FsDLT4wSXcMdy9d.97pfHv.wF292a_d2wskWd7l73RkYezCzfxIThoLx_9_wsu9XlWtNra_tf c08cnOrnpriiVxcT_cxT8SYr66EFasA8fuVH6ju_DDLKfxSeS27MKYaECzvmsvVp3udkgMWAHgAe 37Ve12i5dXbcttlwWyVILxqddIDTSwSLZwMvXj8CZfWghlZbd_zXYAijAIUpOhrah8wybDRuF4Jh z52RJSx4vKyAxHTXaVLR90iIJIFurDRyQewTuI1KvDQjN77G69P011QCeekS_kEaMzajUTktpZPn aon8EtW1wK9wREqWKdsOdVuHBMcOi2nK7PnX9UATcZmzk4PJh6H9dDj6oOB5jfoOOFrt.kBSTzos iXGlt4t5IuQe6CRawctpKchvjxbJ5CwdYuM.Q3uJGm6iGfjALeCBK04kAMQfKzmJ3wVh2UQyItvI a0Gs5s5wI29flMir_a4dXY86dFaZ4lL9ySzYsJvrpsqQofqyJSKKht07MjAIe5eakUlrnLyYt5Mn KWJYFoz3Sbn_2PsmsnEWqGMqItevxshnKYZyyY8RePdNKWgyPo9QWduTs1RjxGgfSiRIw0BxBMCT 74JxKpXuiF0Hsi8uDpAy8kd7ESyYKBApDgc_dLoAaPZ7OvFw_nXE54yO7NAyKOG3TgEWOGijIcvS dO3JQ.n6a_vlRuPH5S_9Xo0KjFrjElciGEfa6eEaHy3iPKPf2j5qbj5sXq6DT6_KYAuWq7Y0kKzM r3i6kb5iGHAEf7Unjs21JTY_iVBLJQnwOrRTIJ1Iw5OpaZoJNg.F61t1Cc4Za4vtcsMVJM4JFESp dr.D41MHgY.g.f.j6VdwxTvWnCaJ_UZFHQKiye0tOdIC27T3XDWzDhPEip8e5qbtGVksgUyvGo2I Dnfg1OyU3bGuiTrtRK5wL7w-- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.ir2.yahoo.com with HTTP; Thu, 22 Dec 2022 18:16:21 +0000 Received: by hermes--production-ir2-5795fc58c8-j5s6m (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 1c331d82f21dcf98d4b9dc801d026344; Thu, 22 Dec 2022 18:16:16 +0000 (UTC) From: Daniel =?UTF-8?Q?Mart=C3=ADn?= Date: Thu, 22 Dec 2022 19:16:15 +0100 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" References: X-Mailer: WebService/1.1.20982 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Content-Length: 2683 Received-SPF: pass client-ip=77.238.178.146; envelope-from=mardani29@yahoo.es; helo=sonic308-18.consmr.mail.ir2.yahoo.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Tags: patch I've added some tests for diff-fixup-modifs, the Emacs command that tries to fix edited Unix diffs. Thanks. --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Add-some-diff-fixup-modifs-tests.patch >From 91dfdcfe5c944d840e05325b38bcf2a3c7f6101c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Thu, 22 Dec 2022 19:10:24 +0100 Subject: [PATCH] Add some diff-fixup-modifs tests * test/lisp/vc/diff-mode-tests.el (diff-mode-test-fixups-added-lines): Test that diff-mode fixes patches with added lines correctly. * test/lisp/vc/diff-mode-tests.el (diff-mode-test-fixups-empty-hunks): Ditto for patches with empty hunks. --- test/lisp/vc/diff-mode-tests.el | 79 +++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/test/lisp/vc/diff-mode-tests.el b/test/lisp/vc/diff-mode-tests.el index 19e3dbb42a..b67ccd4fe0 100644 --- a/test/lisp/vc/diff-mode-tests.el +++ b/test/lisp/vc/diff-mode-tests.el @@ -478,5 +478,84 @@ test-hunk-file-names (should (equal (diff-hunk-file-names) '("/tmp/ange-ftp1351895K.el" "/tmp/ange-ftp13518wvE.el"))))) +(ert-deftest diff-mode-test-fixups-added-lines () + "Check that `diff-fixup-modifs' works well with hunks with added lines." + (let ((patch "--- file ++++ file +@@ -0,0 +1,15 @@ ++1 ++2 ++3 ++4 +")) + (with-temp-buffer + (insert patch) + (diff-fixup-modifs (point-min) (point-max)) + (should (equal (buffer-string) "--- file ++++ file +@@ -0,0 +1,4 @@ ++1 ++2 ++3 ++4 +")))) + (let ((patch "--- file ++++ file +@@ -389,5 +398,6 @@ + while (1) + ; ++ # not needed + # at all + # stop +")) + (with-temp-buffer + (insert patch) + (diff-fixup-modifs (point-min) (point-max)) + (should (equal (buffer-string) "--- file ++++ file +@@ -389,4 +398,5 @@ + while (1) + ; ++ # not needed + # at all + # stop +"))))) + +(ert-deftest diff-mode-test-fixups-empty-hunks () + "Check that `diff-fixup-modifs' works well with empty hunks." + (let ((patch "--- file ++++ file +@@ -1 +1 @@ +-1 +@@ -10 +10 @@ +-1 ++1 +--- otherfile ++++ otherfile +@@ -1 +1 @@ ++2 +@@ -10 +10 @@ +-1 ++1 +")) + (with-temp-buffer + (insert patch) + (diff-fixup-modifs (point-min) (point-max)) + (should (equal (buffer-string) "--- file ++++ file +@@ -1,1 +1,0 @@ +-1 +@@ -10,1 +10,1 @@ +-1 ++1 +--- otherfile ++++ otherfile +@@ -1,0 +1,1 @@ ++2 +@@ -10,1 +10,1 @@ +-1 ++1 +"))))) + (provide 'diff-mode-tests) ;;; diff-mode-tests.el ends here -- 2.34.1 --=-=-=-- From unknown Fri Aug 15 17:21:06 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Daniel =?UTF-8?Q?Mart=C3=ADn?= Subject: bug#60259: closed (Re: bug#60259: [PATCH] Add some diff-fixup-modifs tests) Message-ID: References: <83r0wp5khv.fsf@gnu.org> X-Gnu-PR-Message: they-closed 60259 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 60259@debbugs.gnu.org Date: Sat, 24 Dec 2022 07:29:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1671866942-10033-1" This is a multi-part message in MIME format... ------------=_1671866942-10033-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #60259: [PATCH] Add some diff-fixup-modifs tests which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 60259@debbugs.gnu.org. --=20 60259: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D60259 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1671866942-10033-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 60259-done) by debbugs.gnu.org; 24 Dec 2022 07:28:05 +0000 Received: from localhost ([127.0.0.1]:41402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8ywv-0002bL-96 for submit@debbugs.gnu.org; Sat, 24 Dec 2022 02:28:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8ywt-0002aw-Sc for 60259-done@debbugs.gnu.org; Sat, 24 Dec 2022 02:28:04 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8ywo-0002P8-Gq; Sat, 24 Dec 2022 02:27:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=0l2l2fnhWPvuC08Gt5LzMYIas4Ozh5ASvIXtd+BZwJk=; b=jtenePoQC5+C3zX9VM7t /CJ3JtlmGqyzQ8El2S0T9oGO6jPMBeUf4Os0/d4iqa/tmY1QhAj820/aLIEqfBHwY78Yz4Ghe2zVx FpgdZ0/NT62F4BwrFW5Ctx6EXrNL7zzJuODGYqmwigb3rxvvA24veXaSRtKxY9dnRvkrEyGXbVJJt kea+cj0fcZ3qhQTIxqnNPmA69bmEFVaveO4H1rI1zhcYzLp85csy5JiNjP3w1czmQFiEjRLaYomLZ QZLkm4G6RDTcTluMK59vA8M3tsfIpgmlLw3kRy6bUkFF3kvz0ShCh+evMyOmvBjCaLOBvAvwyFHVv Vuq7cqciWHKnAg==; Received: from [87.69.77.57] (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 1p8ywn-000817-W7; Sat, 24 Dec 2022 02:27:58 -0500 Date: Sat, 24 Dec 2022 09:27:56 +0200 Message-Id: <83r0wp5khv.fsf@gnu.org> From: Eli Zaretskii To: Daniel =?iso-8859-1?Q?Mart=EDn?= In-Reply-To: (bug-gnu-emacs@gnu.org) Subject: Re: bug#60259: [PATCH] Add some diff-fixup-modifs tests References: MIME-version: 1.0 Content-type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 60259-done Cc: 60259-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Thu, 22 Dec 2022 19:16:15 +0100 > From: Daniel Martín via "Bug reports for GNU Emacs, > the Swiss army knife of text editors" > > I've added some tests for diff-fixup-modifs, the Emacs command that > tries to fix edited Unix diffs. Thanks. Thanks, installed on the emacs-29 branch, and closing. ------------=_1671866942-10033-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 22 Dec 2022 18:16:33 +0000 Received: from localhost ([127.0.0.1]:36157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8Q7N-0001fc-D4 for submit@debbugs.gnu.org; Thu, 22 Dec 2022 13:16:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:55930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8Q7L-0001fW-Id for submit@debbugs.gnu.org; Thu, 22 Dec 2022 13:16:31 -0500 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 1p8Q7L-0003iY-DB for bug-gnu-emacs@gnu.org; Thu, 22 Dec 2022 13:16:31 -0500 Received: from sonic308-18.consmr.mail.ir2.yahoo.com ([77.238.178.146]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p8Q7J-000552-Be for bug-gnu-emacs@gnu.org; Thu, 22 Dec 2022 13:16:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.es; s=s2048; t=1671732981; bh=ilQNTpFi/3WmBMkARScp8lCM6sRuV+ktCd2CpGecd8M=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=WhVvVeoMpecElUBxQCTaEuD9QTuZIMeNUG3ZHAzfXXaN9mq0Xp+9Sakt9oXrwhu4OH9n4Cnh7FYbPj7Ab/o2Cq/rn2lyTwPk0wU46KNnfJlXbtNKd8G3KW9OfN96fyHx21/kDgwHuCJdBZ2JHvpKPRa/ZlX7z0l7zZBBV7QMo+VSaaUC42IN7glEn7hUc6cpAdW6l/jqrTk4LQefUWVJ4MfF3jPqUGRYC2ge9l1zTwEY6ool2MZh9QeO+8RRCmmU5ogH9Ta5Qc3FS/dJdtQ/TcnphZ9ApfkaXmVVEwvOB9iqkuIBxIcvYDdRAXRTG6csbE0wq2g/l/xvB31n9Fa26g== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1671732981; bh=r5B1OePeDdiXxupE5se3ojvkWMW7GeVnZz6sz8k1DN2=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=ir8EOEG82beN9nKbDnZM70WBWX4CN2XHn0ZCA3n2SknTuhqUY53vqaJWHXSP430n2qUKYFO0L0U9ziGtVKgHYyQl08ay58dBebDzC1eEgAaNVW3O1n7EXi1e9c9g160W1AcOJXGnzjaaj6MyVTG7Zciy6A5MtKThr8TUuz07ngn1tWOe/VSdi8qdIvCxoDORkkKsmJQyEwncA4fCqC635rzkyCJi06ghZYD3QkhGcSGWTQfzUg4/6zpnuVNxapVIYrUs2h1chJTCOWtzFXRfC8yYXroNRBhc5QAhrb75DULdzEkus5nRhdpcHQXDgANUnMAzVx/8Ua9Upcw3urGhrg== X-YMail-OSG: bxtx4SQVM1lWl3E3zx1x7haJSP.QGlT3OCaQ2DWJEbTWorQK3KVcXdKh3u0JSrC dB3uPEF0ECKSrOK1mOP2JkkaE.L3KthRulkObMOLF8J65p7.bGWlm4yML4U0zedLBysmmqQwxzOK rNtR7dZh8AAUj5UqjeXyPpi_VVD_w7cZyjNVeqnYWL4u88LZO6LhbeY77V24pOKQKr41.Y14kXI_ I7.ZpA5pAB32XOdmWM76opKi3bT_T5tzNNXa7jFYa96cKk47aU1STLmvhjPO0F5T7fb4xq6QaBXB b9ZejmklW0FqoSPXdMejRT5giTGLFRUbanVygbxgOs44.sHnsOocUQsmbxPoLFJQx6NO96G.H_L5 LSGOEeogw4tO1AZJH8YKQvIiBJ7vrZ7_PrIxSr5JbRl6_.qY_i31Sn2IOAeepsZi255Zl3ejMthB Kqp3byYPhoP.YGgtv4az0LVDHvG0KH.f70UpPjaQKFK4ESO9ixdGO7VfoLqaYfpC14x_PA5CDjP9 9Llf1nkSo6x5O.kw2lN1bARLxk_VoDUZVcaX3m9W5rnS2rq0rtmcpvY5mJDP9rvDEsuTT5XyP6VF dABaNJmpIujtIZjfkgaIrOt38jAGbGCLwS0yIfEFVp.m7m2DK5d7WQxxY7dx5kQ9isX.zC8NxC1N 4yyVDbRUJzFRAtSOhbH4DTGkO0uW5btv4cXUortLedYca_FGfjmFmLeV352rz0ViIHdFTj06L1dF fApXkSNEio1mLgNbIgPqwOKgjg3kbVkS.iV8ojBqn3QaFdZiDi.2REYwJSmAHnXvE77T_KInvaTc cu5fUWicA0mofY19fBFHtibD5R8BRbVCLGEF25P.O7fHI95_2xdeAlyjc7QcFOs3He7XjiY9yge_ rGiVwL2HnOx9iKU8IiDmNJvR_4rc9DnRmYjMlmfqqEA1od4yFOujvV8gibtl48yqX2PEIb71vr7u 7srp8lnwarB3sofvnpeB_Ylv.CtCGfRgePPBJ9JgCsJEklS72y9aCZjLVUemioYoP4vGEPJf8K.. t22wgjHwUgJQfOixdaSEkxeNwg0T9c1k9ltdyDeC25R3Px3ZH3XU9vPQObDi_l75bLefJab0lH5w TMxJ0NK8GCpvqNgI5O3XoUjQGNgf1qaK0RKnCQ4oGpbNvi3LX6gVE642qvi68LwlfxuiKIAfeBoW p1HTnR0.wzU2NWlLawHXzDWdZMiv5JjelrClP9AZN9NyXcWjhOitquUrig4X2JC27Vf7P3yY6e9t YPDS5tPh21XmVRo2byJTqK0ePuISGnDYs6jK5BAIwXE.lXDeyGw7ecldld6RkHiiUSm2FiuXZRdq mT_FsDLT4wSXcMdy9d.97pfHv.wF292a_d2wskWd7l73RkYezCzfxIThoLx_9_wsu9XlWtNra_tf c08cnOrnpriiVxcT_cxT8SYr66EFasA8fuVH6ju_DDLKfxSeS27MKYaECzvmsvVp3udkgMWAHgAe 37Ve12i5dXbcttlwWyVILxqddIDTSwSLZwMvXj8CZfWghlZbd_zXYAijAIUpOhrah8wybDRuF4Jh z52RJSx4vKyAxHTXaVLR90iIJIFurDRyQewTuI1KvDQjN77G69P011QCeekS_kEaMzajUTktpZPn aon8EtW1wK9wREqWKdsOdVuHBMcOi2nK7PnX9UATcZmzk4PJh6H9dDj6oOB5jfoOOFrt.kBSTzos iXGlt4t5IuQe6CRawctpKchvjxbJ5CwdYuM.Q3uJGm6iGfjALeCBK04kAMQfKzmJ3wVh2UQyItvI a0Gs5s5wI29flMir_a4dXY86dFaZ4lL9ySzYsJvrpsqQofqyJSKKht07MjAIe5eakUlrnLyYt5Mn KWJYFoz3Sbn_2PsmsnEWqGMqItevxshnKYZyyY8RePdNKWgyPo9QWduTs1RjxGgfSiRIw0BxBMCT 74JxKpXuiF0Hsi8uDpAy8kd7ESyYKBApDgc_dLoAaPZ7OvFw_nXE54yO7NAyKOG3TgEWOGijIcvS dO3JQ.n6a_vlRuPH5S_9Xo0KjFrjElciGEfa6eEaHy3iPKPf2j5qbj5sXq6DT6_KYAuWq7Y0kKzM r3i6kb5iGHAEf7Unjs21JTY_iVBLJQnwOrRTIJ1Iw5OpaZoJNg.F61t1Cc4Za4vtcsMVJM4JFESp dr.D41MHgY.g.f.j6VdwxTvWnCaJ_UZFHQKiye0tOdIC27T3XDWzDhPEip8e5qbtGVksgUyvGo2I Dnfg1OyU3bGuiTrtRK5wL7w-- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.ir2.yahoo.com with HTTP; Thu, 22 Dec 2022 18:16:21 +0000 Received: by hermes--production-ir2-5795fc58c8-j5s6m (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 1c331d82f21dcf98d4b9dc801d026344; Thu, 22 Dec 2022 18:16:16 +0000 (UTC) From: =?utf-8?Q?Daniel_Mart=C3=ADn?= To: bug-gnu-emacs@gnu.org Subject: [PATCH] Add some diff-fixup-modifs tests Date: Thu, 22 Dec 2022 19:16:15 +0100 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" References: X-Mailer: WebService/1.1.20982 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Content-Length: 2683 Received-SPF: pass client-ip=77.238.178.146; envelope-from=mardani29@yahoo.es; helo=sonic308-18.consmr.mail.ir2.yahoo.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Tags: patch I've added some tests for diff-fixup-modifs, the Emacs command that tries to fix edited Unix diffs. Thanks. --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Add-some-diff-fixup-modifs-tests.patch >From 91dfdcfe5c944d840e05325b38bcf2a3c7f6101c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Thu, 22 Dec 2022 19:10:24 +0100 Subject: [PATCH] Add some diff-fixup-modifs tests * test/lisp/vc/diff-mode-tests.el (diff-mode-test-fixups-added-lines): Test that diff-mode fixes patches with added lines correctly. * test/lisp/vc/diff-mode-tests.el (diff-mode-test-fixups-empty-hunks): Ditto for patches with empty hunks. --- test/lisp/vc/diff-mode-tests.el | 79 +++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/test/lisp/vc/diff-mode-tests.el b/test/lisp/vc/diff-mode-tests.el index 19e3dbb42a..b67ccd4fe0 100644 --- a/test/lisp/vc/diff-mode-tests.el +++ b/test/lisp/vc/diff-mode-tests.el @@ -478,5 +478,84 @@ test-hunk-file-names (should (equal (diff-hunk-file-names) '("/tmp/ange-ftp1351895K.el" "/tmp/ange-ftp13518wvE.el"))))) +(ert-deftest diff-mode-test-fixups-added-lines () + "Check that `diff-fixup-modifs' works well with hunks with added lines." + (let ((patch "--- file ++++ file +@@ -0,0 +1,15 @@ ++1 ++2 ++3 ++4 +")) + (with-temp-buffer + (insert patch) + (diff-fixup-modifs (point-min) (point-max)) + (should (equal (buffer-string) "--- file ++++ file +@@ -0,0 +1,4 @@ ++1 ++2 ++3 ++4 +")))) + (let ((patch "--- file ++++ file +@@ -389,5 +398,6 @@ + while (1) + ; ++ # not needed + # at all + # stop +")) + (with-temp-buffer + (insert patch) + (diff-fixup-modifs (point-min) (point-max)) + (should (equal (buffer-string) "--- file ++++ file +@@ -389,4 +398,5 @@ + while (1) + ; ++ # not needed + # at all + # stop +"))))) + +(ert-deftest diff-mode-test-fixups-empty-hunks () + "Check that `diff-fixup-modifs' works well with empty hunks." + (let ((patch "--- file ++++ file +@@ -1 +1 @@ +-1 +@@ -10 +10 @@ +-1 ++1 +--- otherfile ++++ otherfile +@@ -1 +1 @@ ++2 +@@ -10 +10 @@ +-1 ++1 +")) + (with-temp-buffer + (insert patch) + (diff-fixup-modifs (point-min) (point-max)) + (should (equal (buffer-string) "--- file ++++ file +@@ -1,1 +1,0 @@ +-1 +@@ -10,1 +10,1 @@ +-1 ++1 +--- otherfile ++++ otherfile +@@ -1,0 +1,1 @@ ++2 +@@ -10,1 +10,1 @@ +-1 ++1 +"))))) + (provide 'diff-mode-tests) ;;; diff-mode-tests.el ends here -- 2.34.1 --=-=-=-- ------------=_1671866942-10033-1--