path: root/git-cvsimport.perl
AgeCommit message (Collapse)Author
2007-05-23Use git-for-each-ref to check whether the origin branch exists.Stephan Springl
This works in repositories that have their refs packed by "git-pack-refs --all --prune" whereas testing the file $git_dir/refs/heads/$opt_o does not. Acked-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2007-04-06cvsimport: Improve usage error reportingFrank Lichtenheld
Actually tell the user what he did wrong in case of usage errors instead of only printing the general usage information. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-04-06cvsimport: sync usage lines with existing optionsFrank Lichtenheld
Sync both the usage lines in the code and the asciidoc documentation with the real list of options. While all options seems to be documented in the asciidoc document, not all of them were listed in the usage line. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-02-08Read cvsimport options from repo-configJames Bowes
Default values for command line options can be saved in .git/config (or the global ~/.gitconfig). Config option names match the command line option names, so cvsimport.d corresponds to git-cvsimport -d. One may also set cvsimport.module to specify a default cvs module name. Signed-off-by: James Bowes <> Signed-off-by: Junio C Hamano <>
2007-01-22cvsimport: activate -a option, really.Junio C Hamano
An earlier commit ded9f400 added $opt_a support to disable the cvsps grace period mechanism, but forgot to tell the option parser about it. Signed-off-by: Junio C Hamano <>
2007-01-12use 'init' instead of 'init-db' for shipped docs and toolsNicolas Pitre
While 'init-db' still is and probably will always remain a valid git command for obvious backward compatibility reasons, it would be a good idea to move shipped tools and docs to using 'init' instead. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2007-01-08cvsimport: cleanup temporary cvsps fileMartin Langhoff
It is bad manners to leave these sizable files around when we are done with them. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2007-01-08cvsimport: skip commits that are too recent (option and documentation)Martin Langhoff
This makes the earlier "wait for 10 minutes before importing" safety overridable with "-a(ll)" flag, and adds necessary documentation. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2007-01-08cvsimport: skip commits that are too recentMartin Langhoff
With this patch, cvsimport will skip commits made in the last 10 minutes. The recent-ness test is of 5 minutes + cvsps fuzz window (5 minutes default). When working with a CVS repository that is in use, importing commits that are too recent can lead to partially incorrect trees. This is mainly due to - Commits that are within the cvsps fuzz window may later be found to have affected more files. - When performing incremental imports, clock drift between the systems may lead to skipped commits. This commit helps keep incremental imports of in-use CVS repositories sane. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-11-27cvsimport: style fixup.Junio C Hamano
This should not change any functionality, but just makes it readable by having a space between syntactic construct keyword and open parenthesis (e.g. "if (expr", not "if(expr") and between close parenthesis and open brace (e.g. "if (expr) {" not "if (expr){"). Signed-off-by: Junio C Hamano <>
2006-11-24git-cvsimport: add support for CVS pserver method HTTP/1.x proxyingIñaki Arenaza
This patch adds support for 'proxy' and 'proxyport' connection options when using the pserver method for the CVS Root. It has been tested with a Squid 2.5.x proxy server. Quoting from the CVS info manual: The `gserver' and `pserver' connection methods all accept optional method options, specified as part of the METHOD string, like so: :METHOD[;OPTION=ARG...]: Currently, the only two valid connection options are `proxy', which takes a hostname as an argument, and `proxyport', which takes a port number as an argument. These options can be used to connect via an HTTP tunnel style web proxy. For example, to connect pserver via a web proxy at and port 8000, you would use a method of: :pserver;;proxyport=8000: *NOTE: The rest of the connection string is required to connect to the server as noted in the upcoming sections on password authentication, gserver and kserver. The example above would only modify the METHOD portion of the repository name.* PROXY must be supplied to connect to a CVS server via a proxy server, but PROXYPORT will default to port 8080 if not supplied. PROXYPORT may also be set via the CVS_PROXY_PORT environment variable. Signed-off-by: Iñaki Arenaza <> Signed-off-by: Junio C Hamano <>
2006-11-15Run "git repack -a -d" once more at end, if there's 1MB or more of ↵Jim Meyering
not-packed data. Although I converted upstream coreutils to git last month, I just reconverted coreutils once again, as a test, and ended up with a git repository of about 130MB (contrast with my packed git repo of size 52MB). That was because there were a lot of commits (but < 1024) after the final automatic "git-repack -a -d". Running a final git-repack -a -d && git-prune-packed cut the final repository size down to the expected size. So this looks like an easy way to improve git-cvsimport. Just run "git repack ..." at the end if there's more than some reasonable amount of not-packed data. My choice of 1MB is a little arbitrarily. I wouldn't mind missing the minimal repo size by 1MB. At the other end of the spectrum, it's probably not worthwhile to pack everything when the total repository size is less than 1MB. Here's the patch: Signed-off-by: Jim Meyering <> Signed-off-by: Junio C Hamano <>
2006-09-20cvsimport: move over to using git-for-each-ref to read refs.Andy Whitcroft
cvsimport opens all of the files in $GIT_DIR/refs/heads and reads out the sha1's in order to work out what time the last commit on that branch was made (in CVS) thus allowing incremental updates. However, this takes no account of hierachical refs naming producing the following error for each directory in $GIT_DIR/refs: Use of uninitialized value in chomp at /usr/bin/git-cvsimport line 503. Use of uninitialized value in concatenation (.) or string at /usr/bin/git-cvsimport line 505. usage: git-cat-file [-t|-s|-e|-p|<type>] <sha1> Take advantage of the new packed refs work to use the new for-each-ref iterator to get this information. Signed-off-by: Andy Whitcroft <> Signed-off-by: Junio C Hamano <>
2006-06-28cvsimport - cleanup of the multi-indexes handlingMartin Langhoff
Indexes are only needed when we are about preparing to commit. Prime them inside commit() when we have all the info we need, and remove all the redundant index setups. While we are at it, make sure that index handling is correct when opening new branches, and on initial import. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-06-25cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}Johannes Schindelin
Also, make sure that the initial git-read-tree is performed. Signed-off-by: Johannes Schindelin <>
2006-06-24cvsimport: setup indexes correctly for ancestors and incremental importsMartin Langhoff
Two bugs had slipped in the "keep one index per branch during import" patch. Both incremental imports and new branches would see an empty tree for their initial commit. Now we cover all the relevant cases, checking whether we actually need to setup the index before preparing the actual commit, and doing it. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-06-17cvsimport: keep one index per branch during importMartin Langhoff
With this patch we have a speedup and much lower IO when importing trees with many branches. Instead of forcing index re-population for each branch switch, we keep many index files around, one per branch. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-06-17cvsimport: complete the cvsps run before starting the importMartin Langhoff
We now capture the output of cvsps to a tempfile, and then read it in. cvsps 2.1 works quite a bit "in memory", and only prints its patchset info once it has finished talking with cvs, but apparently retaining all that memory allocation. With this patch, cvsps is finished and reaped before cvsimport start working (and growing). So the footprint of the whole process is much lower. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-06-17cvsimport: ignore CVSPS_NO_BRANCH and impossible branchesMartin Langhoff
cvsps output often contains references to CVSPS_NO_BRANCH, commits that it could not trace to a branch. Ignore that branch. Additionally, cvsps will sometimes draw circular relationships between branches -- where two branches are recorded as opening from the other. In those cases, and where the ancestor branch hasn't been seen, ignore it. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-05-25cvsimport: avoid "use" with :tagJeff King
Avoid "use POSIX qw(strftime dup2 :errno_h)"; it was reported that a Perl installations on Mandrake 9.1 did not like it, even though it understood "use POSIX qw(:errno_h)". Funny. Signed-off-by: Junio C Hamano <>
2006-05-23cvsimport: set up commit environment in perl instead of using envJeff King
Signed-off-by: Junio C Hamano <>
2006-05-23cvsimport: do not barf on creation of an empty file.Junio C Hamano
When the server says "created this file whose length is empty", we mistakenly said "oops, the server did not say a sensible thing". Fix it. Spotted and fixed by Linus, acked by Martin. Signed-off-by: Junio C Hamano <>
2006-05-23cvsimport: introduce _fetchfile() method and used a 1M buffer to read()Martin Langhoff
File retrieval from the socket is now moved to _fetchfile() and we now cap reads at 1MB. This should limit the memory growth of the cvsimport process. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-05-23cvsimport: cleanup commit functionJeff King
This change attempts to clean up the commit function to make it a bit easier to read (or at least the first half of it). It also improves robustness and performance. Specifically: - report get_headref errors on opening ref unless the error is ENOENT - use regex to check for sha1 instead of length - use lexically scoped filehandles which get cleaned up automagically - check for error on both 'print' and 'close' (since output is buffered) - avoid "fork, do some perl, then exec" in commit(). It's not necessary, and we probably end up COW'ing parts of the perl process. Plus the code is much smaller because we can use open2() - avoid calling strftime over and over (mainly a readability cleanup) Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2006-05-23cvsimport: use git-update-index --index-infoJeff King
This should reduce the number of git-update-index forks required per commit. We now do adds/removes in one call, and we are no longer forced to deal with argv limitations. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2006-05-23cvsimport: repack every kilo-commits.Linus Torvalds
Signed-off-by: Linus Torvalds <> Acked-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-05-23cvsimport: introduce -L<imit> option to workaround memory leaksMartin Langhoff
Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-05-23cvsimport: replace anonymous sub ref with a normal subMartin Langhoff
commit() does not need to be an anonymous subreference. Keep it simple. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-05-23cvsimport: minor fixupsMartin Langhoff
Cleanup @skipped after it's used. Close a fhandle. Removing suspects one at a time. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-05-18git-cvsimport: Handle "Removed" from pserverElrond
Sometimes the pserver says "Removed" instead of "Remove-entry". Signed-off-by: Elrond <> Signed-off-by: Junio C Hamano <>
2006-04-05cvsimport: use git-update-ref when updatingJohannes Schindelin
This simplifies code, and also fixes a subtle bug: when importing in a shared repository, where another user last imported from CVS, cvsimport used to complain that it could not open <branch> for update. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2006-03-18cvsimport: fix reading from rev-parseJunio C Hamano
The updated code reads the tip of the current branch before and after the import runs, but forgot to chomp what we read from the command. The read-tree command did not them with the trailing LF. Signed-off-by: Junio C Hamano <>
2006-03-17cvsimport: honor -i and non -i upon subsequent importsJunio C Hamano
Documentation says -i is "import only", so without it, subsequent import should update the current branch and working tree files in a sensible way. "A sensible way" defined by this commit is "act as if it is a git pull from foreign repository which happens to be CVS not git". So: - If importing into the current branch (note that cvsimport requires the tracking branch is pristine -- you checked out the tracking branch but it is your responsibility not to make your own commits there), fast forward the branch head and match the index and working tree using two-way merge, just like "git pull" does. - If importing into a separate tracking branch, update that branch head, and merge it into your current branch, again, just like "git pull" does. Signed-off-by: Junio C Hamano <>
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 <>