summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/diff.c
AgeCommit message (Collapse)Author
2006-07-08Remove file mode argument from {cvs|rcs}_buf_write_stmp(). WeRay Lai
always set the temporary file to mode 600, which is already done by mkstemp(). OK joris@ and xsa@ over a month ago.
2006-07-07first part of opencvs remote, fairly useable on existing treesJoris Vink
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).
2006-07-01Indentation.Ray Lai
2006-06-19kill local and remote callback and just have one called fileproc.Joris Vink
we let the commands pass the correct function. all in preparation for remote.
2006-06-16change a cvs_buf_load() to cvs_buf_load_fd()Joris Vink
spotted by xsa@ a few days ago
2006-06-16in preparation for the new remote code, proto.h becomes obsolete.Joris Vink
2006-06-14simplify cvs_hack_time() and the way it is called;Joris Vink
2006-06-01fix outputJoris Vink
2006-05-31support -p flag for diff, makes dlg@ feel all warmJoris Vink
and fuzzie inside.
2006-05-31set diff_rev2 to file_rcsrev when we are usingJoris Vink
the file we have on disk as the second thing to diff to. fixes some output issues.
2006-05-30fix diff -rrevision usageJoris Vink
2006-05-30fill in the correct revision number we will want in file_rcsrevJoris Vink
for each cvs_file struct, this will help us with sticky tags, commiting to branches and importing into existing repositories.
2006-05-29make diff accept symbols for -r too now that we haveJoris Vink
a translation function.
2006-05-28allow commands to shut up the output from cvs_file_classifyJoris Vink
if the commands want to output certain stuff themselfs
2006-05-27and now you can use -N to diff removed files tooJoris Vink
2006-05-27allow diff to pick up newly added files with the -N flag.Joris Vink
2006-05-27dont forget to expand any keywords before diffing stuff,Joris Vink
otherwise we might end up with chunks that are totally wrong.
2006-05-27allow commands to respect the -l flag, if the -l flag isJoris Vink
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.
2006-05-27commit the new opencvs code, i have been hacking onJoris Vink
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.
2006-04-14- don't append the extension if it's already there (PR 5076).Joris Vink
- 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@
2006-04-14remove a metric buttload of excessive ()Theo de Raadt
no binary change; ok ray
2006-04-13Add error checking for vasprintf. Stylistic suggestions from xsa@.Ray Lai
OK xsa@
2006-04-05Use variable names for sizeof, remove casts in front of xmalloc,Ray Lai
use xcalloc and xstrdup where appropriate, and other stuff. OK joris@
2006-04-01fix some bugs that lint discovered for us.Joris Vink
ok niallo@
2006-03-28xmalloc(num * size) -> xcalloc(num, size)Ray Lai
asprintf -> xasprintf Remove asprintf check, which was non-portable anyway. ``okidoki'' xsa@
2006-03-28Today is Integer Overflow Prevention Day:Ray Lai
- Sync xmalloc.? with ssh versions. - Change all xrealloc() calls to new API. ``I really like this.'' niallo@
2006-03-25Correct integer types, remove unused arguments, non-portable bitshiftsRay Lai
changed to division, KNF, replace unreachable code with goto fail, et cetera. Found by lint. The free() -> xfree() as well. OK niallo@
2006-03-24Remove unused variables, better integer types, prevent fallthroughs.Ray Lai
Found by lint. Compare char * variables against NULL for consistency and add parentheses around complicated comparisons, suggested by xsa@. OK xsa@
2006-03-23fetch() will never return non-zero; change its return type to void.Xavier Santolaria
OK niallo@.
2006-02-26remove unnecessary newline characters in cvs_log() calls.Niall O'Higgins
From: Ray Lai <ray@cyth.net> in PR#5038
2006-01-30strerror() -> rcs_errstr() when passing rcs_errno as argument;Xavier Santolaria
2006-01-27more errors handling cleanup;Xavier Santolaria
2006-01-25use cvs_rcs_getpath() instead of duplicating code.Xavier Santolaria
2006-01-02- nuke remaining err(), errx() and warnx() instances.Xavier Santolaria
- make cvs_log_init() return type void. ok joris@.
2006-01-02#include's cleanup; ok joris@ niallo@.Xavier Santolaria
2005-12-30major cleanup of the functions handling the remote cvs protocol.Joris Vink
makes the code a lot more readable and understandable. ok xsa@ and niallo@
2005-12-21cvs_buf_write_stmp() cannot fail anymore, missed it in previous commit;Xavier Santolaria
2005-12-20cvs_buf_putc() and cvs_buf_write_*() functions cannot fail anymore;Xavier Santolaria
2005-12-10switch to xmalloc stuff, me and xsa@ agreed on this a longJoris Vink
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@
2005-12-05- repair cvs diff. my date fix was too naive.Niall O'Higgins
2005-12-01- fix up context and unified diff output in both open rcs and open cvs soNiall O'Higgins
that the date is set correctly. ok joris@
2005-12-01- fix unified and context diff output, finally!Niall O'Higgins
this was a long standing bug, and the fix is hilarious. ok joris@
2005-11-24respect TMPDIR;Xavier Santolaria
2005-11-21- print some more informative messagesXavier Santolaria
- minor knf niallo ok
2005-11-18minor knf;Xavier Santolaria
2005-11-14minor knf;Xavier Santolaria
2005-10-22diff3 support, needed for merging files together;Joris Vink
"go for it" niallo@
2005-10-11close the RCSFILE on error, so we don't leak memory;Joris Vink
2005-10-11export diff_file variable so it can be set from without diff functions;Joris Vink
ok niallo@
2005-10-08add missing newline, fixes D_NORMAL diff output;Joris Vink
ok niallo@