From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?C=C3=A9lestin=20Matte?= Subject: [PATCH v3 10/28] git-remote-mediawiki: Change separator of some regexps Date: Mon, 10 Jun 2013 00:22:35 +0200 Message-ID: <1370816573-3808-11-git-send-email-celestin.matte@ensimag.fr> References: <1370816573-3808-1-git-send-email-celestin.matte@ensimag.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: benoit.person@ensimag.fr, matthieu.moy@grenoble-inp.fr, =?UTF-8?q?C=C3=A9lestin=20Matte?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Jun 10 00:23:59 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ulo1k-0000od-JQ for gcvg-git-2@plane.gmane.org; Mon, 10 Jun 2013 00:23:56 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751931Ab3FIWXq convert rfc822-to-quoted-printable (ORCPT ); Sun, 9 Jun 2013 18:23:46 -0400 Received: from mx1.imag.fr ([129.88.30.5]:37791 "EHLO shiva.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751899Ab3FIWXp (ORCPT ); Sun, 9 Jun 2013 18:23:45 -0400 Received: from ensimag.imag.fr (ensimag.imag.fr [195.221.228.12]) by shiva.imag.fr (8.13.8/8.13.8) with ESMTP id r59MNdO4010956 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 10 Jun 2013 00:23:39 +0200 Received: from ensibm.imag.fr (ensibm.imag.fr [195.221.228.8]) by ensimag.imag.fr (8.13.8/8.13.8/ImagV2.1.r_ens) with ESMTP id r59MNf5Y019455; Mon, 10 Jun 2013 00:23:41 +0200 Received: from tohwi-K50IE.imag.fr (ensibm [195.221.228.8]) by ensibm.imag.fr (8.13.8/8.13.8/ImagV2.1.sb_ens.pm) with ESMTP id r59MNSHX008599; Mon, 10 Jun 2013 00:23:41 +0200 X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1370816573-3808-1-git-send-email-celestin.matte@ensimag.fr> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (shiva.imag.fr [129.88.30.5]); Mon, 10 Jun 2013 00:23:39 +0200 (CEST) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: r59MNdO4010956 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: celestin.matte@ensimag.fr MailScanner-NULL-Check: 1371421421.50895@kPbC/CC1rnuEmlcfvXvEmg Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Use {}{} instead of /// when slashes are used inside the regexp so as n= ot to escape it. Signed-off-by: C=C3=A9lestin Matte Signed-off-by: Matthieu Moy --- 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-t= o-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 =3D ($dumb_push eq "true"); =20 my $wiki_name =3D $url; -$wiki_name =3D~ s/[^\/]*:\/\///; +$wiki_name =3D~ 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 { =20 sub mediawiki_clean_filename { my $filename =3D shift; - $filename =3D~ s/@{[SLASH_REPLACEMENT]}/\//g; + $filename =3D~ 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 { =20 sub mediawiki_smudge_filename { my $filename =3D shift; - $filename =3D~ s/\//@{[SLASH_REPLACEMENT]}/g; + $filename =3D~ s{/}{@{[SLASH_REPLACEMENT]}}g; $filename =3D~ s/ /_/g; # Decode forbidden characters encoded in mediawiki_clean_filename $filename =3D~ s/_%_([0-9a-fA-F][0-9a-fA-F])/sprintf("%c", hex($1))/g= e; --=20 1.7.9.5