Changes in Makefile

e9ac41698b2f322d55ccf9da50a3596edb2c1800 - Remove residual blank line at start of Makefile

Mon, 15 Jul 2024 06:46:32 +0200

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 List of files: /freebsd/usr.bin/diff/tests/Makefile

d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf - Remove $FreeBSD$: one-line sh pattern

Wed, 16 Aug 2023 19:55:03 +0200

Remove $FreeBSD$: one-line sh patternRemove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ List of files: /freebsd/usr.bin/diff/tests/Makefile

8bf187f35b6298b7848c5ecf45b0b714327090d9 - diff: fix side-by-side output with tabbed input

Wed, 14 Dec 2022 02:31:21 +0100

diff: fix side-by-side output with tabbed inputThe previous logic conflated some things... in this block:- j: input characters rendered so far- nc: number of characters in the line- col: columns rendered so far- hw: column width ((h)ard (w)idth?)Comparing j to hw or col to nc are naturally wrong, as col and hw arelimits on their respective counters and nc is already brought down to hwif the input line should be truncated to start with.Right now, we end up easily truncating lines with tabs in them as wecount each tab for $tabwidth lines in the input line, but we reallyshould only be accounting for them in the column count. The problem ismost easily demonstrated by the two input files added for the tests,the two tabbed lines lose at least a word or two even though there'splenty of space left in the row for each side.Reviewed by: bapt, pstefSponsored by: Klara, Inc.Differential Revision: https://reviews.freebsd.org/D37676 List of files: /freebsd/usr.bin/diff/tests/Makefile

8f79bd9b85716c495c2741ac25db37e8d71f22f7 - diff: Detect Objective-C methods

Fri, 18 Feb 2022 16:07:52 +0100

diff: Detect Objective-C methodsWhen searching back for function definitions, consider lines startingwith '+' and '-', this allows us to pick up Objective-C methods as wellas C style function definitions.Reviewed by: baptSponsored by: Klara Inc.Differential Revision: https://reviews.freebsd.org/D34202 List of files: /freebsd/usr.bin/diff/tests/Makefile

af2f0164318455433db95adce07af829285b78ad - diff: don't output carriage returns that were stripped on input

Sun, 22 Aug 2021 18:05:59 +0200

diff: don't output carriage returns that were stripped on input--strip-trailing-cr worked as intended for comparison between files,but the characters were still present in final output. List of files: /freebsd/usr.bin/diff/tests/Makefile

7847e04111f2c2b06b36f6d19a46d78814d7836d - Merge ^/head r338026 through r338297, and resolve conflicts.

Fri, 24 Aug 2018 20:09:23 +0200

Merge ^/head r338026 through r338297, and resolve conflicts. List of files: /freebsd/usr.bin/diff/tests/Makefile

e68edb8cf06a796453378b98d963692c838c400f - diff(1): Implement -B/--ignore-blank-lines

Sun, 19 Aug 2018 05:57:20 +0200

diff(1): Implement -B/--ignore-blank-linesAs noted by cem in r338035, coccinelle invokes diff(1) with the -B flag.This was not previously implemented here, so one was forced to create a linkfor GNU diff to /usr/local/bin/diffImplement the -B flag and add some primitive tests for it. It is implementedin the same fashion that -I is implemented; each chunk's lines are scanned,and if a non-blank line is encountered then the chunk will be output.Otherwise, it's skipped.MFC after: 2 weeks List of files: /freebsd/usr.bin/diff/tests/Makefile

531c2d7af3cd2e64eec94aa1b19c4b2f16fce515 - MFhead@r320180

Mon, 24 Jul 2017 20:02:13 +0200

MFhead@r320180 List of files: /freebsd/usr.bin/diff/tests/Makefile

bca9d05fdb058aa709621661c2feccae8940d94b - Merge ^/head r319973 through 321382.

Sun, 23 Jul 2017 17:22:06 +0200

Merge ^/head r319973 through 321382. List of files: /freebsd/usr.bin/diff/tests/Makefile

2fef18f836c6d1b45a6f2e0fc9b0da55e2b938e8 - Merge ^/head r320994 through r321238.

Wed, 19 Jul 2017 21:43:10 +0200

Merge ^/head r320994 through r321238. List of files: /freebsd/usr.bin/diff/tests/Makefile

274b460b606f7a16841eba3b7dfbfc4992ee6eb0 - Use more flexible expression for replacing t_diff in

Wed, 19 Jul 2017 20:30:16 +0200

Use more flexible expression for replacing t_diff incontrib/netbsd-tests/usr.bin/diff/t_diff.sh with the name of the script via`basename $0`.This was a change I forgot to port over from^/head/gnu/usr.bin/diff/tests/Makefile@r272787. List of files: /freebsd/usr.bin/diff/tests/Makefile

554491ffbdcfe51993d5b436a9bbca7aba388dd3 - Merge ^/head r316992 through r317215.

Thu, 20 Apr 2017 23:04:21 +0200

Merge ^/head r316992 through r317215. List of files: /freebsd/usr.bin/diff/tests/Makefile

fddcb7b82ff45dc9e08bab26bbfe7a2d2e8ca20f - Implement a basic --changed-group-format

Thu, 20 Apr 2017 16:22:33 +0200

Implement a basic --changed-group-formatetcupdate(8) requires that option, while GNU diff supports many more variationof that options, their behaviour beside the simple verion implemented here arequite inconsistent as such I do not plan to implement those.The only special keyword supported by this implementation are: %< and %>%= is not implemented as the documentation of GNU diff says: common lines, butit actually when tested print the changes from the first file List of files: /freebsd/usr.bin/diff/tests/Makefile

05d06ecac32d892eafc5e8e13652324d8f5ac46a - Add a regression test for diff -D

Thu, 20 Apr 2017 13:32:18 +0200

Add a regression test for diff -D List of files: /freebsd/usr.bin/diff/tests/Makefile

385a67dc6aec2ac34b65099bddd157c88fdf4fda - diff: Show nanoseconds in -u/-c header line.

Sun, 26 Mar 2017 21:47:43 +0200

diff: Show nanoseconds in -u/-c header line.Show nanoseconds in the -u/-c header line.The present portability conditionals cannot handle the POSIX standardst_mtim, so remove them and unconditionally use st_mtim.PR: 218018Reported by: jbeichReviewed by: baptDifferential Revision: https://reviews.freebsd.org/D10145 List of files: /freebsd/usr.bin/diff/tests/Makefile

58cf4d864f54b697ce69078c90d338ed3580821d - diff: Fix mtime of file1 in -u/-c header line.

Sun, 26 Mar 2017 16:09:25 +0200

diff: Fix mtime of file1 in -u/-c header line.PR: 218018Reviewed by: baptDifferential Revision: https://reviews.freebsd.org/D10140 List of files: /freebsd/usr.bin/diff/tests/Makefile

458cbf0ae6c08a8198470358697fe9064443b11b - Rename tests from to _test to match the FreeBSD test suite

Thu, 23 Mar 2017 04:28:24 +0100

Rename tests from to _test to match the FreeBSD test suitenaming schemeusr.bin/diff/diff_test was renamed to usr.bin/diff/netbsd_diff_testto avoid collisions with the renamed FreeBSD test.MFC after: 1 weekSponsored by: Dell EMC Isilon List of files: /freebsd/usr.bin/diff/tests/Makefile

beeed5993e9f63f3adf7f157c8af4bc362d8aaa6 - Integrate contrib/netbsd-tests/usr.bin/diff/t_diff.sh in as

Wed, 15 Mar 2017 07:18:14 +0100

Integrate contrib/netbsd-tests/usr.bin/diff/t_diff.sh in as.../usr.bin/diff/diff_testSome minor adjustment needed to be done for :same as it currentlyhas the test script hardcoded into the test, instead of using anidiom like $(dirname $0)MFC after: 1 weekSponsored by: Dell EMC Isilon List of files: /freebsd/usr.bin/diff/tests/Makefile

3bbe3f672e37e4f609adb3be3a6476edce2243ec - Import diff from OpenBSD and remove GNU diff

Sat, 11 Mar 2017 06:01:29 +0100

Import diff from OpenBSD and remove GNU diffSome of the modifications from the previous summer of code has been integratedModification for compatibility with GNU diff output has been addedMain difference with OpenBSD:Implement multiple GNU diff options:* --ignore-file-name-case* --no-ignore-file-name-case* --normal* --tabsize* --strip-trailing-crMake diff -p compatible with GNU diffImplement diff -lMake diff -r compatible with GNU diffCapsicumize diffing 2 regular filesAdd a simple test suiteApproved by: AsiaBSDcon devsummitObtained from: OpenBSD, GSoCRelnotes: yes List of files: /freebsd/usr.bin/diff/tests/Makefile