summaryrefslogtreecommitdiff
path: root/usr.bin/cvs
AgeCommit message (Collapse)Author
2009-10-28rcsid[] and sccsid[] and copyright[] are essentially unmaintained (andTheo de Raadt
unmaintainable). these days, people use source. these id's do not provide any benefit, and do hurt the small install media (the 33,000 line diff is essentially mechanical) ok with the idea millert, ok dms
2009-06-27release storage after asprintf. ok sthen@Martynas Venckus
2009-06-21Use correct synopses for checkout and export when an invalid -k optionStuart Henderson
is specified. From Dawe in user/6177.
2009-06-07More cvs/diff/rcs convergence:Ray Lai
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
2009-06-06Sync some rcsdiff changes to cvsdiff. As a side effect,Ray Lai
cvs diff -t now works. There should be no functional change otherwise. OK millert
2009-04-29add options 'a' and 'd' to the getopt string soJoris Vink
we can actually use them. bad sthen@ and bad me for missing this :)
2009-04-28tweak previous;Jason McIntyre
2009-04-28support some additional diff options: -a, -b, -d, -wStuart Henderson
ok joris@
2009-04-18bleh, do not force the client to support certain responses.Joris Vink
this fixes annotate on our cvsweb. the cvsweb script does very funky things in order to get the job done, but hey we should support it. i'm shocked nobody noticed annotate wasnt working, djees. found by jacekm@
2009-04-10with the recent module-expand changes, we need to useJoris Vink
the correct repository path in Set-sticky and Clear-sticky otherwise we'll end up with stuff like src/bin/ls/src/bin/ls in CVS/Repository which pretty much breaks. noticed & ok sthen@
2009-04-07do not try to send a added file that is no longer on diskJoris Vink
towards the server. problem spotted and diff tested by sthen@
2009-04-06make sure we handle allowed options in cvs_export() insteadJoris Vink
of ignoring them, even if they are just stubs. unbreaks export with gnu cvs clients.
2009-04-04don't try to free stuff we shouldnt free, really.Joris Vink
2009-04-04properly expand modules if requested by the client,Joris Vink
this option is needed so gnu cvs clients can play along properly when running checkout <module> in a remote setup. if we do not support this, gnu cvs refuses to send us any existing files already on disk and opencvs will consider everything as NEEDS_CHECKOUT, instead of running an update on existing stuff. problem noticed by fgsch@ commited with opencvs, but please everybody else do not use opencvs to commit yet.
2009-04-03i fucked up last night, bad so partially revert a piece ofJoris Vink
code that wasnt suppose to dissapear: for uptodate files, we want to compare rev1 against file_rcsrev to see if we wish to diff or not. saves a bit off logic. commited with opencvs, permission by deraadt@
2009-04-03my last commit to diff.c broke diffing in some cases,Joris Vink
noticed the hard way here at work. commiting with opencvs, permission by deraadt@
2009-04-02properly deal with uptodate files server-side, as they do notJoris Vink
have a file on disk we'll need to load the revision into a temporary file to do our comparison. do not even bother trying diffing 2 off the same revisions either. causes less noise... way less. you guessed it, commited using opencvs entirely. with permission from deraadt@
2009-04-02if ce_conflict != NULL, the file should be sentJoris Vink
to the server for verification. commited with opencvs, permission by deraadt@
2009-04-02make sure diffing -rTAG -rTAG works even if files are uptodateJoris Vink
commited with opencvs, with permission by deraadt@
2009-04-01in client mode, be sure to consider the file modified if a conflictJoris Vink
exists in the CVS/Entries file, otherwise the server has no way of determining if the user has resolved it or not. also in client mode, send a conflict as Â"+=" not "+" alone, so other cvs implementations get it. commited entirely with opencvs, with permission by deraadt@
2009-03-30kill rp_lines, we do not need it when parsing an RCS file.Joris Vink
incendently, commit made using opencvs entirely. with permission from deraadt@
2009-03-29printf() -> cvs_printf() so it works under server mode as wellJoris Vink
spotted by Jonathan Armani <dbd@asystant.net>
2009-03-28when i fixed to attic handling i forgot one special caseJoris Vink
that we'd hit in normal checkouts/updates for duplicate file and dirs. found and diff tested by krw@
2009-03-27make sure that when we try to send a Set-sticky to the client,Joris Vink
we only do so if the file we're checking out was not supplied on the command-line. Otherwise we'll end up setting CVS/Tag for the entire directory instead of slapping a sticky tag only on the file supplied.
2009-03-26fix the way Attic is handled in our recursion code, so weJoris Vink
do not skip files or run over them twice. also fixes -l and -r for checkout/update when a file in Attic exists with that tag that in HEAD is a directory in the normal repository like gnu/usr.bin/gcc/INSTALL. as a bonus, we do not run fstat() twice per file or dir anymore... spotted by deraadt@
2009-03-26"Logging dirname" needs to be properly shown when running log/rlog.Joris Vink
spotted by deraadt@
2009-03-25switch our file and directory lists to RB trees (see tree(3)),Joris Vink
so we can benefit from faster lookup times while recursing.
2009-03-25prevent a very difficult to reach, but possible use after free.Joris Vink
ok tobias@
2009-03-25remove unused functions, definitions and outdated commentsJoris Vink
from the stone ages.
2009-03-25-q hasnt been the default verbosity mode in ages.Joris Vink
2009-03-24have CVS_OP_TAG and CVS_OP_RTAG use RCS_WRITE flagJoris Vink
when calling rcs_open(), so it gets automaticly synced at the end of operations for that file instead of explicitly calling rcs_write() when you're in RCS_READ mode only. while here, make sure we do not try to free an uninitialized list.
2009-03-24shuffle code a bit so FILE_REMOVE_ENTRY also callsJoris Vink
cvs_checkout_file() with CO_REMOVE set otherwise our server would never inform the client the entry should be removed.
2009-03-24use size_t for size, since atomicio() both accepts and returns itJoris Vink
2009-03-23kill SIZE_LEFT() macro, no longer usedJoris Vink
2009-03-23simplifyJoris Vink
2009-03-23remove debug, blehJoris Vink
2009-03-23add rlog -d support, ported from openrcs byJoris Vink
Josh Elsasser <josh@elsasser.org>
2009-03-23LP_NOTICE should be LP_ERR when showing directory messages.Joris Vink
2009-03-23any directory messages are, believe it or not, suppose to go to LP_ERRJoris Vink
instead of LP_NOTICE, while here modify output for non-existing files to match "? foobar" instead of "cannot find foobar". makes our output a little less alien and a little bit more gnuish.
2009-03-22styleTobias Stoeckmann
2009-03-22Avoid the usage of uninitialized value, which even might result in a memoryTobias Stoeckmann
leak if a file has no line in CVS/Entries. ok joris
2009-03-22Properly free allocated memory in error case.Tobias Stoeckmann
ok joris
2009-03-21use file_rcsrev when printing out Repository revision soJoris Vink
we always receive the correct revision number instead of HEAD, otherwise running status on a file that belongs to a branch results in showing HEAD revision instead of latest branch revision.
2009-03-21kill useless return;Joris Vink
2009-03-21be smarter when checking if a directory is empty by looking atJoris Vink
CVS/Entries early on in cvs_update_leavedir()
2009-03-19do not diff files server-side that are uptodate but require a patch,Joris Vink
as the client does not provide these files at all because they are not modified in anyway. otherwise this results in bad mojo. found by myself and sthen@
2009-03-19kill unused varsJoris Vink
2009-03-19only pass the real $var to expand_vars() instead of the entireJoris Vink
line, this way commitinfo and stuff works again. found by myself the hard way, fix by tobias@ who's not around to commit.
2009-03-19properly register Questionable files using CVS/Entries server-sideJoris Vink
in order for them to show up as "? foobar" when opencvs is in server mode.
2009-03-18be carefull when trying to access cf->file_rcs in cvs_checkout_file()Joris Vink
as it could be NULL under certain conditions.