summaryrefslogtreecommitdiffstats
path: root/usr.bin/cvs/diff.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* in a remote setup:joris2007-01-111-1/+2
| | | | | | | do not connect to the remote server until we are sure all the options passed to the commands are valid. noticed by xsa@
* Remove file mode argument from {cvs|rcs}_buf_write_stmp(). Weray2006-07-081-3/+3
| | | | | | | always set the temporary file to mode 600, which is already done by mkstemp(). OK joris@ and xsa@ over a month ago.
* first part of opencvs remote, fairly useable on existing treesjoris2006-07-071-3/+44
| | | | | | | | | | | | | | although i advise against using it on real development trees for now. only a few commands work right so far: - commit - diff - status - log - update (partially working) if you feel like testing remote and run into bugs feel free to contact me, and please include a full trace (-t).
* Indentation.ray2006-07-011-2/+2
|
* kill local and remote callback and just have one called fileproc.joris2006-06-191-3/+2
| | | | | | we let the commands pass the correct function. all in preparation for remote.
* change a cvs_buf_load() to cvs_buf_load_fd()joris2006-06-161-2/+2
| | | | spotted by xsa@ a few days ago
* in preparation for the new remote code, proto.h becomes obsolete.joris2006-06-161-3/+2
|
* simplify cvs_hack_time() and the way it is called;joris2006-06-141-4/+1
|
* fix outputjoris2006-06-011-3/+1
|
* support -p flag for diff, makes dlg@ feel all warmjoris2006-05-311-1/+10
| | | | and fuzzie inside.
* set diff_rev2 to file_rcsrev when we are usingjoris2006-05-311-1/+3
| | | | | | the file we have on disk as the second thing to diff to. fixes some output issues.
* fix diff -rrevision usagejoris2006-05-301-2/+3
|
* fill in the correct revision number we will want in file_rcsrevjoris2006-05-301-2/+2
| | | | | for each cvs_file struct, this will help us with sticky tags, commiting to branches and importing into existing repositories.
* make diff accept symbols for -r too now that we havejoris2006-05-291-11/+16
| | | | a translation function.
* allow commands to shut up the output from cvs_file_classifyjoris2006-05-281-2/+2
| | | | if the commands want to output certain stuff themselfs
* and now you can use -N to diff removed files toojoris2006-05-271-14/+25
|
* allow diff to pick up newly added files with the -N flag.joris2006-05-271-28/+51
|
* dont forget to expand any keywords before diffing stuff,joris2006-05-271-1/+5
| | | | otherwise we might end up with chunks that are totally wrong.
* allow commands to respect the -l flag, if the -l flag isjoris2006-05-271-1/+7
| | | | | | | specified certain commands will not recurse into directories. at the same time introduce a method of specifying wether or not a command should look in the repository for files.
* commit the new opencvs code, i have been hacking onjoris2006-05-271-1675/+117
| | | | | | | | | | | | 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-4/+31
| | | | | | | | | | - 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@
* remove a metric buttload of excessive ()deraadt2006-04-141-24/+24
| | | | no binary change; ok ray
* Add error checking for vasprintf. Stylistic suggestions from xsa@.ray2006-04-131-3/+6
| | | | OK xsa@
* Use variable names for sizeof, remove casts in front of xmalloc,ray2006-04-051-20/+20
| | | | | | use xcalloc and xstrdup where appropriate, and other stuff. OK joris@
* fix some bugs that lint discovered for us.joris2006-04-011-1/+3
| | | | ok niallo@
* xmalloc(num * size) -> xcalloc(num, size)ray2006-03-281-5/+5
| | | | | | | asprintf -> xasprintf Remove asprintf check, which was non-portable anyway. ``okidoki'' xsa@
* Today is Integer Overflow Prevention Day:ray2006-03-281-9/+9
| | | | | | | - Sync xmalloc.? with ssh versions. - Change all xrealloc() calls to new API. ``I really like this.'' niallo@
* Correct integer types, remove unused arguments, non-portable bitshiftsray2006-03-251-13/+11
| | | | | | | | | changed to division, KNF, replace unreachable code with goto fail, et cetera. Found by lint. The free() -> xfree() as well. OK niallo@
* Remove unused variables, better integer types, prevent fallthroughs.ray2006-03-241-19/+9
| | | | | | | | | Found by lint. Compare char * variables against NULL for consistency and add parentheses around complicated comparisons, suggested by xsa@. OK xsa@
* fetch() will never return non-zero; change its return type to void.xsa2006-03-231-7/+6
| | | | OK niallo@.
* remove unnecessary newline characters in cvs_log() calls.niallo2006-02-261-4/+4
| | | | From: Ray Lai <ray@cyth.net> in PR#5038
* strerror() -> rcs_errstr() when passing rcs_errno as argument;xsa2006-01-301-2/+2
|
* more errors handling cleanup;xsa2006-01-271-9/+6
|
* use cvs_rcs_getpath() instead of duplicating code.xsa2006-01-251-9/+2
|
* - nuke remaining err(), errx() and warnx() instances.xsa2006-01-021-2/+3
| | | | | - make cvs_log_init() return type void. ok joris@.
* #include's cleanup; ok joris@ niallo@.xsa2006-01-021-15/+2
|
* major cleanup of the functions handling the remote cvs protocol.joris2005-12-301-30/+21
| | | | | | makes the code a lot more readable and understandable. ok xsa@ and niallo@
* cvs_buf_write_stmp() cannot fail anymore, missed it in previous commit;xsa2005-12-211-6/+2
|
* cvs_buf_putc() and cvs_buf_write_*() functions cannot fail anymore;xsa2005-12-201-6/+2
|
* switch to xmalloc stuff, me and xsa@ agreed on this a longjoris2005-12-101-83/+25
| | | | | | | | | time ago, but we were being held back by jfb. too bad for him. next step is to use fatal() through out the code for unrecoverable errors instead of trying to be all nice and fluffy and reach main() again. ok niallo@ and xsa@
* - repair cvs diff. my date fix was too naive.niallo2005-12-051-3/+12
|
* - fix up context and unified diff output in both open rcs and open cvs soniallo2005-12-011-1/+21
| | | | | | that the date is set correctly. ok joris@
* - fix unified and context diff output, finally!niallo2005-12-011-2/+2
| | | | | | this was a long standing bug, and the fix is hilarious. ok joris@
* respect TMPDIR;xsa2005-11-241-3/+5
|
* - print some more informative messagesxsa2005-11-211-2/+2
| | | | | - minor knf niallo ok
* minor knf;xsa2005-11-181-13/+13
|
* minor knf;xsa2005-11-141-16/+16
|
* diff3 support, needed for merging files together;joris2005-10-221-4/+3
| | | | "go for it" niallo@
* close the RCSFILE on error, so we don't leak memory;joris2005-10-111-1/+4
|
* export diff_file variable so it can be set from without diff functions;joris2005-10-111-2/+2
| | | | ok niallo@