H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-03-15 10:31:28 +00:00
Code Releases Activity

cvsimport: Improve usage error reporting

Browse Source 
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>
This commit is contained in:
Frank Lichtenheld 2007-04-06 23:52:41 +02:00 committed by Junio C Hamano
parent 407049c59e
commit 7bf77644e7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-cvsimport.perl
View File

@ -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); 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); my (%conv_author_name, %conv_author_email);
sub usage() { sub usage(;$) {
my $msg = shift;
print(STDERR "Error: $msg\n") if $msg;
print STDERR <<END; print STDERR <<END;
Usage: ${\basename $0} # fetch/update GIT from CVS Usage: ${\basename $0} # fetch/update GIT from CVS
[-o branch-for-HEAD] [-h] [-v] [-d CVSROOT] [-A author-conv-file] [-o branch-for-HEAD] [-h] [-v] [-d CVSROOT] [-A author-conv-file]
@ -117,7 +119,7 @@ read_repo_config($opts);
getopts($opts) or usage(); getopts($opts) or usage();
usage if $opt_h; usage if $opt_h;
@ARGV <= 1 or usage(); @ARGV <= 1 or usage("You can't specify more than one CVS module");
if ($opt_d) { if ($opt_d) {
$ENV{"CVSROOT"} = $opt_d; $ENV{"CVSROOT"} = $opt_d;
@ -130,7 +132,7 @@ if ($opt_d) {
} elsif ($ENV{"CVSROOT"}) { } elsif ($ENV{"CVSROOT"}) {
$opt_d = $ENV{"CVSROOT"}; $opt_d = $ENV{"CVSROOT"};
} else { } else {
die "CVSROOT needs to be set"; usage("CVSROOT needs to be set");
} }
$opt_o ||= "origin"; $opt_o ||= "origin";
$opt_s ||= "-"; $opt_s ||= "-";
@ -149,7 +151,7 @@ if ($#ARGV == 0) {
chomp $cvs_tree; chomp $cvs_tree;
close $f; close $f;
} else { } else {
usage(); usage("CVS module has to be specified");
} }
our @mergerx = (); our @mergerx = ();