summaryrefslogtreecommitdiffstats
path: root/usr.bin/cvs/commit.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* first part of opencvs remote, fairly useable on existing treesjoris2006-07-071-2/+22
| | | | | | | | | | | | | | 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).
* - abort the commit when files are not correctly up to date.joris2006-07-021-4/+8
| | | | | | - do not try to attempt to check for conflict markers when the file is not on disk. found by and okay reyk@
* it is a really good idea to store the result cvs_buf_load_fd returnsjoris2006-06-291-2/+2
| | | | | | in bp, considering we depend on that. found by reyk who is now my favorite german person, 10x.
* print less verbose messages for cvs commit and add if the -q/-Q flagreyk2006-06-281-12/+19
| | | | | | has been specified. ok joris@
* do not fail when we are trying to commit a newly added file when the CVS/*,tjoris2006-06-281-3/+5
| | | | | | | file is not present for the file. spotted and tested by reyk@ okay xsa@
* kill local and remote callback and just have one called fileproc.joris2006-06-191-4/+3
| | | | | | we let the commands pass the correct function. all in preparation for remote.
* in preparation for the new remote code, proto.h becomes obsolete.joris2006-06-161-3/+2
|
* add cvs_buf_load_fd() which does the same as cvs_buf_load()joris2006-06-141-3/+3
| | | | | | | | | | 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.
* files that are not checked out are not up-to-date, considerjoris2006-06-131-3/+4
| | | | | | this a conflict and block the commit when we encounter any of these. and make an error message a bit more fluffy and accurate.
* add support for <name>,t file:xsa2006-06-071-1/+34
| | | | | | - 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@.
* hello commit -F supportjoris2006-06-061-1/+8
|
* sprinkle -n voodoo over the add, commit and import commands.joris2006-06-041-1/+4
|
* major rewrite of some rcs parsing stuff:joris2006-06-011-2/+7
| | | | | | | | | | | | | | - 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.
* when adding a new file that already exists set the previousjoris2006-05-311-4/+8
| | | | | deltatext (the dead revision) to the correct rcs diff if the file was modified in any way.
* allow commit to ressurect added files that exist in Attic/joris2006-05-311-12/+46
|
* fill in the correct revision number we will want in file_rcsrevjoris2006-05-301-3/+3
| | | | | for each cvs_file struct, this will help us with sticky tags, commiting to branches and importing into existing repositories.
* the moment we are done commiting a removed file, move the RCS filejoris2006-05-301-2/+29
| | | | into the Attic and out of our way.
* enable basic add command, only works on files right now.joris2006-05-281-9/+17
|
* allow commands to shut up the output from cvs_file_classifyjoris2006-05-281-3/+3
| | | | if the commands want to output certain stuff themselfs
* teach opencvs ci how to commit files that have been added,joris2006-05-281-7/+29
| | | | | | opencvs can now commit modified files, removed files and added files. hip hip hurray!
* enable merging on update. if your file in your working copyjoris2006-05-281-2/+12
| | | | | | | | | | | 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.
* show which directory we are examining in our pre-commit checks.joris2006-05-271-1/+7
|
* allow commands to respect the -l flag, if the -l flag isjoris2006-05-271-1/+6
| | | | | | | 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.
* dont allow commit to continue if the file that is beingjoris2006-05-271-1/+8
| | | | commited needs to be updated or merged first.
* commiting removed files now worksjoris2006-05-271-8/+43
|
* commit the new opencvs code, i have been hacking onjoris2006-05-271-198/+131
| | | | | | | | | | | | 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.
* remove a metric buttload of excessive ()deraadt2006-04-141-6/+6
| | | | no binary change; ok ray
* fix some bugs that lint discovered for us.joris2006-04-011-6/+2
| | | | ok niallo@
* zap more unused variables.xsa2006-03-161-5/+1
|
* #include's cleanup; ok joris@ niallo@.xsa2006-01-021-11/+2
|
* major cleanup of the functions handling the remote cvs protocol.joris2005-12-301-19/+9
| | | | | | makes the code a lot more readable and understandable. ok xsa@ and niallo@
* cvs_rcs_getpath() cannot fail anymore;xsa2005-12-221-4/+2
|
* cvs_logmsg_open() and cvs_logmsg_get() cannot fail anymore;xsa2005-12-211-3/+3
|
* switch to xmalloc stuff, me and xsa@ agreed on this a longjoris2005-12-101-6/+2
| | | | | | | | | 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@
* use LP_NOTICE instead of LP_INFO where appropriate;xsa2005-07-271-2/+2
|
* KNF;xsa2005-07-251-6/+6
|
* rewrite of the file code. the previous one was justjoris2005-07-231-12/+12
| | | | | | | | 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@
* correctly seperate added, modified and removed files for use in thejoris2005-07-231-23/+51
| | | | | | construction of the log message in the editor. ok jfb@
* use the cf_name field of the CVSFILE struct instead of using the oldjoris2005-07-221-5/+3
| | | | | | | | 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@
* unbreak the commit command.joris2005-07-191-2/+2
|
* use cvs_rcs_getpath();xsa2005-07-141-13/+2
|
* split this into cvs_commit_{remote,local}() functions;xsa2005-07-121-33/+51
| | | | ok jfb@ (Yes, Yes he IS back!!)
* remove trailing whitespacesjoris2005-07-071-2/+2
| | | | from deraadt@
* headers ordering (alphabetically) and cleanup, from mbalmer@ and myself;xsa2005-05-311-4/+4
|
* don't forget to send the log message, this fixes the commit command.joris2005-05-301-1/+4
| | | | ok xsa@
* handle -r option; ok joris@xsa2005-05-301-1/+13
|
* Merge the cvs_cmd and cvs_cmd_info structures and add the necessaryjfb2005-05-241-18/+24
| | | | | | | fields to hook local versions of the commands. This needs to go in before it gets any bigger ok joris
* correct wrong error code usage.joris2005-05-201-5/+7
| | | | ok jfb@, xsa@
* execute the command callback at the same time we are buildingjoris2005-05-201-5/+27
| | | | | | the in-memory filelist. cuts down on execution time for larger trees. "put it in!" jfb@
* don't send a Modified request and the file its contents whenjoris2005-04-241-1/+8
| | | | it has been removed.