summaryrefslogtreecommitdiff
path: root/usr.bin/cvs
AgeCommit message (Collapse)Author
2010-10-15Fixed default branch handling and added support for branches in branches.Tobias Stoeckmann
ok nicm
2010-10-15Replaced RCS parser code with new rcsparse.{c,h}:Tobias Stoeckmann
- be very strict about things we parse - print more information about errors if they occur - do not fatal() directly in parser, give caller a chance to react - fix an rcs design issue when it comes to login names tested by many on tech@ ok xsa
2010-09-29Support for update -C, from zinovik.Nicholas Marriott
ok tobias xsa
2010-09-29Ensure that we always parse all deltas before expecting "desc" keyword.Tobias Stoeckmann
ok nicm, zinovik
2010-09-27Have cvs_file_walkdir() ignore CVS/ directories when walking a repository tree.Joshua Elsasser
This fixes r* commands such as rlog against a repository which has somehow ended up containing CVS/Entries.Static files. ok nicm@ guenther@
2010-09-23Add cvs_mkdir() for recursive directory creation on import, based on aNicholas Marriott
diff from Michael W Bombardieri in PR 6398. tested by & ok jasper
2010-09-19more wacky macro fixing;Jason McIntyre
2010-09-11Fixed typo.Tobias Stoeckmann
ok ray, zinovik
2010-09-08Improve buf.c comments, from zinovik.Nicholas Marriott
ok stsp
2010-09-08Use SIZE_LEFT macro to determine left size instead of calculating withTobias Stoeckmann
pointers. ok zinovik
2010-09-03add an EXIT STATUS section for /usr/bin;Jason McIntyre
2010-09-03Rename RCSNUM's fd to rf_fd, complies to other variable names andTobias Stoeckmann
OpenRCS. ok xsa, zinovik
2010-09-02rcsnum_parse() allocates already an RCSNUM struct, so it's not needed toTobias Stoeckmann
copy it into a newly allocated one (which is even a memory leak). ok zinovik
2010-08-31Removed ra_uid, which was supposed to save the uid of a delta's author.Tobias Stoeckmann
Is not used and not useful. ok xsa, zinovik
2010-08-01change buf_release() prototype accordingly to buf.czinovik
unbreaks opencvs build
2010-08-01change returning type to void like it is done in OpenRCS:buf_release()zinovik
ok nicm@
2010-07-31introduce macro SIZE_LEFT and function buf_grow() from OpenRCSzinovik
buf_grow() replaces macro BUF_GROW() ok nicm@, ray@
2010-07-31When looking for revision, break out of the loop at the end rather thanNicholas Marriott
looping forever. This prevents the server going into an infinite loop when the repository is behind the checkout, but the behaviour is not correct (it is an error rather than ignoring the file), so mark with an XXX for now. Some underlying OpenCVS functions are too fatal()-happy and will probably need to be changed in order to fix this properly. Problem reported by sthen. ok xsa ray
2010-07-31Checking for -1 as an overflow value is pretty absurd. ReturningRay Lai
the unix epoch is equally absurd. Just return Start for now. We may add overflow checks in the future. OK xsa nicm
2010-07-30Check date_parse return values.Ray Lai
OK xsa
2010-07-29Replace abort(), fatal(), and errx() with return -1, since date_parseRay Lai
returns -1 on error. OK nicm
2010-07-28Support -U and -C to specify the context length for "cvs diff".Nicholas Marriott
This doesn't alter cvs rdiff, where -U and -C are not support by GNU cvs. ok sthen zinovik
2010-07-23Reduce variable/function name and whitespace differences betweenRay Lai
cvs/rcs. OK xsa zinovik
2010-07-23Clean up struct tm handling. Instead of calling gmtime/localtimeRay Lai
and making copies (among other weird dances), use reentrant versions. Not being able to tell the time is a fatal error, so die if that happens. Diff originally from nicm. OK nicm xsa
2010-07-23Rename a bunch of variables and functions, removing the cvs_/rcs_Ray Lai
prefixes to reduce differences between cvs and rcs files. "yes!" nicm
2010-07-21Only use username if author is NULL. Fixes "ci -wusername" when runRay Lai
as root. OK nicm
2010-07-16Combine two diff_output lines into one, from diff.Ray Lai
OK stsp xsa nicm
2010-07-15Die immediately if pread fails. It's a fatal error so treat it asRay Lai
such. Besides, we weren't handling the NULL being returned. From diff. Minor nit by nicm. OK xsa stsp nicm
2010-07-15Sync with diff/diffreg.c r1.75:Ray Lai
Return -1 on error as advertised. Handle case when only one stream failed. OK xsa, stsp
2010-07-13Don't silently overwrite untracked local files with newly-addedNicholas Marriott
repository files. slightly earlier version ok zinovik xsa
2010-07-13Do not put the file into conflict if it is no longer modified (user hasNicholas Marriott
edited it back to repository state). ok zinovik
2010-07-13PR 6423 fix for cvs too, requested by xsa@.Nicholas Marriott
2010-07-09Make cvs and rcs consistent in what characters they'll accept inChristian Weisgerber
symbol/tag names: require the first character to be a letter and allow any printable character (except the RCS specials $,.:;@) afterwards. This matches GNU cvs. ok xsa@ zinovik@ stsp@
2010-07-09when opencvs is started with trace option `-t' it must print function itzinovik
enters, even if it was executed simultaneously with `-n' (no exec option). cvs_unedit_local() does not conform that behaviour, so lets make it behave like all other functions. ok xsa@, stsp@
2010-04-19Increase buffer size to support large pathnames. Committing onTodd C. Miller
behalf of stsp@ who is travelling. OK miod@ deraadt@ xsa@ jsg@
2010-04-04OpenCVS is very annoying and incorrect when user tries to add severalzinovik
files at a time. OpenCVS does the following: # touch a b c # opencvs add a b c opencvs add: scheduling file 'a' for addition opencvs add: use 'opencvs commit' to add this file permanently opencvs add: scheduling file 'b' for addition opencvs add: use 'opencvs commit' to add this file permanently opencvs add: scheduling file 'c' for addition opencvs add: use 'opencvs commit' to add this file permanently This behaviour was added in -r 1.48 of add.c file. This commit makes OpenCVS behave like GNU cvs: # touch a b c # opencvs add a b c opencvs add: scheduling file 'a' for addition opencvs add: scheduling file 'b' for addition opencvs add: scheduling file 'c' for addition opencvs add: use 'opencvs commit' to add these files permanently ok deraadt@, xsa@
2010-03-30This diff synchronizes rcs parser code with OpenRCS. It shrinks code by 3zinovik
lines, but does exactly the same thing. It also removes unneeded variable `buf' ok deraadt@, xsa@
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