undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvsimport: allow for multiple -M options

Browse Source 
Use Getopt::Long instead of Getopt::Std to handle multiple -M options,
for all the cases when having a single custom regex is not enough.

Signed-off-by: Philippe Bruhat (BooK) <book@cpan.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Philippe Bruhat (BooK 2008-02-28 11:18:22 +01:00 committed by Junio C Hamano
parent fbbbc362ab
commit bc434e829c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
git-cvsimport.perl
View File

@ -15,7 +15,7 @@
use strict; use strict;
use warnings; use warnings;
use Getopt::Std; use Getopt::Long;
use File::Spec; use File::Spec;
use File::Temp qw(tempfile tmpnam); use File::Temp qw(tempfile tmpnam);
use File::Path qw(mkpath); use File::Path qw(mkpath);
@ -29,7 +29,7 @@ use IPC::Open2;
$SIG{'PIPE'}="IGNORE"; $SIG{'PIPE'}="IGNORE";
$ENV{'TZ'}="UTC"; $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, $opt_r); 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, $opt_r);
my (%conv_author_name, %conv_author_email); my (%conv_author_name, %conv_author_email);
sub usage(;$) { sub usage(;$) {
@ -112,7 +112,12 @@ sub read_repo_config {
my $opts = "haivmkuo:d:p:r:C:z:s:M:P:A:S:L:"; my $opts = "haivmkuo:d:p:r:C:z:s:M:P:A:S:L:";
read_repo_config($opts); read_repo_config($opts);
getopts($opts) or usage(); Getopt::Long::Configure( 'no_ignore_case', 'bundling' );
# turn the Getopt::Std specification in a Getopt::Long one,
# with support for multiple -M options
GetOptions( map { s/:/=s/; /M/ ? "$_\@" : $_ } split( /(?!:)/, $opts ) )
or usage();
usage if $opt_h; usage if $opt_h;
if (@ARGV == 0) { if (@ARGV == 0) {
@ -166,8 +171,8 @@ our @mergerx = ();
if ($opt_m) { if ($opt_m) {
@mergerx = ( qr/\b(?:from|of|merge|merging|merged) ([-\w]+)/i ); @mergerx = ( qr/\b(?:from|of|merge|merging|merged) ([-\w]+)/i );
} }
if ($opt_M) { if (@opt_M) {
push (@mergerx, qr/$opt_M/); push (@mergerx, map { qr/$_/ } @opt_M);
} }
# Remember UTC of our starting time # Remember UTC of our starting time