#
d9a9f23d |
| 27-Mar-2024 |
Dag-Erling Smørgrav <des@FreeBSD.org> |
diff: Integrate libdiff from OpenBSD GoT.
This adds support for two new diff algorithms, Myers diff and Patience diff.
These algorithms perform a different form of search compared to the classic St
diff: Integrate libdiff from OpenBSD GoT.
This adds support for two new diff algorithms, Myers diff and Patience diff.
These algorithms perform a different form of search compared to the classic Stone algorithm and support escapes when worst case scenarios are encountered.
Add the -A flag to allow selection of the algorithm, but default to using the new Myers diff implementation.
The libdiff implementation currently only supports a subset of input and output options supported by diff. When these options are used, but the algorithm is not selected, automatically fallback to the classic Stone algorithm until support for these modes can be added.
Based on work originally done by thj@ with contributions from kevans@.
Sponsored by: Klara, Inc. Reviewed by: thj Differential Revision: https://reviews.freebsd.org/D44302
show more ...
|
Revision tags: release/13.3.0, release/14.0.0 |
|
#
d0b2dbfa |
| 16-Aug-2023 |
Warner Losh <imp@FreeBSD.org> |
Remove $FreeBSD$: one-line sh pattern
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
|
Revision tags: release/13.2.0, release/12.4.0, release/13.1.0, release/12.3.0 |
|
#
12061d26 |
| 16-Sep-2021 |
Piotr Pawel Stefaniak <pstef@FreeBSD.org> |
diff: link with libm for sqrt()
Reported by: Jenkins Fixes: bcf2e78dc48378456798191f1c15cb76d6221a65
|
Revision tags: release/13.0.0, release/12.2.0, release/11.4.0, release/12.1.0, release/11.3.0, release/12.0.0, release/11.2.0 |
|
#
6fa5bf08 |
| 09-Jun-2018 |
Baptiste Daroussin <bapt@FreeBSD.org> |
Isolate the pr(1) related code in its own source files
This keeps diffreg.c closer to what it is supposed to do: diffing regular files.
It also allows my code to get a proper license
|
Revision tags: release/10.4.0 |
|
#
1409e715 |
| 21-Aug-2017 |
Hans Petter Selasky <hselasky@FreeBSD.org> |
Merge ^/head r322398 through r322746.
|
#
82baa8db |
| 14-Aug-2017 |
Enji Cooper <ngie@FreeBSD.org> |
MFhead@r322515
|
#
188e46ab |
| 14-Aug-2017 |
Enji Cooper <ngie@FreeBSD.org> |
Add supporting changes for `Add limited sandbox capability to "make check"`
Non-tests/... changes: - Add HAS_TESTS= to Makefiles with libraries and programs to enable iteration and propagate the a
Add supporting changes for `Add limited sandbox capability to "make check"`
Non-tests/... changes: - Add HAS_TESTS= to Makefiles with libraries and programs to enable iteration and propagate the appropriate environment down to *.test.mk.
tests/... changes: - Add appropriate support Makefile.inc's to set HAS_TESTS in a minimal manner, since tests/... is a special subdirectory tree compared to the others.
MFC after: 2 months MFC with: r322511 Reviewed by: arch (silence), testing (silence) Differential Revision: D12014
show more ...
|
#
0275f9db |
| 11-Aug-2017 |
Hans Petter Selasky <hselasky@FreeBSD.org> |
Merge ^/head r321383 through r322397.
|
#
d59ead01 |
| 03-Aug-2017 |
Enji Cooper <ngie@FreeBSD.org> |
MFhead@r321970
|
#
d511b20a |
| 02-Aug-2017 |
Enji Cooper <ngie@FreeBSD.org> |
Add HAS_TESTS to all Makefiles that are currently using the `SUBDIR.${MK_TESTS}+= tests` idiom.
This is a follow up to r321912.
|
#
46b37aa2 |
| 02-Aug-2017 |
Enji Cooper <ngie@FreeBSD.org> |
MFhead@r321912
|
#
4b330699 |
| 02-Aug-2017 |
Enji Cooper <ngie@FreeBSD.org> |
Convert traditional ${MK_TESTS} conditional idiom for including test directories to SUBDIR.${MK_TESTS} idiom
This is being done to pave the way for future work (and homogenity) in ^/projects/make-ch
Convert traditional ${MK_TESTS} conditional idiom for including test directories to SUBDIR.${MK_TESTS} idiom
This is being done to pave the way for future work (and homogenity) in ^/projects/make-check-sandbox .
No functional change intended.
MFC after: 1 weeks
show more ...
|
Revision tags: release/11.1.0 |
|
#
3bbe3f67 |
| 11-Mar-2017 |
Baptiste Daroussin <bapt@FreeBSD.org> |
Import diff from OpenBSD and remove GNU diff
Some of the modifications from the previous summer of code has been integrated Modification for compatibility with GNU diff output has been added
Main d
Import diff from OpenBSD and remove GNU diff
Some of the modifications from the previous summer of code has been integrated Modification for compatibility with GNU diff output has been added
Main difference with OpenBSD: Implement multiple GNU diff options: * --ignore-file-name-case * --no-ignore-file-name-case * --normal * --tabsize * --strip-trailing-cr Make diff -p compatible with GNU diff Implement diff -l Make diff -r compatible with GNU diff
Capsicumize diffing 2 regular files Add a simple test suite
Approved by: AsiaBSDcon devsummit Obtained from: OpenBSD, GSoC Relnotes: yes
show more ...
|
Revision tags: release/11.0.1, release/11.0.0, release/10.3.0, release/10.2.0, release/10.1.0 |
|
#
478290db |
| 01-Oct-2014 |
Enji Cooper <ngie@FreeBSD.org> |
Check in first src/tests snapshot from NetBSD anoncvs
Sources were obtained like so:
% export CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot" % cvs -z9 co -D "09/30/2014 20:45" -P src/tests % mv src/
Check in first src/tests snapshot from NetBSD anoncvs
Sources were obtained like so:
% export CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot" % cvs -z9 co -D "09/30/2014 20:45" -P src/tests % mv src/tests/* tests/dist/.
'*CVS*' has been added to svn:ignore to ease updating periodically from upstream
Some line ending issues had to be resolved with test outputs and scripts via dos2unix and by deleting the eol-style property set in usr.bin/sort
Discussed with: rpaulo Sponsored by: EMC / Isilon Storage Division
show more ...
|