summaryrefslogtreecommitdiffstats
path: root/git-cvsimport-script
AgeCommit message (Collapse)AuthorLines
2005-07-08[PATCH] Expose object ID computation functions.Bryan Larsen-1/+1
This patch makes the first half of write_sha1_file() and index_fd() externally visible, to allow callers to compute the object ID without actually storing it in the object database. [JC demangled the whitespaces himself because he liked the patch so much, and reworked the interface to index_fd() slightly, taking suggestion from Linus and of his own.] Signed-off-by: Bryan Larsen <bryan.larsen@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-06[PATCH] Fix fd leak in git-cvsimport-scriptSven Verdoolaege-0/+1
Remember to close temporary file Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-05Merge with http://www.liacs.nl/~sverdool/git.git#cvs2gitMatthias Urlichs-54/+95
2005-07-05cvsimport: getopt accepted a -q option (undocumented and unused).Matthias Urlichs-1/+1
Removed.
2005-07-05git-cvsimport-script: move working directory forwardSven Verdoolaege-5/+27
If HEAD happened to point to a cvs branch, move the working directory forward to the tip of the branch. Additionally, if master and "origin" are equal, move master forward to new origin first.
2005-07-04git-cvsimport-script: remove unused variableSven Verdoolaege-2/+0
2005-07-04git-cvsimport-script: more error handlingSven Verdoolaege-2/+3
2005-07-04git-cvsimport-script: provide direct support for cvsps -z optionSven Verdoolaege-4/+5
2005-07-04git-cvsimport-script: update cvsps cache instead of rebuilding itSven Verdoolaege-1/+1
Updating the cache is sufficient for most purposes. If users really want to rebuild the cache, they can specify the option themselves.
2005-07-04git-cvsimport-script: fix branch switchingSven Verdoolaege-1/+2
Previous patch broke branch switching.
2005-07-04git-cvsimport-script: use private index.Sven Verdoolaege-20/+23
2005-07-04git-cvsimport-script: leave working directory alone.Sven Verdoolaege-33/+48
2005-07-03git-cvsimport-script: typo head -> headsSven Verdoolaege-1/+1
2005-07-03cvsimport: Missing tests for verbosity flag.Matthias Urlichs-2/+2
2005-07-03Support :ext: access method.Sven Verdoolaege-2/+21
2005-07-03Honour CVS_SERVER.Sven Verdoolaege-1/+3
2005-07-03Make specification of CVS module to convert optional.Sven Verdoolaege-8/+26
If we're inside a checked out CVS repository, there is no need to explicitly specify the module as it is available in CVS/Repository. Also read CVS/Root if it's available and -d is not specified. Finally, explicitly pass root to cvsps as CVS/Root takes precedence over CVSROOT. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
2005-06-30cvsimport: Added option '-p': pass options to cvspsMatthias Urlichs-3/+6
Added option '-x' to cvsps call
2005-06-30cvsimport: Exit if an existing repository doesn't have the right branch.Matthias Urlichs-0/+5
2005-06-30cvs import: Strip whitespace at the end of the log entryMatthias Urlichs-1/+6
for compatibility with old cvs2git.
2005-06-30cvsimport: perform string comparison on "HEAD"Sven Verdoolaege-1/+1
2005-06-30git-cvsimport-script: Removed redundant @old and @new clear.Matthias Urlichs-3/+0
2005-06-30git-cvsimport-script: Remove setting Sticky; it may cause problemsMatthias Urlichs-1/+1
2005-06-30cvs import: Call git-update-cache multiple timesMatthias Urlichs-4/+22
instead of with a too-long argument list.
2005-06-28Rollbak to the original branch after importingMatthias Urlichs-4/+25
2005-06-28Local cvsimport fixupsMatthias Urlichs-2/+8
2005-06-28Fix remote CVS import.Matthias Urlichs-30/+48
2005-06-28Added Perl git-cvsimport-scriptMatthias Urlichs-29/+575
2005-06-12[PATCH] git cvsimport fuzz argumentTommy M. McGuire-8/+19
Add "-z fuzz" argument, passed to cvsps, and clean up argument processing. Also, use "cvsps --cvs-direct", which is is somewhat faster. Give the user the option of specifying the timestamp fuzz passed to cvsps. Looking at the other arguments to it, I can't see anything else that would be sane to play with. Also, use --cvs-direct, which speeds up cvsps for remote repositories and doesn't seem to do anything bad to local repositories. Signed-off-by: Tommy McGuire <mcguire@crsr.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-12[PATCH] git cvsimport sanity checkingTommy M. McGuire-1/+3
This patch adds some sanity checking to git-cvsimport-script, specifically forcing the use of cvsps -x (to get the latest information from the repository, rather than whatever is in the cache) and aborting early if cvsps does not produce any output. I debated removing the $MODULE directory following an abort, but I eventually decided leaving stuff behind would make debugging easier. On the other hand, this patch should help with the "cvsimport left me with an empty repository" complaints. Call cvsps with the -x flag, to get the current state of the repository, and abort the cvs import early if cvsps does not produce any output. Signed-off-by: Tommy McGuire <mcguire@crsr.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-12[PATCH] cvsimport: allow remote CVS reposTommy M. McGuire-1/+1
Remove unneeded sanity tests. Remote repositories do, indeed, just work. Signed-off-by: Tommy McGuire <mcguire@crsr.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-07Add CVS import scripts and programsLinus Torvalds-0/+25
This gets the "cvs2git" program from the old git-tools archive, and adds a nice script around it that makes it much easier to use. With this, you should be able to import a CVS archive using just a simple git cvsimport <cvsroot> <module> and you're done. At least it worked for my one single test. NOTE!! This may need tweaking. It currently expects (and verifies) that cvsps version 2.1 is installed, but you can't actually set any of the cvsps parameters, like the time fuzz.