summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/update.c
AgeCommit message (Collapse)Author
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-03-p implies -n...Xavier Santolaria
2006-07-02- abort the commit when files are not correctly up to date.Joris Vink
- do not try to attempt to check for conflict markers when the file is not on disk. found by and okay reyk@
2006-07-01to be correct, cvs update -p is the "print" and not the "dump" flag.Reyk Floeter
suggested by deraadt@, ok joris@
2006-07-01implement the -p (dump) flag for cvs updateReyk Floeter
ok joris@
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-16in preparation for the new remote code, proto.h becomes obsolete.Joris Vink
2006-06-14i mixed up the offset and whence variables for lseek(2)Joris Vink
2006-06-14add cvs_buf_load_fd() which does the same as cvs_buf_load()Joris Vink
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.
2006-06-06add support for the -D option of update,Joris Vink
-D allows you to update a file to matching a specified date: opencvs up -D "1 hour ago" foobar will take the first matching revision that was commited 1 hour ago.
2006-06-03add support for update -A and update -r<rev>.Joris Vink
hacking on the plane from toronto to barbados. i will probably hack some more since im stuck in barbados for 12 lovely hours over night cause the carribean airlines dont understand the meaning over 'more than one flight a day'.
2006-05-31add support for the export command.Joris Vink
export does exactly the same as checkout except it does not create any administrative (CVS/) directories.
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-28several fixes to the file api:Joris Vink
- default to CVS_FILE when something is totally unknown - cvs_get_repository_path() now returns the full repository path for the given argument. - cvs_get_repository_name() returns the contents of CVS/Repository to the caller. - allow command callbacks to specify if our recursion code needs to skip the directory or not. - when checking for a admin directory, make sure it is in fact a directory. if it is not we dont want to recurse inside.
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-28enable merging on update. if your file in your working copyJoris Vink
has been modified by yourself and there is a newer revision we try and merge them together. if the merge fails and has conflicts it will mark them inside the file, you will need to resolve these by hand first before you will be able to commit your modified file. works transparent with gnu cvs, as it is suppose to.
2006-05-27do not close the same entries list twice, this caused a double free;Joris Vink
2006-05-27support the -d flag for update.Joris Vink
if you specify -d when running update new directories will be build, otherwise they will be skipped.
2006-05-27update needs the CR_REPO flag to, otherwise it will forgetJoris Vink
about any new files or directories inside the repository
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-27pruning (-P) support for both the update and checkout commands;Joris Vink
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-14remove a metric buttload of excessive ()Theo de Raadt
no binary change; ok ray
2006-04-10change rcs_kwexp_set() return type to void and simplify its use. OK niallo@.Xavier Santolaria
2006-03-16zap more unused variables.Xavier Santolaria
2006-03-14add an argument to cvs_diff3() to be able to handle verbosity ofXavier Santolaria
commands; fixes rcsmerge -q behaviour. OK niallo@ ray@.
2006-01-27more errors handling cleanup;Xavier Santolaria
2006-01-06ingore local update of newly added files. this fixes some possibleReyk Floeter
NULL pointer conditions and also removes some obsolete extra checks. ok joris@
2006-01-06uninitialized pointer could confuse the cleanup checkReyk Floeter
ok joris@
2006-01-02#include's cleanup; ok joris@ niallo@.Xavier Santolaria
2005-12-30minor style nits;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-22cvs_rcs_getpath() cannot fail anymore;Xavier Santolaria
2005-12-03todd@ reminds me:Joris Vink
If you 'vi file.c' and change stuff, then 'make depend && make' you'll have a file.o file most definately more recent than the latest committed version of file.c. Then, if you rm file.c, and cvs update file.c, if 'file.c' is set to the timestamp of the last committed version, a subsequent 'make' will not rebuild the .o file. to fix this we simply use the current timestamp when updating files. thanks todd@!
2005-12-03respect Q flag in output;Joris Vink
2005-12-03add very basic support for the following stuff:Joris Vink
- checkout in local mode (example: /cvs) - update in local and server mode (example: /cvs and user@host:/cvs) - import in local and server mode (example: /cvs and user@host:/cvs) what remains to be done: - not all options are supported yet, and update cannot pick up newly added files yet. these things are pending and will be commited real soon. - checkout only works locally right now. - fix rcs parsing code so that we don't fucking hog 100% cpu on really BIG BIG BIG ass trees. mainly tested by pedro@ and myself, thanks a lot pedro! "go for it" niallo@
2005-08-08zap unused vars;Xavier Santolaria
2005-07-27use LP_NOTICE instead of LP_INFO where appropriate;Xavier Santolaria
2005-07-25KNF;Xavier Santolaria
2005-07-23rewrite of the file code. the previous one was justJoris Vink
a mess and not clean. this code is much cleaner, faster, and uses less memory overall. tested by xsa@, brad@, Michael Knudsen, and myself. okay xsa@
2005-07-21<sys/param.h> is already included in "cvs.h", no need to duplicate;Xavier Santolaria
2005-07-14use cvs_rcs_getpath();Xavier Santolaria
2005-07-07remove trailing whitespacesJoris Vink
from deraadt@
2005-06-30remove CF_KNOWN flag and move the CVS_FST_UNKNOWN check above theJoris Vink
one that looks if CVSFILE is a directory, so we get a correct output of unknown files in server mode. discussed with and ok xsa@
2005-06-30missing method checks in pre_exec handler.Joris Vink
ok xsa@
2005-06-17- add missing option in the command usageXavier Santolaria
- handle -k - handle -D and send it to server ok joris
2005-05-31headers ordering (alphabetically) and cleanup, from mbalmer@ and myself;Xavier Santolaria
2005-05-30-D and -r can be used simultaneously, pointed out by marc@ and thusXavier Santolaria
backout my previous change + spotted another case in the annotate command... ok joris@
2005-05-29-D and -r are mutually exclusive ...Xavier Santolaria
2005-05-26first part of real pruning supportJoris Vink
okay jfb@