user/sven/git.git/git-cvsimport.perl, branch v1.8.3.3

git-cvsimport: use a lowercase "usage:" string

2013-02-24T21:31:07Z

Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

cvsimport: format commit timestamp ourselves without using strftime

2013-02-09T22:41:49Z

Some implementations of strftime(3) lack support for "%z". Also there is no need for %s in git-cvsimport as the supplied time is already in seconds since the epoch. For %z, use the function get_tz_offset provided by Git.pm instead. Signed-off-by: Ben Walton Signed-off-by: Junio C Hamano

cvsimport: work around perl tzset issue

2012-11-04T13:02:41Z

On many platforms, the first invocation of localtime_r will check $TZ in the environment, but subsequent invocations will use a cached value. That means that setting $ENV{TZ} in the middle of the program may or may not have an effect on later calls to localtime. Perl 5.10.0 and later handles this automatically for us, but we try to remain portable back to 5.8. Work around it by calling tzset ourselves.

git-cvsimport: allow author-specific timezones

2012-10-17T05:23:18Z

CVS patchsets are imported with timestamps having an offset of +0000 (UTC). The cvs-authors file is already used to translate the CVS username to full name and email in the corresponding commit. Extend this file to support an optional timezone for calculating a user- specific timestamp offset. Signed-off-by: Chris Rorvick Signed-off-by: Junio C Hamano

cvsimport: strip all inappropriate tag strings

2012-09-06T17:40:09Z

Certain characters such as "?" can be present in a CVS tag name, but git does not allow these characters in tags. If git-cvsimport encounters a CVS tag that git cannot handle, cvsimport will error and refuse to continue the import beyond that point. When importing CVS tags, strip all the inappropriate strings from the tag names as we translate them to git tag names. Provide more debugging information to the user if we've altered the tag and the "git tag" command still fails. Also, warn the user if we end up skipping an (unusable) tag altogether. Signed-off-by: Ken Dreyer Signed-off-by: Junio C Hamano

Merge branch 'gr/cvsimport-alternative-cvspass-location'

2011-05-06T17:52:12Z

* gr/cvsimport-alternative-cvspass-location: Look for password in both CVS and CVSNT password files.

Look for password in both CVS and CVSNT password files.

2011-05-01T18:42:59Z

In conn, if password is not passed on command line, look for a password entry in both the CVS password file and the CVSNT password file. If only one file is found and the requested repository is in that file, or if both files are found but the requested repository is found in only one file, use the password from the single file containing the repository entry. If both files are found and the requested repository is found in both files, then produce an error message. The CVS password file separates tokens with a space character, while the CVSNT password file separates tokens with an equal (=) character. Add a sub find_password_entry that accepts the password file name and a delimiter to eliminate code duplication. Signed-off-by: Guy Rouillier Signed-off-by: Junio C Hamano

git-cvsimport.perl: Bail out right away when reading from the server fails

2011-02-27T10:13:21Z

If the CVS server is down, this reduced the git-cvsimport output from: ssh: connect to host ijbswa.cvs.sourceforge.net port 22: Connection refused Use of uninitialized value $rep in scalar chomp at /usr/local/libexec/git-core/git-cvsimport line 369. Use of uninitialized value $rep in substitution (s///) at /usr/local/libexec/git-core/git-cvsimport line 370. Expected Valid-requests from server, but got: to the less noisy: ssh: connect to host ijbswa.cvs.sourceforge.net port 22: Connection refused Failed to read from server at /usr/local/libexec/git-core/git-cvsimport line 370. In this case a silent exit() instead of the die() would probably do, but I assume that there could be cases where the connection attempt succeeds, but reading from the server fails for other reasons. Signed-off-by: Fabian Keil Signed-off-by: Junio C Hamano

Merge branch 'mg/cvsimport'

2011-01-05T21:30:29Z

* mg/cvsimport: cvsimport: handle the parsing of uppercase config options cvsimport: partial whitespace cleanup

cvsimport: handle the parsing of uppercase config options

2011-01-04T21:31:03Z

The current code leads to fatal: bad config value for 'cvsimport.r' in .git/config for a standard use case with cvsimport.r set. cvsimport sets internal variables by checking the config for each possible command line option. The problem is that config items are case insensitive, so config.r and config.R are the same. The ugly error is due to that fact that cvsimport expects a bool for -R (and thus config.R) but a remote name for -r (and thus config.r). Fix this by making cvsimport expect long names for uppercase options. config options for cvsimport have been undocumented so far, though present in the code and advertised in several tutorials. So one may read "enhance" for "fix". Similarly, the names for the options are "documented" in the code, waitiing for their lowercase equivalents to be transformed into long config options, as well. Helped-by: Junio C Hamano Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano