Seb35 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118263
Change subject: Convert read_wfMsgCalls.py to Git
......................................................................
Convert read_wfMsgCalls.py to Git
* Blacklist .git directories
* Convert 'phase3' directory to 'core'
* Handle better the paths, particularly those of optional extensions
Bug: 43777
Change-Id: I620b97431f228a10d21501b1ec849984a3209240
---
M read_wfMsgCalls.py
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/code-utils
refs/changes/63/118263/1
diff --git a/read_wfMsgCalls.py b/read_wfMsgCalls.py
index 5f546fb..2944ee4 100755
--- a/read_wfMsgCalls.py
+++ b/read_wfMsgCalls.py
@@ -48,7 +48,7 @@
# BASE PARAMETERS
# Folder containing a tree of MediaWiki
-baseFolder = "mediawiki/trunk/phase3"
+baseFolder = "../.."
# Name of the CSV result file (in the current folder) containing the calls to
# the functions wfMsg* (specified thereafter in a parameter) obtained by
@@ -70,7 +70,7 @@
# MESSAGES FOLDERS AND FILES
# Folders (let the # to include messagesIndividualFiles)
-messagesFolders = { 'phase3': [ 'languages/messages' ], 'extensions': [ ],
'#': '#' }
+messagesFolders = { 'core': [ 'core/languages/messages' ], 'extensions': [ ],
'#': '#' }
# Exclude these files
messagesExcludeFiles = []
@@ -83,14 +83,14 @@
# CODE FOLDERS AND FILES
# Folders (let the # to include codeIndividualFiles)
-codeFolders = [ "includes", "extensions", "skins", "languages/classes", "#" ]
+codeFolders = [ "core/includes", "core/extensions", "core/skins",
"core/languages/classes", "#" ]
# Exclude these files
codeExcludeFiles = []
# Include these files (must not be in the previous folders else it would be
# duplicated)
-codeIndividualFiles = [ "languages/Language.php",
"languages/LanguageConverter.php", "languages/Names.php",
"resources/Resources.php" ]
+codeIndividualFiles = [ "core/languages/Language.php",
"core/languages/LanguageConverter.php", "core/languages/Names.php",
"core/resources/Resources.php" ]
# # # # # # # # # # # #
@@ -116,7 +116,7 @@
for directory in messagesFolders[messagesFolderType]:
l = os.walk( directory )
for j in l:
- if '.svn' in j[0]:
+ if '.svn' in j[0] or '.git' in j[0]:
continue
directories.append( j[0] )
messagesFolders[messagesFolderType] = directories
@@ -140,13 +140,13 @@
if filename in messagesExcludeFiles:
continue
- if messagesFolderType == 'phase3' and filename[:8] ==
'Messages':
+ if messagesFolderType == 'core' and filename[:8] ==
'Messages':
lang = filename[8:-4]
# Read the PHP $messages variable
p = subprocess.Popen( 'php', shell=True,
stdin=subprocess.PIPE, stdout=subprocess.PIPE, close_fds=True )
print >>p.stdin, '<?php'
- print >>p.stdin, "require( '" + os.path.join(
'includes', 'Defines.php' ) + "' );"
+ print >>p.stdin, "require( '" + os.path.join( 'core',
'includes', 'Defines.php' ) + "' );"
print >>p.stdin, "require( '" + os.path.join(
messagesFolder, filename ) + "' );"
print >>p.stdin, """
if( isset( $messages ) && is_array( $messages )
&& count( $messages ) > 0 ) {
@@ -166,7 +166,7 @@
messages = str.splitlines( p.stdout.read() )
if len(messages) == 0:
- if messagesFolderType == 'phase3' and
filename[:8] == 'Messages':
+ if messagesFolderType == 'core' and
filename[:8] == 'Messages':
print 'Core language ' + lang + '
doesn’t have a $message variable in ' + filename + ' or is empty.'
else:
print 'File ' + filename + ' doesn’t
have a $message variable or is empty.'
@@ -216,7 +216,7 @@
for directory in directories:
if folder != '#':
- if '.svn' in directory[0]:
+ if '.svn' in directory[0] or '.git' in directory[0]:
continue
fileset = directory[2]
direct = directory[0]
--
To view, visit https://gerrit.wikimedia.org/r/118263
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I620b97431f228a10d21501b1ec849984a3209240
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/code-utils
Gerrit-Branch: master
Gerrit-Owner: Seb35 <seb35wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
