summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/update.c
AgeCommit message (Collapse)Author
2007-02-22general includes cleanup sweep. ok joris@ niallo@Otto Moerbeek
2007-02-17cvs_path_cat() removal since we can now easily handle thatXavier Santolaria
functionality w/ xsnprintf(); Initial diff started by thib@. OK thib@ joris@.
2007-02-09correctly skip invalid entries when usingJoris Vink
getdirentries(2). ok otto@
2007-02-09if a directory exists in the working dir but not in theXavier Santolaria
repository, mark it as to be skipped so we do not try to lock it on update and miserably fail... OK joris@.
2007-02-09remove the cvs_file_classify() `loud' argument, it was usedJoris Vink
in the old school days and serves no purpose what so ever now. otto@ mentioned this to me a while ago
2007-01-31snprintf() -> xsnprintf()Xavier Santolaria
2007-01-28do not overwrite a file that is modified but has a sticky tag setJoris Vink
when running update -A, instead merge in the changes. 'kay xsa@
2007-01-28add merging support in both local and remote sides.Joris Vink
tested by many, thanks.
2007-01-25use more stack allocations for fixed size buffers. ok xsa@ joris@Otto Moerbeek
2007-01-23When acting as a server do not blindly removeJoris Vink
directories in cvs_update_leavedir(). fixes the "Device busy" error some people have been seeing. problem initially reported by Frank Denis. ok xsa@
2007-01-18more informative error msg.Xavier Santolaria
2007-01-17add support for remote checkout in both our client and server,Joris Vink
with this the last real dependency to actually be able to use opencvs in a remote setup has been added. based upon an initial diff from xsa@ 'kay niallo@
2007-01-13remove BUF * argument from cvs_checkout_file() it willJoris Vink
no longer be used, ever.
2007-01-12major re-work of the RCS api. this results in 100x performance improvements ↵Niall O'Higgins
in some places and much reduced memory usage. note that only checkout has been fully converted to use the new high-performance functions. other codepaths (e.g. update) still use the old method which is provided for backwards compatibility. we can convert the remaining slow bits over to the new api piece-by-piece. "commit this, now" joris@ brad@ tested, too.
2007-01-11rework opencvs so that we can deal with binary files. previously we assumed ↵Niall O'Higgins
all files were ascii, which broke things in real-world usage. now a checkout of src should work, albeit using lots of memory and cpu. fixing this is the next step. testing by many. ok & some input joris@
2007-01-11in a remote setup:Joris Vink
do not connect to the remote server until we are sure all the options passed to the commands are valid. noticed by xsa@
2006-12-07snprintf() -> cvs_path_cat()Xavier Santolaria
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