diff3: Add SPDX-License-Identifier tagReviewed by: baptSponsored by: The FreeBSD FoundationDifferential Revision: https://reviews.freebsd.org/D55462
diff3: Produce correct exit statusUse exit status 2 for errors, 1 only to indicate that differences werefound between the inputs (in some operating modes).MFC after: 1 weekSponsored by: Klara,
diff3: Produce correct exit statusUse exit status 2 for errors, 1 only to indicate that differences werefound between the inputs (in some operating modes).MFC after: 1 weekSponsored by: Klara, Inc.Reviewed by: ngie, baptDifferential Revision: https://reviews.freebsd.org/D55608
show more ...
diff3: bump version to the date when the GNU diff3 compat was reached
diff3: Code cleanup* Order includes.* Turn the diff type into an enum.* Turn an unreachable error message into an assertion.* Remove unused debugging code.* Remove some dead assignments.*
diff3: Code cleanup* Order includes.* Turn the diff type into an enum.* Turn an unreachable error message into an assertion.* Remove unused debugging code.* Remove some dead assignments.* Consistently use 1 instead of EXIT_FAILURE.* Turn a return from main() into an exit().MFC after: 1 weekSponsored by: Klara, Inc.Reviewed by: baptDifferential Revision: https://reviews.freebsd.org/D55517
diff3: add 3 missing files from the testsuiteFixes: 2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b
diff3: fix merge modeMake the merge mode compatible with GNU diff3Add tests for all the changes, those tests are extracted from theetcupdate testsuite.This version passes the etcupdate testsuit
diff3: fix merge modeMake the merge mode compatible with GNU diff3Add tests for all the changes, those tests are extracted from theetcupdate testsuite.This version passes the etcupdate testsuite and the diffutils diff3test suite.MFC After: 1 week
diff3: fix diff3 -Afor cases where file2 differs but file1 and file3 agrees, the codestored the file2 and file3 line numbers in the de[] editing scriptentries but used them as if they were file1
diff3: fix diff3 -Afor cases where file2 differs but file1 and file3 agrees, the codestored the file2 and file3 line numbers in the de[] editing scriptentries but used them as if they were file1 line numbers.Reviewed by: thjDifferential Revision: https://reviews.freebsd.org/D55276
diff3: use pdwait instead of homemade oneMFC After: 3 days
diff3: Remove debugging remnant.Fixes: cf73401c4f7aMFC after: 3 weeks
diff3: Fix merge mode.This is mostly thj@'s work, with some tweaks and cleanup by me. Thereare still some cases where our output differs from GNU diff3, but it'smuch better than before and I'd r
diff3: Fix merge mode.This is mostly thj@'s work, with some tweaks and cleanup by me. Thereare still some cases where our output differs from GNU diff3, but it'smuch better than before and I'd rather commit what I have now than letit continue to languish in a metaphorical drawer.MFC after 3 weeksSponsored by: Klara, Inc.Reviewed by: thjDifferential Revision: https://reviews.freebsd.org/D46762
Remove residual blank line at start of MakefileThis is a residual of the $FreeBSD$ removal.MFC After: 3 days (though I'll just run the command on the branches)Sponsored by: Netflix
usr.bin: Automated cleanup of cdefs and other formattingApply the following automated changes to try to eliminateno-longer-needed sys/cdefs.h includes as well as now-emptyblank lines in a row.R
usr.bin: Automated cleanup of cdefs and other formattingApply the following automated changes to try to eliminateno-longer-needed sys/cdefs.h includes as well as now-emptyblank lines in a row.Remove /^#if.*\n#endif.*\n#include\s+<sys/cdefs.h>.*\n/Remove /\n+#include\s+<sys/cdefs.h>.*\n+#if.*\n#endif.*\n+/Remove /\n+#if.*\n#endif.*\n+/Remove /^#if.*\n#endif.*\n/Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/types.h>/Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/param.h>/Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/capsicum.h>/Sponsored by: Netflix
usr.bin: Remove ancient SCCS tags.Remove ancient SCCS tags from the tree, automated scripting, with twominor fixup to keep things compiling. All the common forms in the treewere removed with a pe
usr.bin: Remove ancient SCCS tags.Remove ancient SCCS tags from the tree, automated scripting, with twominor fixup to keep things compiling. All the common forms in the treewere removed with a perl script.Sponsored by: Netflix
diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3In gnu diff3 3 way merging files where the new file and the target arealready the same will die and show what has failed to be mer
diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3In gnu diff3 3 way merging files where the new file and the target arealready the same will die and show what has failed to be merged exceptif -E is passed in argument, in this case it will finish the merge.This difference in behaviour was breaking one of the etcupdate testcasewith bsd diff3Reviewed by: emasteDifferential Revision: https://reviews.freebsd.org/D41730
Remove $FreeBSD$: one-line nroff patternRemove /^\.\\"\s*\$FreeBSD\$$\n/
Remove $FreeBSD$: one-line sh patternRemove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
Remove $FreeBSD$: one-line .c patternRemove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/
diff3: Use ranges for new and old diffedits in ed scriptsThis should make the output logic easier to read. No functional changeintended.Sponsored by: Klara, Inc.
diff3: Use ranges for the old and new diffedits in A scriptsThis makes the output logic easier to read. No functional changeintended.Sponsored by: Klara, Inc.
diff3: Simplify startmark calculation in AscriptRemove redundant calculation for startmark.Sponsored by: Klara, Inc.
diff3: Use variables for old and new in A scriptsThis makes the code easier to follow, no functional changes intendedSponsored by: Klara, Inc.
diff3: Replace literal marker with variableSponsored by: Klara, Inc.
diff3: Fix indentationSponsored by: Klara, Inc.
diff3: make the eflag logic easier to followDiscussed with: dimSponsored by: Klara, Inc.Differential Revision: https://reviews.freebsd.org/D35324
diff3: Add man page description for version and helpReviewed by: Pau AmmaSponsored by: Klara, Inc.Differential Revision: https://reviews.freebsd.org/D35325
12