d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
230,210 Commits 4 Branches 49 Tags
2aa5d9c4c8
Commit Graph

10 Commits

Author SHA1 Message Date
Baptiste Daroussin
933870f0d1 Cross reference pr(1) which diff might call with -l option 2017-04-20 19:14:52 +00:00
Baptiste Daroussin
bcf91ad6d3 Document all long options 2017-04-20 19:05:43 +00:00
Baptiste Daroussin
fddcb7b82f Implement a basic --changed-group-format 
etcupdate(8) requires that option, while GNU diff supports many more variation
of that options, their behaviour beside the simple verion implemented here are
quite 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, but
it actually when tested print the changes from the first file
 2017-04-20 14:22:33 +00:00
Baptiste Daroussin
a077708d35 add a stub --speed-large-files for compatibility with GNU diff 
There is no intention to implement it, but lots of scripts/tools using
diff(1) passes GNU diff option
 2017-04-08 08:46:02 +00:00
Enji Cooper
7dacb9e765 diff(1): document remaining long options 
While here, try and tie together some of the short options with
their long option equivalents, where possible.

Sponsored by:	Dell EMC Isilon
 2017-03-23 04:35:52 +00:00
Enji Cooper
78b83a1ea1 diff(1): fix SYNOPSIS section noting non-existent option, --no-ignore-case 
`--no-ignore-case` should be `--no-ignore-file-name-case` per code for
compatibility with [g]diff(1).

Sponsored by:	Dell EMC Isilon
 2017-03-22 18:13:14 +00:00
Enji Cooper
9ba2762423 diff(1): add --strip-trailing-cr to last example in the SYNOPSIS 
This syncs the last example in the SYNOPSIS with the other examples.

Reviewed by:	bapt
Sponsored by:	Dell EMC Isilon
Differential Revision:	D10017
 2017-03-19 21:49:15 +00:00
Enji Cooper
b7ea08a976 diff(1): sort long options under -D example in SYNOPSYS 
Sponsored by:	Dell EMC Isilon
 2017-03-15 17:54:47 +00:00
Baptiste Daroussin
57f942af81 Fix wrong date in diff(1) 
Reported by:	rgrimes
 2017-03-12 03:36:33 +00:00
Baptiste Daroussin
3bbe3f672e 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
 2017-03-11 05:01:29 +00:00