diff options
| author |  Frank Lichtenheld <frank@lichtenheld.de> | 2007-04-06 23:52:41 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-04-06 16:46:11 -0700 |
| commit | 7bf77644e70d881f407c77e6d65ebe70c90916d6 (patch) | |
| tree | 950e714bf2af5b9a9dbc8455a33cb4e95741d8cd | |
| parent | cvsimport: Improve documentation of CVSROOT and CVS module determination (diff) | |
| download | tgif-7bf77644e70d881f407c77e6d65ebe70c90916d6.tar.xz | |
cvsimport: Improve usage error reporting
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 <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-cvsimport.perl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index d3fbcbc15c..ac74bc51b3 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -32,7 +32,9 @@ $ENV{'TZ'}="UTC"; our ($opt_h,$opt_o,$opt_v,$opt_k,$opt_u,$opt_d,$opt_p,$opt_C,$opt_z,$opt_i,$opt_P, $opt_s,$opt_m,$opt_M,$opt_A,$opt_S,$opt_L, $opt_a); my (%conv_author_name, %conv_author_email); -sub usage() { +sub usage(;$) { + my $msg = shift; + print(STDERR "Error: $msg\n") if $msg; print STDERR <<END; Usage: ${\basename $0} # fetch/update GIT from CVS [-o branch-for-HEAD] [-h] [-v] [-d CVSROOT] [-A author-conv-file] @@ -117,7 +119,7 @@ read_repo_config($opts); getopts($opts) or usage(); usage if $opt_h; -@ARGV <= 1 or usage(); +@ARGV <= 1 or usage("You can't specify more than one CVS module"); if ($opt_d) { $ENV{"CVSROOT"} = $opt_d; @@ -130,7 +132,7 @@ if ($opt_d) { } elsif ($ENV{"CVSROOT"}) { $opt_d = $ENV{"CVSROOT"}; } else { - die "CVSROOT needs to be set"; + usage("CVSROOT needs to be set"); } $opt_o ||= "origin"; $opt_s ||= "-"; @@ -149,7 +151,7 @@ if ($#ARGV == 0) { chomp $cvs_tree; close $f; } else { - usage(); + usage("CVS module has to be specified"); } our @mergerx = (); |