summaryrefslogtreecommitdiffstats
path: root/usr.bin/cvs/diff.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Support -U and -C to specify the context length for "cvs diff".nicm2010-07-281-1/+2
| | | | | | | This doesn't alter cvs rdiff, where -U and -C are not support by GNU cvs. ok sthen zinovik
* Reduce variable/function name and whitespace differences betweenray2010-07-231-13/+13
| | | | | | cvs/rcs. OK xsa zinovik
* More cvs/diff/rcs convergence:ray2009-06-071-3/+3
| | | | | | | | | | | 1. Mostly variable/function renaming, SIZE_T_MAX->SIZE_MAX, and spacing. 2. One strchr -> strncspn. 3. diff had a weird thing where it set file[12] = ofile[12] but never updated file or ofile, then if file and ofile were different it freed it. I removed it. OK millert
* Sync some rcsdiff changes to cvsdiff. As a side effect,ray2009-06-061-2/+13
| | | | | | | cvs diff -t now works. There should be no functional change otherwise. OK millert
* support some additional diff options: -a, -b, -d, -wsthen2009-04-281-1/+5
| | | | ok joris@
* add checkout/update -j support.joris2008-03-081-1/+3
| | | | still has some rough edges.
* prevent file racesjoris2008-02-271-2/+2
| | | | ok tobias@
* Added rdiff support. In order to do this, some output and option fixestobias2008-02-031-1/+2
| | | | | | had to be done for diff, too. OK joris@
* add merging support in both local and remote sides.joris2007-01-281-2/+2
| | | | tested by many, thanks.
* add cvs_buf_load_fd() which does the same as cvs_buf_load()joris2006-06-141-2/+2
| | | | | | | | | | except it takes a decriptor as argument instead of a path. modified cvs_buf_load() to open the descriptor then pass it to cvs_buf_load_fd(). change all the calls to cvs_buf_load() that have a descriptor open for the path to cvs_buf_load_fd() to prevent races.
* support -p flag for diff, makes dlg@ feel all warmjoris2006-05-311-1/+2
| | | | and fuzzie inside.
* commit the new opencvs code, i have been hacking onjoris2006-05-271-7/+1
| | | | | | | | | | | | this for the past 2 weeks now and it should go in at the start of the hackathon so others can help out. this code is a lot safer, smarter, faster and best of all it is actually doing what it is suppose to do! basic checkout, update, status, diff and commit are working in local mode only. there is no support for any remote setups now.
* - don't append the extension if it's already there (PR 5076).joris2006-04-141-1/+3
| | | | | | | | | | - show magic branches in rlog (thanks for that nicer hack niall). - correct output in rcsdiff, so we perfectly match gnu's all these bugs were found by sturm@ while he was using cvsweb (which uses the RCS tools). "it is in my view that you should put it in" niallo@
* sync comments with reality.xsa2006-04-101-2/+2
|
* add an argument to cvs_diff3() to be able to handle verbosity ofxsa2006-03-141-2/+2
| | | | commands; fixes rcsmerge -q behaviour. OK niallo@ ray@.
* - print some more informative messagesxsa2005-11-211-3/+4
| | | | | - minor knf niallo ok
* diff3_conflicts cleanup; joris okxsa2005-10-261-1/+2
|
* fix warning when compiling usr.bin/rcsjoris2005-10-221-1/+5
|
* diff3 support, needed for merging files together;joris2005-10-221-2/+7
| | | | "go for it" niallo@
* export diff_file variable so it can be set from without diff functions;joris2005-10-111-1/+2
| | | | ok niallo@
* basic `ci' support is here! more coming soon.niallo2005-10-071-2/+3
| | | | | | combined effort with joris. ok joris@
* - add a diff.h header file, corresponding to public functions in diff.cniallo2005-10-051-0/+98
and some #defines - include this header in rcs.c - link rcs against diff.c this allows us to use the existing diff work from opencvs within functions in the rcs.c API and thus in rcs programs. paves the way for diff support in usr.bin/rcs programs. ok joris@
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.