Follow ValuesAndExpressions::ProhibitConstantPragma

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 |   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

--
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

Reply via email to