From nobody Wed Sep 6 15:07:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgm1f0JV1z4s4Yk; Wed, 6 Sep 2023 15:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgm1d6zZnz4TRP; Wed, 6 Sep 2023 15:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694012822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ERtMom/CBecxS6AJFRKojVXSEd3C8q5vp75ZwUwc6y0=; b=YXvoqrIAgSC4fnWn2mf7MmUN7S4m0u/oVyLdBefjh5s7S3d45q0m16fc95EJ61OdRkw9y/ lo9AXTplGJM/CXMe7WlC4IZ0pfB1f5MhkcD5dvcNaSlNY3uyFiTyQmu6p9+MqEFPOwcZtn uRa7S6NkJvIuLwWTnOR06koOkFOMig1Dp2rb6BUxogH7lVarJLPPiYVfXXTsKX7Dpp6Z+g HJKSX1fsZDAJbW7L2CCpJ8lHk5skFEocX8M5BwuXjTg09nX1B3+oML1/d1uUQXTgS/C+Io UTB71oX/wga/OgD9oyroi/oq2zgXfzZRQ6o26Lw7OnPBGH6ewhUvbolCNISYxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694012822; a=rsa-sha256; cv=none; b=KmiWc+5S5KGN7ybC7COQIDzk2Znwm+p38gysVmtQn2Zz+0veJf9Cgz1YMh7Dj24efRjTE4 1ZFrwan1X5XFNEhGRTs6k/9s8oD6uUqQ4dNKWBR4WG6huvS8Jh6cJpvghGynHrrrYoxZvJ 5Cc4rr2rh7QmwlW+AuSFVLilbmuYCP6iOKyw9KffvPhXQDKWzBn9kvqBdeV73ZXC104Kx3 8FqfKQpEa9fAPoJ7wN4lbAMuCemI3lNRRr3HEG7L+zly5mg2T8EXdjCCMPuGL1x66Cdzji Gy+cu1a0fFhz8GfXbviItd9r6hnZURlIkDN698Jr3s2Udd0W/ZvYaZk1DVFJUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694012822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ERtMom/CBecxS6AJFRKojVXSEd3C8q5vp75ZwUwc6y0=; b=nVeQnIqeBLy5milLHuXqlP9hnUfDeSYk0Xk1RkS4YMX3EzUAS27eVDOF8VwqH2NF1H1TFC fHPcexyrh6Dzc7Yn6RPNFi/xsCZjyF8+QYVaVz7npj1fb0FuqPfFk8z9k3BiFqJgaRQTqM 8N8JpqKHj9ux4Zaxc/wPDqcZmTngffUyhYRDWdaDWByX/MxFHrUnEGZuMrGs36T1Onn3LF BVMKsv0YIX9dbl5FLzrplD600PDCL4rIWwYa5Zomr8G1uSPB0/ng6fYscNU0f7OMSrVi05 sh52CUFZw75UA4hDUDnxXSXTtZBdyWh19G4ULdfWFiqBbP7Zg9l3RQZD7RB1+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rgm1d62qhz5ZZ; Wed, 6 Sep 2023 15:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386F71Jv037538; Wed, 6 Sep 2023 15:07:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386F71FP037535; Wed, 6 Sep 2023 15:07:01 GMT (envelope-from git) Date: Wed, 6 Sep 2023 15:07:01 GMT Message-Id: <202309061507.386F71FP037535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: b37a6938e39a - main - diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b37a6938e39a7ed9542fafee671465bf719fd537 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=b37a6938e39a7ed9542fafee671465bf719fd537 commit b37a6938e39a7ed9542fafee671465bf719fd537 Author: Baptiste Daroussin AuthorDate: 2023-09-05 11:24:53 +0000 Commit: Baptiste Daroussin CommitDate: 2023-09-06 15:06:39 +0000 diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3 In gnu diff3 3 way merging files where the new file and the target are already the same will die and show what has failed to be merged except if -E is passed in argument, in this case it will finish the merge. This difference in behaviour was breaking one of the etcupdate testcase with bsd diff3 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D41730 --- usr.bin/diff3/diff3.c | 8 +++++--- usr.bin/diff3/tests/Makefile | 2 ++ usr.bin/diff3/tests/diff3_test.sh | 32 ++++++++++++++++++++++++++++++++ usr.bin/diff3/tests/fbsdid1.txt | 5 +++++ usr.bin/diff3/tests/fbsdid2.txt | 5 +++++ 5 files changed, 49 insertions(+), 3 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index e80b1d142231..380987560ee0 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -335,7 +335,8 @@ merge(int m1, int m2) change(2, &d2->old, false); } else if (Aflag || mflag) { // XXX-THJ: What does it mean for the second file to differ? - j = edit(d2, dup, j, DIFF_TYPE2); + if (eflag == EFLAG_UNMERGED) + j = edit(d2, dup, j, DIFF_TYPE2); } d2++; continue; @@ -861,7 +862,7 @@ main(int argc, char **argv) eflag = EFLAG_UNMERGED; break; case 'E': - eflag = EFLAG_UNMERGED; + eflag = EFLAG_OVERLAP; oflag = 1; break; case 'i': @@ -907,7 +908,8 @@ main(int argc, char **argv) argv += optind; if (Aflag) { - eflag = EFLAG_UNMERGED; + if (eflag == EFLAG_NONE) + eflag = EFLAG_UNMERGED; oflag = 1; } diff --git a/usr.bin/diff3/tests/Makefile b/usr.bin/diff3/tests/Makefile index df000d68cc7e..3b720586d148 100644 --- a/usr.bin/diff3/tests/Makefile +++ b/usr.bin/diff3/tests/Makefile @@ -23,5 +23,7 @@ ${PACKAGE}FILES+= \ long-ed.out \ long-A.out \ long-merge.out \ + fbsdid1.txt \ + fbsdid2.txt .include diff --git a/usr.bin/diff3/tests/diff3_test.sh b/usr.bin/diff3/tests/diff3_test.sh index 3a4fc128ca16..3cbd7dac1ed9 100755 --- a/usr.bin/diff3/tests/diff3_test.sh +++ b/usr.bin/diff3/tests/diff3_test.sh @@ -4,6 +4,7 @@ atf_test_case diff3_lesssimple atf_test_case diff3_ed atf_test_case diff3_A atf_test_case diff3_merge +atf_test_case diff3_E_merge diff3_body() { @@ -66,6 +67,36 @@ diff3_merge_body() diff3 -m -L long-m.txt -L long-o.txt -L long-y.txt $(atf_get_srcdir)/long-m.txt $(atf_get_srcdir)/long-o.txt $(atf_get_srcdir)/long-y.txt } +diff3_E_merge_body() +{ + +expected="<<<<<<< 2 +# \$FreeBSD: head/local 12000 jhb \$ +======= +# \$FreeBSD: head/local 12345 jhb \$ +>>>>>>> 3 +# \$FreeBSD: head/local 12345 jhb \$ + +this is a file + +these are some local mods to the file +" + # first test the regular test + cp $(atf_get_srcdir)/fbsdid2.txt out.txt + atf_check -s exit:1 -o inline:"${expected}" \ + diff3 -m -L 1 -L 2 -L 3 out.txt $(atf_get_srcdir)/fbsdid1.txt $(atf_get_srcdir)/fbsdid2.txt + +merged="# \$FreeBSD: head/local 12345 jhb \$ + +this is a file + +these are some local mods to the file +" + atf_check -s exit:0 -o inline:"${merged}" \ + diff3 -E -m out.txt $(atf_get_srcdir)/fbsdid1.txt $(atf_get_srcdir)/fbsdid2.txt +} + + atf_init_test_cases() { atf_add_test_case diff3 @@ -73,4 +104,5 @@ atf_init_test_cases() atf_add_test_case diff3_ed atf_add_test_case diff3_A atf_add_test_case diff3_merge + atf_add_test_case diff3_E_merge } diff --git a/usr.bin/diff3/tests/fbsdid1.txt b/usr.bin/diff3/tests/fbsdid1.txt new file mode 100644 index 000000000000..9f94660bda97 --- /dev/null +++ b/usr.bin/diff3/tests/fbsdid1.txt @@ -0,0 +1,5 @@ +# $FreeBSD: head/local 12000 jhb $ + +this is a file + +these are some local mods to the file diff --git a/usr.bin/diff3/tests/fbsdid2.txt b/usr.bin/diff3/tests/fbsdid2.txt new file mode 100644 index 000000000000..420ad975868b --- /dev/null +++ b/usr.bin/diff3/tests/fbsdid2.txt @@ -0,0 +1,5 @@ +# $FreeBSD: head/local 12345 jhb $ + +this is a file + +these are some local mods to the file