From: "Célestin Matte" <celestin.matte@ensimag.fr>
To: git@vger.kernel.org
Cc: benoit.person@ensimag.fr, matthieu.moy@grenoble-inp.fr,
"Célestin Matte" <celestin.matte@ensimag.fr>
Subject: [PATCH v4 10/31] git-remote-mediawiki: Change separator of some regexps
Date: Wed, 12 Jun 2013 00:18:01 +0200 [thread overview]
Message-ID: <1370989102-24942-11-git-send-email-celestin.matte@ensimag.fr> (raw)
In-Reply-To: <1370989102-24942-1-git-send-email-celestin.matte@ensimag.fr>
Use {}{} instead of /// when slashes are used inside the regexp so as not to
escape it.
Signed-off-by: Célestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
---
contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
index 7537305..b01d402 100755
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -120,7 +120,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:password@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@HTTPUser@host.com
@@ -564,7 +564,7 @@ sub mediawiki_smudge {
sub mediawiki_clean_filename {
my $filename = shift;
- $filename =~ s/@{[SLASH_REPLACEMENT]}/\//g;
+ $filename =~ s{@{[SLASH_REPLACEMENT]}}{/}g;
# [, ], |, {, and } are forbidden by MediaWiki, even URL-encoded.
# Do a variant of URL-encoding, i.e. looks like URL-encoding,
# but with _ added to prevent MediaWiki from thinking this is
@@ -578,7 +578,7 @@ sub mediawiki_clean_filename {
sub mediawiki_smudge_filename {
my $filename = shift;
- $filename =~ s/\//@{[SLASH_REPLACEMENT]}/g;
+ $filename =~ s{/}{@{[SLASH_REPLACEMENT]}}g;
$filename =~ s/ /_/g;
# Decode forbidden characters encoded in mediawiki_clean_filename
$filename =~ s/_%_([0-9a-fA-F][0-9a-fA-F])/sprintf("%c", hex($1))/ge;
--
1.7.9.5
next prev parent reply other threads:[~2013-06-11 22:20 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-11 22:17 [PATCH v4 00/31] git-remote-mediawiki: Follow perlcritic's recommandations Célestin Matte
2013-06-11 22:17 ` [PATCH v4 01/31] git-remote-mediawiki: Make a regexp clearer Célestin Matte
2013-06-11 22:17 ` [PATCH v4 02/31] git-remote-mediawiki: Move "use warnings;" before any instruction Célestin Matte
2013-06-11 22:17 ` [PATCH v4 03/31] git-remote-mediawiki: Replace :utf8 by :encoding(UTF-8) Célestin Matte
2013-06-11 22:17 ` [PATCH v4 04/31] git-remote-mediawiki: Always end a subroutine with a return Célestin Matte
2013-06-11 22:17 ` [PATCH v4 05/31] git-remote-mediawiki: Move a variable declaration at the top of the code Célestin Matte
2013-06-11 22:17 ` [PATCH v4 06/31] git-remote-mediawiki: Change syntax of map calls Célestin Matte
2013-06-11 22:17 ` [PATCH v4 07/31] git-remote-mediawiki: Rewrite unclear line of instructions Célestin Matte
2013-06-11 22:17 ` [PATCH v4 08/31] git-remote-mediawiki: Remove useless regexp modifier (m) Célestin Matte
2013-06-11 22:18 ` [PATCH v4 09/31] git-remote-mediawiki: Change the behaviour of a split Célestin Matte
2013-06-12 1:54 ` Eric Sunshine
2013-06-11 22:18 ` Célestin Matte [this message]
2013-06-11 22:18 ` [PATCH v4 11/31] git-remote-mediawiki: Change style in a regexp Célestin Matte
2013-06-11 22:18 ` [PATCH v4 12/31] " Célestin Matte
2013-06-11 22:18 ` [PATCH v4 13/31] git-remote-mediawiki: Add newline in the end of die() error messages Célestin Matte
2013-06-11 22:18 ` [PATCH v4 14/31] git-remote-mediawiki: Change the name of a variable Célestin Matte
2013-06-11 22:18 ` [PATCH v4 15/31] git-remote-mediawiki: Turn double-negated expressions into simple expressions Célestin Matte
2013-06-11 22:18 ` [PATCH v4 16/31] git-remote-mediawiki: Remove unused variable $entry Célestin Matte
2013-06-11 22:18 ` [PATCH v4 17/31] git-remote-mediawiki: Rename a variable ($last) which has the name of a keyword Célestin Matte
2013-06-11 22:18 ` [PATCH v4 18/31] git-remote-mediawiki: Assign a variable as undef and make proper indentation Célestin Matte
2013-06-11 22:18 ` [PATCH v4 19/31] git-remote-mediawiki: Check return value of open Célestin Matte
2013-06-11 22:18 ` [PATCH v4 20/31] git-remote-mediawiki: remove import of unused open2 Célestin Matte
2013-06-11 22:18 ` [PATCH v4 21/31] git-remote-mediawiki: Put long code into a subroutine Célestin Matte
2013-06-11 22:18 ` [PATCH v4 22/31] git-remote-mediawiki: Modify strings for a better coding-style Célestin Matte
2013-06-11 22:18 ` [PATCH v4 23/31] git-remote-mediawiki: Brace file handles for print for more clarity Célestin Matte
2013-06-11 22:18 ` [PATCH v4 24/31] git-remote-mediawiki: Replace "unless" statements with negated "if" statements Célestin Matte
2013-06-11 22:18 ` [PATCH v4 25/31] git-remote-mediawiki: Don't use quotes for empty strings Célestin Matte
2013-06-11 22:18 ` [PATCH v4 26/31] git-remote-mediawiki: Put non-trivial numeric values in constants Célestin Matte
2013-06-11 22:18 ` [PATCH v4 27/31] git-remote-mediawiki: Fix a typo ("mediwiki" instead of "mediawiki") Célestin Matte
2013-06-11 22:18 ` [PATCH v4 28/31] git-remote-mediawiki: Clearly rewrite double dereference Célestin Matte
2013-06-11 22:18 ` [PATCH v4 29/31] git-remote-mediawiki: Add a .perlcriticrc file Célestin Matte
2013-06-12 2:02 ` Eric Sunshine
2013-06-11 22:18 ` [PATCH v4 30/31] git-remote-mediawiki: add a perlcritic rule in Makefile Célestin Matte
2013-06-11 22:18 ` [PATCH v4 31/31] git-remote-mediawiki: Make error message more precise Célestin Matte
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=1370989102-24942-11-git-send-email-celestin.matte@ensimag.fr \
--to=celestin.matte@ensimag.fr \
--cc=benoit.person@ensimag.fr \
--cc=git@vger.kernel.org \
--cc=matthieu.moy@grenoble-inp.fr \
/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).