git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v2 02/22] git-remote-mediawiki: Use the Readonly module instead of the constant pragma
Date: Fri,  7 Jun 2013 23:42:03 +0200	[thread overview]
Message-ID: <1370641344-4253-3-git-send-email-celestin.matte@ensimag.fr> (raw)
In-Reply-To: <1370641344-4253-1-git-send-email-celestin.matte@ensimag.fr>

Follow ValuesAndExpressions::ProhibitConstantPragma

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 |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
index 4893442..e60793a 100755
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -26,21 +26,21 @@ use IPC::Open2;
 use Readonly;
 
 # Mediawiki filenames can contain forward slashes. This variable decides by which pattern they should be replaced
-use constant SLASH_REPLACEMENT => "%2F";
+Readonly my $SLASH_REPLACEMENT => "%2F";
 
 # It's not always possible to delete pages (may require some
 # privileges). Deleted pages are replaced with this content.
-use constant DELETED_CONTENT => "[[Category:Deleted]]\n";
+Readonly my $DELETED_CONTENT => "[[Category:Deleted]]\n";
 
 # It's not possible to create empty pages. New empty files in Git are
 # sent with this content instead.
-use constant EMPTY_CONTENT => "<!-- empty page -->\n";
+Readonly my $EMPTY_CONTENT => "<!-- empty page -->\n";
 
 # used to reflect file creation or deletion in diff.
-use constant NULL_SHA1 => "0000000000000000000000000000000000000000";
+Readonly my $NULL_SHA1 => "0000000000000000000000000000000000000000";
 
 # Used on Git's side to reflect empty edit messages on the wiki
-use constant EMPTY_MESSAGE => '*Empty MediaWiki Message*';
+Readonly my $EMPTY_MESSAGE => '*Empty MediaWiki Message*';
 
 if (@ARGV != 2) {
 	exit_error_usage();
@@ -538,7 +538,7 @@ sub mediawiki_clean {
 	$string =~ s/\s+$//;
 	if ($string eq "" && $page_created) {
 		# Creating empty pages is forbidden.
-		$string = EMPTY_CONTENT;
+		$string = $EMPTY_CONTENT;
 	}
 	return $string."\n";
 }
@@ -546,7 +546,7 @@ sub mediawiki_clean {
 # Filter applied on MediaWiki data before adding them to Git
 sub mediawiki_smudge {
 	my $string = shift;
-	if ($string eq EMPTY_CONTENT) {
+	if ($string eq $EMPTY_CONTENT) {
 		$string = "";
 	}
 	# This \n is important. This is due to mediawiki's way to handle end of files.
@@ -707,7 +707,7 @@ sub import_file_revision {
 	if (!$full_import && $n == 1) {
 		print STDOUT "from refs/mediawiki/$remotename/master^0\n";
 	}
-	if ($content ne DELETED_CONTENT) {
+	if ($content ne $DELETED_CONTENT) {
 		print STDOUT "M 644 inline " .
 		    fe_escape_path($title . ".mw") . "\n";
 		literal_data($content);
@@ -888,7 +888,7 @@ sub mw_import_revids {
 
 		my %commit;
 		$commit{author} = $rev->{user} || 'Anonymous';
-		$commit{comment} = $rev->{comment} || EMPTY_MESSAGE;
+		$commit{comment} = $rev->{comment} || $EMPTY_MESSAGE;
 		$commit{title} = mediawiki_smudge_filename($page_title);
 		$commit{mw_revision} = $rev->{revid};
 		$commit{content} = mediawiki_smudge($rev->{'*'});
@@ -1006,14 +1006,14 @@ sub mw_push_file {
 	my $oldrevid = shift;
 	my $newrevid;
 
-	if ($summary eq EMPTY_MESSAGE) {
+	if ($summary eq $EMPTY_MESSAGE) {
 		$summary = '';
 	}
 
 	my $new_sha1 = $diff_info_split[3];
 	my $old_sha1 = $diff_info_split[2];
-	my $page_created = ($old_sha1 eq NULL_SHA1);
-	my $page_deleted = ($new_sha1 eq NULL_SHA1);
+	my $page_created = ($old_sha1 eq $NULL_SHA1);
+	my $page_deleted = ($new_sha1 eq $NULL_SHA1);
 	$complete_file_name = mediawiki_clean_filename($complete_file_name);
 
 	my ($title, $extension) = $complete_file_name =~ /^(.*)\.([^\.]*)$/;
@@ -1032,7 +1032,7 @@ sub mw_push_file {
 			# special privileges. A common
 			# convention is to replace the page
 			# with this content instead:
-			$file_content = DELETED_CONTENT;
+			$file_content = $DELETED_CONTENT;
 		} else {
 			$file_content = run_git("cat-file blob $new_sha1");
 		}
-- 
1.7.9.5

  parent reply	other threads:[~2013-06-07 21:44 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-07 21:42 [PATCH v2 00/22] git-remote-mediawiki: Follow perlcritic's recommandations Célestin Matte
2013-06-07 21:42 ` [PATCH v2 01/22] git-remote-mediawiki: Replace :utf8 by :encoding(UTF-8) Célestin Matte
2013-06-07 21:42 ` Célestin Matte [this message]
2013-06-08  3:23   ` [PATCH v2 02/22] git-remote-mediawiki: Use the Readonly module instead of the constant pragma Jeff King
2013-06-08  8:51     ` Benoît Person
2013-06-08 13:01     ` Célestin Perdu
2013-06-08 17:31       ` Jeff King
2013-06-08 18:27         ` Matthieu Moy
2013-06-07 21:42 ` [PATCH v2 03/22] git-remote-mediawiki: Always end a subroutine with a return Célestin Matte
2013-06-07 21:42 ` [PATCH v2 04/22] git-remote-mediawiki: Move a variable declaration at the top of the code Célestin Matte
2013-06-07 21:42 ` [PATCH v2 05/22] git-remote-mediawiki: Change syntax of map calls Célestin Matte
2013-06-07 21:42 ` [PATCH v2 06/22] git-remote-mediawiki: Rewrite unclear line of instructions Célestin Matte
2013-06-07 21:42 ` [PATCH v2 07/22] git-remote-mediawiki: Change style of some regular expressions Célestin Matte
2013-06-08  0:12   ` Eric Sunshine
2013-06-07 21:42 ` [PATCH v2 08/22] git-remote-mediawiki: Add newline in the end of die() error messages Célestin Matte
2013-06-07 21:42 ` [PATCH v2 09/22] git-remote-mediawiki: Change the name of a variable Célestin Matte
2013-06-07 21:42 ` [PATCH v2 10/22] git-remote-mediawiki: Turn double-negated expressions into simple expressions Célestin Matte
2013-06-07 21:42 ` [PATCH v2 11/22] git-remote-mediawiki: Remove unused variable $entry Célestin Matte
2013-06-07 21:42 ` [PATCH v2 12/22] git-remote-mediawiki: Rename a variable ($last) which has the name of a keyword Célestin Matte
2013-06-07 21:42 ` [PATCH v2 13/22] git-remote-mediawiki: Assign a variable as undef and make proper indentation Célestin Matte
2013-06-07 21:42 ` [PATCH v2 14/22] git-remote-mediawiki: Check return value of open + remove import of unused open2 Célestin Matte
2013-06-08  0:14   ` Eric Sunshine
2013-06-08 15:54     ` Célestin Matte
2013-06-08 18:41       ` Matthieu Moy
2013-06-08 18:45         ` Célestin Matte
2013-06-08 19:04           ` Matthieu Moy
2013-06-09  4:52           ` Eric Sunshine
2013-06-07 21:42 ` [PATCH v2 15/22] git-remote-mediawiki: Put long code into a subroutine Célestin Matte
2013-06-08  0:27   ` Eric Sunshine
2013-06-07 21:42 ` [PATCH v2 16/22] git-remote-mediawiki: Modify strings for a better coding-style Célestin Matte
2013-06-08  0:39   ` Eric Sunshine
2013-06-08 20:32     ` Célestin Matte
2013-06-09  4:44       ` Eric Sunshine
2013-06-07 21:42 ` [PATCH v2 17/22] git-remote-mediawiki: Brace file handles for print for more clarity Célestin Matte
2013-06-08  0:42   ` Eric Sunshine
2013-06-07 21:42 ` [PATCH v2 18/22] git-remote-mediawiki: Replace "unless" statements with negated "if" statements Célestin Matte
2013-06-07 21:42 ` [PATCH v2 19/22] git-remote-mediawiki: Don't use quotes for empty strings Célestin Matte
2013-06-07 21:42 ` [PATCH v2 20/22] git-remote-mediawiki: Put non-trivial numeric values in constants Célestin Matte
2013-06-07 21:42 ` [PATCH v2 21/22] git-remote-mediawiki: Fix a typo ("mediwiki" instead of "mediawiki") Célestin Matte
2013-06-07 21:42 ` [PATCH v2 22/22] git-remote-mediawiki: Clearly rewrite double dereference Célestin Matte
2013-06-07 23:34   ` Eric Sunshine

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1370641344-4253-3-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.
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 NNTP newsgroup(s).