summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/commit.c
AgeCommit message (Collapse)Author
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-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-13files that are not checked out are not up-to-date, considerJoris Vink
this a conflict and block the commit when we encounter any of these. and make an error message a bit more fluffy and accurate.
2006-06-07add support for <name>,t file:Xavier Santolaria
- add: creates <name>,t file with initial description if -m option was used. - commit: uses <name>,t content (if it exists) to set the file description OK joris@.
2006-06-06hello commit -F supportJoris Vink
2006-06-04sprinkle -n voodoo over the add, commit and import commands.Joris Vink
2006-06-01major rewrite of some rcs parsing stuff:Joris Vink
- rework rcs_getrev() to correctly support branches - rework rcs_translate_tag() to correctly translate given symbols or branches into their matching revisions - rework rcs_rev_add() to correctly update its 'next' pointers and insert the new revision in the correct place on the list. - rework rcs_head_get() to return the latest revision on the default branch if it has been set or the normal HEAD revision otherwise. - no longer access the rf_head member of the RCSFILE struct manually, use the rcs_head_get() function which correctly returns the HEAD revision, there might be a default branch that has to be used. - for now, when commiting a new revision reset the default branch.
2006-05-31when adding a new file that already exists set the previousJoris Vink
deltatext (the dead revision) to the correct rcs diff if the file was modified in any way.
2006-05-31allow commit to ressurect added files that exist in Attic/Joris 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-30the moment we are done commiting a removed file, move the RCS fileJoris Vink
into the Attic and out of our way.
2006-05-28enable basic add command, only works on files right now.Joris Vink
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-28teach opencvs ci how to commit files that have been added,Joris Vink
opencvs can now commit modified files, removed files and added files. hip hip hurray!
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-27show which directory we are examining in our pre-commit checks.Joris Vink
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-27dont allow commit to continue if the file that is beingJoris Vink
commited needs to be updated or merged first.
2006-05-27commiting removed files now worksJoris 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-01fix some bugs that lint discovered for us.Joris Vink
ok niallo@
2006-03-16zap more unused variables.Xavier Santolaria
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-22cvs_rcs_getpath() cannot fail anymore;Xavier Santolaria
2005-12-21cvs_logmsg_open() and cvs_logmsg_get() 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-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-23correctly seperate added, modified and removed files for use in theJoris Vink
construction of the log message in the editor. ok jfb@
2005-07-22use the cf_name field of the CVSFILE struct instead of using the oldJoris Vink
CVS_FILE_NAME macro. This macro used to be nifty because of all the referencing for the names, but since we don't do that anymore and use cf_name directly... byebye CVS_FILE_NAME() okay xsa@
2005-07-19unbreak the commit command.Joris Vink
2005-07-14use cvs_rcs_getpath();Xavier Santolaria
2005-07-12split this into cvs_commit_{remote,local}() functions;Xavier Santolaria
ok jfb@ (Yes, Yes he IS back!!)
2005-07-07remove trailing whitespacesJoris Vink
from deraadt@
2005-05-31headers ordering (alphabetically) and cleanup, from mbalmer@ and myself;Xavier Santolaria
2005-05-30don't forget to send the log message, this fixes the commit command.Joris Vink
ok xsa@
2005-05-30handle -r option; ok joris@Xavier Santolaria
2005-05-24Merge the cvs_cmd and cvs_cmd_info structures and add the necessaryJean-Francois Brousseau
fields to hook local versions of the commands. This needs to go in before it gets any bigger ok joris
2005-05-20correct wrong error code usage.Joris Vink
ok jfb@, xsa@
2005-05-20execute the command callback at the same time we are buildingJoris Vink
the in-memory filelist. cuts down on execution time for larger trees. "put it in!" jfb@
2005-04-24don't send a Modified request and the file its contents whenJoris Vink
it has been removed.
2005-04-24add missing CVS_CMD_ALLOWSPEC flagJoris Vink
2005-04-19handle removed files as well when checking files to commitJean-Francois Brousseau
ok joris
2005-04-19remove debug codeJoris Vink
2005-04-19make sure we pick up newly added files.Joris Vink
2005-04-18Modify the CVSFILE structure using a union to keep information aboutJean-Francois Brousseau
both files and directories. We can now keep the revision number for regular files, and don't need to fetch the appropriate entry in the command callbacks. This saves a huge amount of parsing on Entries files. ok joris@