From: "Philippe Bruhat (BooK)" <book@cpan.org>
To: git@vger.kernel.org
Cc: gitster@pobox.com, "Philippe Bruhat (BooK" <book@cpan.org>
Subject: [PATCH] cvsimport: allow for multiple -M options
Date: Thu, 28 Feb 2008 11:18:22 +0100 [thread overview]
Message-ID: <1204193904-3652-3-git-send-email-book@cpan.org> (raw)
In-Reply-To: <1204193904-3652-2-git-send-email-book@cpan.org>
From: Philippe Bruhat (BooK <book@cpan.org>
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.
For example, "merged (\w+)" and "(\w+) merged" can't be easily turned
into a single regular expression capturing the branch name in $1.
---
git-cvsimport.perl | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 3d013a7..f138a01 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -15,7 +15,7 @@
use strict;
use warnings;
-use Getopt::Std;
+use Getopt::Long;
use File::Spec;
use File::Temp qw(tempfile tmpnam);
use File::Path qw(mkpath);
@@ -29,7 +29,7 @@ use IPC::Open2;
$SIG{'PIPE'}="IGNORE";
$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);
sub usage(;$) {
@@ -112,7 +112,12 @@ sub read_repo_config {
my $opts = "haivmkuo:d:p:r:C:z:s:M:P:A:S:L:";
read_repo_config($opts);
-getopts($opts) or usage();
+Getopt::Long::Configure( 'no_ignore_case' );
+
+# 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;
if (@ARGV == 0) {
@@ -166,8 +171,8 @@ our @mergerx = ();
if ($opt_m) {
@mergerx = ( qr/\b(?:from|of|merge|merging|merged) ([-\w]+)/i );
}
-if ($opt_M) {
- push (@mergerx, qr/$opt_M/);
+if (@opt_M) {
+ push (@mergerx, map { qr/$_/ } @opt_M);
}
# Remember UTC of our starting time
--
1.5.4.2.187.gfc276
next prev parent reply other threads:[~2008-02-28 10:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-28 10:18 Multiple -M options for git-cvsimport Philippe Bruhat (BooK)
2008-02-28 10:18 ` [PATCH] cvsimport: have default merge regex allow for dashes in the branch name Philippe Bruhat (BooK)
2008-02-28 10:18 ` Philippe Bruhat (BooK) [this message]
2008-02-28 10:18 ` [PATCH] cvsimport: document that -M can be used multiple times Philippe Bruhat (BooK)
2008-02-28 10:18 ` [PATCH] cvsimport: configure Getopt::Long to bundle options Philippe Bruhat (BooK)
2008-02-28 20:07 ` Multiple -M options for git-cvsimport Junio C Hamano
2008-02-29 10:02 ` Philippe Bruhat (BooK)
2008-03-01 5:59 ` Junio C Hamano
2008-03-01 20:24 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2008-02-21 14:25 [PATCH] cvsimport: allow for multiple -M options Philippe Bruhat (BooK)
2008-02-23 22:51 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1204193904-3652-3-git-send-email-book@cpan.org \
--to=book@cpan.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).