Commit Graph

14 Commits

Author SHA1 Message Date
Matthias Urlichs
4c24e089a3 cvsimport: Exit if an existing repository doesn't have the right branch. 2005-06-30 22:10:32 +02:00
Matthias Urlichs
e371046b64 cvs import: Strip whitespace at the end of the log entry
for compatibility with old cvs2git.
2005-06-30 22:09:42 +02:00
Sven Verdoolaege
0fa2824f35 cvsimport: perform string comparison on "HEAD" 2005-06-30 17:23:22 +02:00
Matthias Urlichs
dbc1aeace6 git-cvsimport-script: Removed redundant @old and @new clear. 2005-06-30 12:28:31 +02:00
Matthias Urlichs
4f7c0caa8f git-cvsimport-script: Remove setting Sticky; it may cause problems 2005-06-30 12:19:48 +02:00
Matthias Urlichs
4abdecbf85 cvs import: Call git-update-cache multiple times
instead of with a too-long argument list.
2005-06-30 11:55:57 +02:00
Matthias Urlichs
465416694a Rollbak to the original branch after importing 2005-06-28 21:08:15 +02:00
Matthias Urlichs
f65ae603db Local cvsimport fixups 2005-06-28 19:58:40 +02:00
Matthias Urlichs
2a3e1a85b5 Fix remote CVS import. 2005-06-28 19:49:19 +02:00
Matthias Urlichs
a57a9493df Added Perl git-cvsimport-script 2005-06-28 16:48:40 +02:00
Tommy M. McGuire
9718a00b90 [PATCH] git cvsimport fuzz argument
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 20:48:18 -07:00
Tommy M. McGuire
861cb6f02c [PATCH] git cvsimport sanity checking
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 20:48:18 -07:00
Tommy M. McGuire
667628d97a [PATCH] cvsimport: allow remote CVS repos
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-12 20:48:18 -07:00
Linus Torvalds
d4f8b390a4 Add CVS import scripts and programs
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.
2005-06-07 15:11:28 -07:00