On Thu, Jun 6, 2013 at 3:34 PM, Célestin Matte <celestin.ma...@ensimag.fr> wrote: > - Remove m modifier when useless (m// and // was used randomly; this makes the > code more coherent) > - Remove stringy split (split('c', ...) instead of split(/c/, ...)) > - Use {}{} instead of /// when slashes or used inside the regexp so as not to > escape it. > > Signed-off-by: Célestin Matte <celestin.ma...@ensimag.fr> > Signed-off-by: Matthieu Moy <matthieu....@grenoble-inp.fr> > --- > contrib/mw-to-git/git-remote-mediawiki.perl | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl > b/contrib/mw-to-git/git-remote-mediawiki.perl > index 83cf292..482cd95 100755 > --- a/contrib/mw-to-git/git-remote-mediawiki.perl > +++ b/contrib/mw-to-git/git-remote-mediawiki.perl > @@ -121,7 +121,7 @@ chomp($dumb_push); > $dumb_push = ($dumb_push eq "true"); > > my $wiki_name = $url; > -$wiki_name =~ s/[^\/]*:\/\///; > +$wiki_name =~ s{[^/]*://}{}; > # If URL is like http://user:passw...@example.com/, we clearly don't > # want the password in $wiki_name. While we're there, also remove user > # and '@' sign, to avoid author like MWUser@httpu...@host.com > @@ -762,7 +762,7 @@ sub get_more_refs { > my @refs; > while (1) { > my $line = <STDIN>; > - if ($line =~ m/^$cmd (.*)$/) { > + if ($line =~ /^$cmd (.*)$/) { > push(@refs, $1); > } elsif ($line eq "\n") { > return @refs; > @@ -1168,11 +1168,11 @@ sub mw_push_revision { > my @local_ancestry = split(/\n/, run_git("rev-list --boundary > --parents $local ^$parsed_sha1")); > my %local_ancestry; > foreach my $line (@local_ancestry) { > - if (my ($child, $parents) = $line =~ m/^-?([a-f0-9]+) > ([a-f0-9 ]+)/) { > - foreach my $parent (split(' ', $parents)) { > + if (my ($child, $parents) = $line =~ /^-?([a-f0-9]+) > ([a-f0-9 ]+)/) { > + foreach my $parent (split(/ /, $parents)) {
This is a behavior-altering change. split(' ',...) is handled as a special case[*1*] which strips leading whitespace and then splits on /\s+/ (run of whitespace). Changing it to split(/ /,...) makes it match only a single space (rather than a run of whitespace). [*1*] http://perldoc.perl.org/functions/split.html > $local_ancestry{$parent} = $child; > } > - } elsif (!$line =~ m/^([a-f0-9]+)/) { > + } elsif (!$line =~ /^([a-f0-9]+)/) { > die "Unexpected output from git rev-list: > $line"; > } > } > @@ -1190,10 +1190,10 @@ sub mw_push_revision { > # history (linearized with --first-parent) > print STDERR "Warning: no common ancestor, pushing complete > history\n"; > my $history = run_git("rev-list --first-parent --children > $local"); > - my @history = split('\n', $history); > + my @history = split(/\n/, $history); > @history = @history[1..$#history]; > foreach my $line (reverse @history) { > - my @commit_info_split = split(/ |\n/, $line); > + my @commit_info_split = split(/[ \n]/, $line); > push(@commit_pairs, \@commit_info_split); > } > } > @@ -1272,7 +1272,7 @@ sub get_mw_namespace_id { > # Look at configuration file, if the record for that > namespace is > # already cached. Namespaces are stored in form: > # "Name_of_namespace:Id_namespace", ex.: "File:6". > - my @temp = split(/[\n]/, run_git("config --get-all remote." > + my @temp = split(/\n/, run_git("config --get-all remote." > . $remotename > .".namespaceCache")); > chomp(@temp); > foreach my $ns (@temp) { > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html