path: root/git-cvsimport.perl
AgeCommit message (Collapse)Author
2006-03-08cvsimport: Remove master-updating codeMatthias Urlichs
The code which tried to update the master branch was somewhat broken. => People should do that manually, with "git merge". Signed-off-by: Matthias Urlichs <> Signed-off-by: Junio C Hamano <>
2006-02-20cvsimport: avoid open "-|" list form for Perl 5.6Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-02-19Fix retries in git-cvsimportv1.2.2Martin Mares
Fixed a couple of bugs in recovering from broken connections: The _line() method now returns undef correctly when the connection is broken instead of falling off the function and returning garbage. Retries are now reported to stderr and the eventual partially downloaded file is discarded instead of being appended to. The "Server gone away" test has been removed, because it was reachable only if the garbage return bug bit. Signed-off-by: Martin Mares <> Signed-off-by: Junio C Hamano <>
2006-01-30cvsimport: Add -S <skipfileregex> support and -v announces files retrievedMartin Langhoff
A couple of things that seem to help importing broken CVS repos... -S '<slash-delimited-regex>' skips files with a matching path -v prints file name and version before fetching from cvs Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-01-16cvsimport: ease migration from CVSROOT/users formatJunio C Hamano
This fixes a minor bug, which caused the author email to be doubly enclosed in a <> pair (the code gave enclosing <> to GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL environment variable). The read_author_info() subroutine is taught to also understand the user list in CVSROOT/users format. This is primarily done to ease migration for CVS users, who can use the -A option to read from existing CVSROOT/users file. write_author_info() always writes in the git-cvsimport's native format ('=' delimited and value without quotes). Signed-off-by: Junio C Hamano <>
2006-01-16git-cvsimport: Add -A <author-conv-file> optionAndreas Ericsson
This patch adds the option to specify an author name/email conversion file in the format exon=Andreas Ericsson <> spawn=Simon Pawn <> which will translate the ugly cvs authornames to the more informative git style. The info is saved in $GIT_DIR/cvs-authors, so that subsequent incremental imports will use the same author-info even if no -A option is specified. If an -A option *is* specified, the info in $GIT_DIR/cvs-authors is appended/updated appropriately. Docs updated accordingly. Signed-off-by: Andreas Ericsson <> Signed-off-by: Junio C Hamano <>
2006-01-06Substitute "/" with $opt_s in tag names as well as branch namesJoe English
In 'git cvsimport' changes "/" to "-" (or $opt_s) in branch names, but not in tag names, which is inconsistent. Signed-off-by: Junio C Hamano <>
2005-11-25cvsimport: Don't let local settings hinder cvs user-migration.Andreas Ericsson
Avoid this by passing "--norc" to cvsps. Signed-off-by: Andreas Ericsson <> Signed-off-by: Junio C Hamano <>
2005-11-16symref support for import scriptsPavel Roskin
Fix git import script not to assume that .git/HEAD is a symlink. Signed-off-by: Pavel Roskin <> Signed-off-by: Junio C Hamano <>
2005-11-02cvsimport: cvsps should be quiet tooMartin Langhoff
Tell cvsps to be quiet, unless we've been told to be verbose. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2005-11-02cvsimport: introduce -P <cvsps-output-file> optionMartin Langhoff
-P:: <cvsps-output-file> Instead of calling cvsps, read the provided cvsps output file. Useful for debugging or when cvsps is being handled outside cvsimport. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2005-11-02cvsimport: catch error condition where cvs host disappearsMartin Langhoff
Add error handling for cases where the cvs server goes away unexpectedly. While I don't know why the cvs server is so erratic, we should definitely exit here before committing bogus files. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2005-10-18Fix cvsimport warning when called without --no-cvs-directJohannes Schindelin
Perl was warning that $opt_p was undefined in that case. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-10-16Merge branch 'svn' of C Hamano
[jc: I have my pre-commit hook enabled to catch trailing whitespaces, and fixed them up while merging.] Signed-off-by: Junio C Hamano <>
2005-10-12[PATCH] cvsimport: don't pass --cvs-direct if user options contradict usMartin Langhoff
Detecting if the user passed --no-cvs-direct and don't force the mode. It allows us to support all the protocol that the standard cvs client supports at the snail speed you should expect. This only affects the rlog reading stage. Signed-off-by: Martin Langhoff <>
2005-10-10cvsimport: report merge parentsMatthias Urlichs
Matching and reporting merge parents happens in a subprocess. Re-open stdout before redirecting stdout to the pipe, so that printing verbose messages doesn't go to the wrong place. Signed-Off-By: Matthias Urlichs <>
2005-10-02Pass CVSps generated A U Thor <author@domain.xz> intact.Junio C Hamano
Alexey Nezhdanov updated CVSps to generate author-name and author-email information in its output. If the input looks like it has that already properly formatted, use that without our own munging. Signed-off-by: Junio C Hamano <>
2005-09-08Big tool rename.Junio C Hamano
As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <>