date:20130709

[MediaWiki-commits] [Gerrit] fix. self refs in class methods. - change (analytics/user-metrics)

2013-07-09 Thread Rfaulk (Code Review)

Rfaulk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72687


Change subject: fix. self refs in class methods.
..

fix. self refs in class methods.

Change-Id: I4c5b025edae6b874115d01952692e8d5f64e372a
---
M user_metrics/api/broker.py
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics 
refs/changes/87/72687/1

diff --git a/user_metrics/api/broker.py b/user_metrics/api/broker.py
index d3ae843..411b4b9 100644
--- a/user_metrics/api/broker.py
+++ b/user_metrics/api/broker.py
@@ -11,17 +11,17 @@
 
 class Broker:
 
-def __init__():
+def __init__(self):
 pass
 
-def compose():
+def compose(self):
 pass
 
-def add(target, key, value):
+def add(self, target, key, value):
 pass
 
-def remove(target, key):
+def remove(self, target, key):
 pass
 
-def get(target, key):
+def get(self, target, key):
 pass

-- 
To view, visit https://gerrit.wikimedia.org/r/72687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c5b025edae6b874115d01952692e8d5f64e372a
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: repair_runtime
Gerrit-Owner: Rfaulk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mod/fix. raise exceptions on abstract class method calls/pep8 - change (analytics/user-metrics)

2013-07-09 Thread Rfaulk (Code Review)

Rfaulk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72688


Change subject: mod/fix. raise exceptions on abstract class method calls/pep8
..

mod/fix. raise exceptions on abstract class method calls/pep8

Change-Id: I5b763793cd7b8db0fb17d555c9a81a6720e24285
---
M user_metrics/api/broker.py
1 file changed, 11 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics 
refs/changes/88/72688/1

diff --git a/user_metrics/api/broker.py b/user_metrics/api/broker.py
index 411b4b9..72e97a1 100644
--- a/user_metrics/api/broker.py
+++ b/user_metrics/api/broker.py
@@ -9,19 +9,23 @@
 __date__ = "2013-07-06"
 __license__ = "GPL (version 2 or later)"
 
-class Broker:
 
-def __init__(self):
-pass
+class Broker(object):
+"""
+Base class for broker
+"""
+
+def __init__(self, **kwargs):
+raise NotImplementedError()
 
 def compose(self):
-pass
+raise NotImplementedError()
 
 def add(self, target, key, value):
-pass
+raise NotImplementedError()
 
 def remove(self, target, key):
-pass
+raise NotImplementedError()
 
 def get(self, target, key):
-pass
+raise NotImplementedError()

-- 
To view, visit https://gerrit.wikimedia.org/r/72688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b763793cd7b8db0fb17d555c9a81a6720e24285
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: repair_runtime
Gerrit-Owner: Rfaulk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] fix. self refs in class methods. - change (analytics/user-metrics)

2013-07-09 Thread Rfaulk (Code Review)

Rfaulk has submitted this change and it was merged.

Change subject: fix. self refs in class methods.
..


fix. self refs in class methods.

Change-Id: I4c5b025edae6b874115d01952692e8d5f64e372a
---
M user_metrics/api/broker.py
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Rfaulk: Verified; Looks good to me, approved



diff --git a/user_metrics/api/broker.py b/user_metrics/api/broker.py
index d3ae843..411b4b9 100644
--- a/user_metrics/api/broker.py
+++ b/user_metrics/api/broker.py
@@ -11,17 +11,17 @@
 
 class Broker:
 
-def __init__():
+def __init__(self):
 pass
 
-def compose():
+def compose(self):
 pass
 
-def add(target, key, value):
+def add(self, target, key, value):
 pass
 
-def remove(target, key):
+def remove(self, target, key):
 pass
 
-def get(target, key):
+def get(self, target, key):
 pass

-- 
To view, visit https://gerrit.wikimedia.org/r/72687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c5b025edae6b874115d01952692e8d5f64e372a
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: repair_runtime
Gerrit-Owner: Rfaulk 
Gerrit-Reviewer: Rfaulk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add. FileBroker definition. - change (analytics/user-metrics)

2013-07-09 Thread Rfaulk (Code Review)

Rfaulk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72689


Change subject: add. FileBroker definition.
..

add. FileBroker definition.

Change-Id: I2aa2ef18d590f357baf8285f6a0340b538912254
---
M user_metrics/api/broker.py
1 file changed, 43 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics 
refs/changes/89/72689/1

diff --git a/user_metrics/api/broker.py b/user_metrics/api/broker.py
index 72e97a1..35243d8 100644
--- a/user_metrics/api/broker.py
+++ b/user_metrics/api/broker.py
@@ -10,6 +10,10 @@
 __license__ = "GPL (version 2 or later)"
 
 
+import json
+import os
+
+
 class Broker(object):
 """
 Base class for broker
@@ -22,10 +26,49 @@
 raise NotImplementedError()
 
 def add(self, target, key, value):
+"""
+Add a key/value pair to the broker
+"""
 raise NotImplementedError()
 
 def remove(self, target, key):
+"""
+Remove a key/value pair to the broker
+"""
 raise NotImplementedError()
 
 def get(self, target, key):
+"""
+Retrieve a key/value pair to the broker
+"""
 raise NotImplementedError()
+
+
+class FileBroker(Broker):
+"""
+Implements a broker that uses a flat file as a broker
+"""
+
+def __init__(self, **kwargs):
+super(FileBroker, self).__init__(**kwargs)
+
+def compose(self):
+pass
+
+def add(self, target, key, value):
+"""
+Adds key/value pair
+"""
+if os.path.isfile(target):
+mode = 'a'
+else:
+mode = 'w'
+
+with open(target, mode) as f:
+f.write(json.dumps({key: value}) + '\n')
+
+def remove(self, target, key):
+pass
+
+def get(self, target, key):
+pass

-- 
To view, visit https://gerrit.wikimedia.org/r/72689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2aa2ef18d590f357baf8285f6a0340b538912254
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: repair_runtime
Gerrit-Owner: Rfaulk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mod/fix. raise exceptions on abstract class method calls/pep8 - change (analytics/user-metrics)

2013-07-09 Thread Rfaulk (Code Review)

Rfaulk has submitted this change and it was merged.

Change subject: mod/fix. raise exceptions on abstract class method calls/pep8
..


mod/fix. raise exceptions on abstract class method calls/pep8

Change-Id: I5b763793cd7b8db0fb17d555c9a81a6720e24285
---
M user_metrics/api/broker.py
1 file changed, 11 insertions(+), 7 deletions(-)

Approvals:
  Rfaulk: Verified; Looks good to me, approved



diff --git a/user_metrics/api/broker.py b/user_metrics/api/broker.py
index 411b4b9..72e97a1 100644
--- a/user_metrics/api/broker.py
+++ b/user_metrics/api/broker.py
@@ -9,19 +9,23 @@
 __date__ = "2013-07-06"
 __license__ = "GPL (version 2 or later)"
 
-class Broker:
 
-def __init__(self):
-pass
+class Broker(object):
+"""
+Base class for broker
+"""
+
+def __init__(self, **kwargs):
+raise NotImplementedError()
 
 def compose(self):
-pass
+raise NotImplementedError()
 
 def add(self, target, key, value):
-pass
+raise NotImplementedError()
 
 def remove(self, target, key):
-pass
+raise NotImplementedError()
 
 def get(self, target, key):
-pass
+raise NotImplementedError()

-- 
To view, visit https://gerrit.wikimedia.org/r/72688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b763793cd7b8db0fb17d555c9a81a6720e24285
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: repair_runtime
Gerrit-Owner: Rfaulk 
Gerrit-Reviewer: Rfaulk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add. FileBroker definition. - change (analytics/user-metrics)

2013-07-09 Thread Rfaulk (Code Review)

Rfaulk has submitted this change and it was merged.

Change subject: add. FileBroker definition.
..


add. FileBroker definition.

Change-Id: I2aa2ef18d590f357baf8285f6a0340b538912254
---
M user_metrics/api/broker.py
1 file changed, 43 insertions(+), 0 deletions(-)

Approvals:
  Rfaulk: Verified; Looks good to me, approved



diff --git a/user_metrics/api/broker.py b/user_metrics/api/broker.py
index 72e97a1..35243d8 100644
--- a/user_metrics/api/broker.py
+++ b/user_metrics/api/broker.py
@@ -10,6 +10,10 @@
 __license__ = "GPL (version 2 or later)"
 
 
+import json
+import os
+
+
 class Broker(object):
 """
 Base class for broker
@@ -22,10 +26,49 @@
 raise NotImplementedError()
 
 def add(self, target, key, value):
+"""
+Add a key/value pair to the broker
+"""
 raise NotImplementedError()
 
 def remove(self, target, key):
+"""
+Remove a key/value pair to the broker
+"""
 raise NotImplementedError()
 
 def get(self, target, key):
+"""
+Retrieve a key/value pair to the broker
+"""
 raise NotImplementedError()
+
+
+class FileBroker(Broker):
+"""
+Implements a broker that uses a flat file as a broker
+"""
+
+def __init__(self, **kwargs):
+super(FileBroker, self).__init__(**kwargs)
+
+def compose(self):
+pass
+
+def add(self, target, key, value):
+"""
+Adds key/value pair
+"""
+if os.path.isfile(target):
+mode = 'a'
+else:
+mode = 'w'
+
+with open(target, mode) as f:
+f.write(json.dumps({key: value}) + '\n')
+
+def remove(self, target, key):
+pass
+
+def get(self, target, key):
+pass

-- 
To view, visit https://gerrit.wikimedia.org/r/72689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2aa2ef18d590f357baf8285f6a0340b538912254
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: repair_runtime
Gerrit-Owner: Rfaulk 
Gerrit-Reviewer: Rfaulk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Disable default web font for language code "ml" - change (mediawiki...UniversalLanguageSelector)

2013-07-09 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72690


Change subject: Disable default web font for language code "ml"
..

Disable default web font for language code "ml"

Bug: 49894
Change-Id: I33c08203f19688ffdf00e7ca3da23a9dd1fb05aa
---
M data/fontrepo/fonts/Meera/font.ini
M resources/js/ext.uls.webfonts.repository.js
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/90/72690/1

diff --git a/data/fontrepo/fonts/Meera/font.ini 
b/data/fontrepo/fonts/Meera/font.ini
index d33ae15..cf9255b 100644
--- a/data/fontrepo/fonts/Meera/font.ini
+++ b/data/fontrepo/fonts/Meera/font.ini
@@ -1,5 +1,5 @@
 [Meera]
-languages=ml*
+languages=ml
 version=5.0.1
 license=GPL 3+ with exceptions
 licensefile=gpl-3.0.txt
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index 751e1f5..1229103 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -1,5 +1,5 @@
 // Please do not edit. This file is generated from data/fontrepo by 
data/fontrepo/scripts/compile.php
 ( function ( $ ) {
$.webfonts = $.webfonts || {};
-   $.webfonts.repository = 
{"base":"..\/data\/fontrepo\/fonts\/","languages":{"af":["system","OpenDyslexic"],"ahr":["Lohit
 
Marathi"],"akk":["Akkadian"],"am":["AbyssinicaSIL"],"ar":["Amiri"],"arb":["Amiri"],"arc":["Estarngelo
 Edessa","East Syriac Adiabene","SertoUrhoy"],"as":["system","Lohit 
Assamese"],"bh":["Lohit Devanagari"],"bho":["Lohit 
Devanagari"],"bk":["system","OpenDyslexic"],"bn":["Siyam Rupali","Lohit 
Bengali"],"bo":["Jomolhari"],"bpy":["Siyam Rupali","Lohit 
Bengali"],"bug":["Saweri"],"ca":["system","OpenDyslexic"],"cdo":["CharisSIL"],"cy":["system","OpenDyslexic"],"da":["system","OpenDyslexic"],"de":["system","OpenDyslexic"],"dv":["FreeFont-Thaana"],"dz":["Jomolhari"],"en":["system","OpenDyslexic"],"es":["system","OpenDyslexic"],"et":["system","OpenDyslexic"],"fa":["system","Iranian
 
Sans","Amiri"],"fi":["system","OpenDyslexic"],"fo":["system","OpenDyslexic"],"fr":["system","OpenDyslexic"],"fy":["system","OpenDyslexic"],"ga":["system","OpenDyslexic"],"gd":["system","OpenDyslexic"],"gl":["system","OpenDyslexic"],"gom":["Lohit
 Devanagari"],"gu":["Lohit Gujarati"],"hbo":["Taamey Frank 
CLM","Alef"],"he":["system","Alef","Miriam CLM","Taamey Frank 
CLM"],"hi":["Lohit 
Devanagari"],"hu":["system","OpenDyslexic"],"id":["system","OpenDyslexic"],"is":["system","OpenDyslexic"],"it":["system","OpenDyslexic"],"jv":["system","Tuladha
 Jejeg"],"jv-java":["Tuladha 
Jejeg"],"km":["KhmerOSbattambang","KhmerOS","KhmerOSbokor","KhmerOSfasthand","KhmerOSfreehand","KhmerOSmuol","KhmerOSmuollight","KhmerOSmuolpali","KhmerOSsiemreap"],"kn":["Lohit
 Kannada","Gubbi"],"kok":["Lohit 
Devanagari"],"lb":["system","OpenDyslexic"],"li":["system","OpenDyslexic"],"mai":["Lohit
 
Devanagari"],"mak":["Saweri"],"mi":["system","OpenDyslexic"],"ml":["Meera","AnjaliOldLipi"],"mr":["Lohit
 
Marathi"],"ms":["system","OpenDyslexic"],"my":["TharLon","Myanmar3","Padauk"],"nan":["Doulos
 SIL","CharisSIL"],"nb":["system","OpenDyslexic"],"ne":["Lohit 
Nepali","Madan"],"nl":["system","OpenDyslexic"],"oc":["system","OpenDyslexic"],"or":["Lohit
 Oriya","Utkal"],"pa":["Lohit 
Punjabi","Saab"],"pt":["system","OpenDyslexic"],"sa":["Lohit 
Devanagari"],"saz":["Pagul"],"sq":["system","OpenDyslexic"],"sux":["Akkadian"],"sv":["system","OpenDyslexic"],"sw":["system","OpenDyslexic"],"syc":["Estarngelo
 Edessa","East Syriac Adiabene","SertoUrhoy"],"ta":["system","Lohit 
Tamil","Lohit Tamil Classical","Thendral","Thenee"],"tcy":["Lohit 
Kannada","Gubbi"],"te":["Lohit 
Telugu"],"ti":["AbyssinicaSIL"],"tl":["system","OpenDyslexic"],"tr":["system","OpenDyslexic"],"wa":["system","OpenDyslexic"],"yi":["system","Alef"]},"fonts":{"AbyssinicaSIL":{"version":"1.200","license":"OFL
 
1.1","eot":"AbyssinicaSIL\/AbyssinicaSIL-R.eot","ttf":"AbyssinicaSIL\/AbyssinicaSIL-R.ttf","woff":"AbyssinicaSIL\/AbyssinicaSIL-R.woff"},"Akkadian":{"version":"2.56","license":null,"eot":"Akkadian\/Akkadian.eot","ttf":"Akkadian\/Akkadian.ttf","woff":"Akkadian\/Akkadian.woff"},"Alef":{"version":"1.0","license":"OFL
 
1.1","ttf":"Alef\/Alef-Regular.ttf","eot":"Alef\/Alef-Regular.eot","woff":"Alef\/Alef-Regular.woff","variants":{"bold":"Alef
 Bold"}},"Alef Bold":{"version":"1.0","license":"OFL 
1.1","fontweight":"bold","ttf":"Alef\/Alef-Bold.ttf","eot":"Alef\/Alef-Bold.eot","woff":"Alef\/Alef-Bold.woff"},"Amiri":{"version":"1.0.2","license":"OFL
 
1.1","ttf":"amiri\/amiri-regular.ttf","eot":"amiri\/amiri-regular.eot","woff":"amiri\/amiri-regular.woff","variants":{"bold":"Amiri
 Bold","bolditalic":"Amiri Bold Italic","italic":"Amiri Italic"}},"Amiri 
Bold":{"version":"1.0.2","license":"OFL 
1.1","fontweight":"bold","ttf":"amiri\/amiri-bold.ttf","eot":"amiri\/amiri-bol

[MediaWiki-commits] [Gerrit] Disable default web font for language code "ml" - change (mediawiki...UniversalLanguageSelector)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Disable default web font for language code "ml"
..


Disable default web font for language code "ml"

Bug: 49894
Change-Id: I33c08203f19688ffdf00e7ca3da23a9dd1fb05aa
---
M data/fontrepo/fonts/Meera/font.ini
M resources/js/ext.uls.webfonts.repository.js
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Santhosh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/data/fontrepo/fonts/Meera/font.ini 
b/data/fontrepo/fonts/Meera/font.ini
index d33ae15..cf9255b 100644
--- a/data/fontrepo/fonts/Meera/font.ini
+++ b/data/fontrepo/fonts/Meera/font.ini
@@ -1,5 +1,5 @@
 [Meera]
-languages=ml*
+languages=ml
 version=5.0.1
 license=GPL 3+ with exceptions
 licensefile=gpl-3.0.txt
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index 751e1f5..1229103 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -1,5 +1,5 @@
 // Please do not edit. This file is generated from data/fontrepo by 
data/fontrepo/scripts/compile.php
 ( function ( $ ) {
$.webfonts = $.webfonts || {};
-   $.webfonts.repository = 
{"base":"..\/data\/fontrepo\/fonts\/","languages":{"af":["system","OpenDyslexic"],"ahr":["Lohit
 
Marathi"],"akk":["Akkadian"],"am":["AbyssinicaSIL"],"ar":["Amiri"],"arb":["Amiri"],"arc":["Estarngelo
 Edessa","East Syriac Adiabene","SertoUrhoy"],"as":["system","Lohit 
Assamese"],"bh":["Lohit Devanagari"],"bho":["Lohit 
Devanagari"],"bk":["system","OpenDyslexic"],"bn":["Siyam Rupali","Lohit 
Bengali"],"bo":["Jomolhari"],"bpy":["Siyam Rupali","Lohit 
Bengali"],"bug":["Saweri"],"ca":["system","OpenDyslexic"],"cdo":["CharisSIL"],"cy":["system","OpenDyslexic"],"da":["system","OpenDyslexic"],"de":["system","OpenDyslexic"],"dv":["FreeFont-Thaana"],"dz":["Jomolhari"],"en":["system","OpenDyslexic"],"es":["system","OpenDyslexic"],"et":["system","OpenDyslexic"],"fa":["system","Iranian
 
Sans","Amiri"],"fi":["system","OpenDyslexic"],"fo":["system","OpenDyslexic"],"fr":["system","OpenDyslexic"],"fy":["system","OpenDyslexic"],"ga":["system","OpenDyslexic"],"gd":["system","OpenDyslexic"],"gl":["system","OpenDyslexic"],"gom":["Lohit
 Devanagari"],"gu":["Lohit Gujarati"],"hbo":["Taamey Frank 
CLM","Alef"],"he":["system","Alef","Miriam CLM","Taamey Frank 
CLM"],"hi":["Lohit 
Devanagari"],"hu":["system","OpenDyslexic"],"id":["system","OpenDyslexic"],"is":["system","OpenDyslexic"],"it":["system","OpenDyslexic"],"jv":["system","Tuladha
 Jejeg"],"jv-java":["Tuladha 
Jejeg"],"km":["KhmerOSbattambang","KhmerOS","KhmerOSbokor","KhmerOSfasthand","KhmerOSfreehand","KhmerOSmuol","KhmerOSmuollight","KhmerOSmuolpali","KhmerOSsiemreap"],"kn":["Lohit
 Kannada","Gubbi"],"kok":["Lohit 
Devanagari"],"lb":["system","OpenDyslexic"],"li":["system","OpenDyslexic"],"mai":["Lohit
 
Devanagari"],"mak":["Saweri"],"mi":["system","OpenDyslexic"],"ml":["Meera","AnjaliOldLipi"],"mr":["Lohit
 
Marathi"],"ms":["system","OpenDyslexic"],"my":["TharLon","Myanmar3","Padauk"],"nan":["Doulos
 SIL","CharisSIL"],"nb":["system","OpenDyslexic"],"ne":["Lohit 
Nepali","Madan"],"nl":["system","OpenDyslexic"],"oc":["system","OpenDyslexic"],"or":["Lohit
 Oriya","Utkal"],"pa":["Lohit 
Punjabi","Saab"],"pt":["system","OpenDyslexic"],"sa":["Lohit 
Devanagari"],"saz":["Pagul"],"sq":["system","OpenDyslexic"],"sux":["Akkadian"],"sv":["system","OpenDyslexic"],"sw":["system","OpenDyslexic"],"syc":["Estarngelo
 Edessa","East Syriac Adiabene","SertoUrhoy"],"ta":["system","Lohit 
Tamil","Lohit Tamil Classical","Thendral","Thenee"],"tcy":["Lohit 
Kannada","Gubbi"],"te":["Lohit 
Telugu"],"ti":["AbyssinicaSIL"],"tl":["system","OpenDyslexic"],"tr":["system","OpenDyslexic"],"wa":["system","OpenDyslexic"],"yi":["system","Alef"]},"fonts":{"AbyssinicaSIL":{"version":"1.200","license":"OFL
 
1.1","eot":"AbyssinicaSIL\/AbyssinicaSIL-R.eot","ttf":"AbyssinicaSIL\/AbyssinicaSIL-R.ttf","woff":"AbyssinicaSIL\/AbyssinicaSIL-R.woff"},"Akkadian":{"version":"2.56","license":null,"eot":"Akkadian\/Akkadian.eot","ttf":"Akkadian\/Akkadian.ttf","woff":"Akkadian\/Akkadian.woff"},"Alef":{"version":"1.0","license":"OFL
 
1.1","ttf":"Alef\/Alef-Regular.ttf","eot":"Alef\/Alef-Regular.eot","woff":"Alef\/Alef-Regular.woff","variants":{"bold":"Alef
 Bold"}},"Alef Bold":{"version":"1.0","license":"OFL 
1.1","fontweight":"bold","ttf":"Alef\/Alef-Bold.ttf","eot":"Alef\/Alef-Bold.eot","woff":"Alef\/Alef-Bold.woff"},"Amiri":{"version":"1.0.2","license":"OFL
 
1.1","ttf":"amiri\/amiri-regular.ttf","eot":"amiri\/amiri-regular.eot","woff":"amiri\/amiri-regular.woff","variants":{"bold":"Amiri
 Bold","bolditalic":"Amiri Bold Italic","italic":"Amiri Italic"}},"Amiri 
Bold":{"version":"1.0.2","license":"OFL 
1.1","fontweight":"bold","ttf":"amiri\/amiri-bold.ttf","eot":"amiri\/amiri-bold.eot","woff":"amiri\/amiri-bold.woff"},"Amiri
 Bold Italic":{"version":

[MediaWiki-commits] [Gerrit] $settings_dir mode to 0755; comment tweak - change (mediawiki/vagrant)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: $settings_dir mode to 0755; comment tweak
..


$settings_dir mode to 0755; comment tweak

$settings_dir is situated in the shared folder, so Puppet's attempt to pound
mode 0775 are futile and generate noise on Puppet runs. This is probably a good
sign that the creation of the settings_dir should be the job of the role class.

This patch also tweaks a comment in Vagrantfile regarding Vagrantfile-extra.rb.

Change-Id: I5c3dac1eafa26f9d720b78ce07b90ed9730ee638
---
M Vagrantfile
M puppet/modules/mediawiki/manifests/init.pp
2 files changed, 9 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Vagrantfile b/Vagrantfile
index dabb889..114ae3f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -100,7 +100,7 @@
 end
 
 begin
+# Load custom Vagrantfile overrides from 'Vagrantfile-extra.rb'
 require_relative 'Vagrantfile-extra'
 rescue LoadError
-# No local Vagrantfile overrides.
 end
diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index 3b35e28..b190972 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -73,7 +73,14 @@
 unless  => "php ${dir}/maintenance/sql.php  directory,
+owner  => 'vagrant',
+group  => 'www-data',
+mode   => '0755',
+}
+
+file { $upload_dir:
 ensure => directory,
 owner  => 'vagrant',
 group  => 'www-data',

-- 
To view, visit https://gerrit.wikimedia.org/r/72680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c3dac1eafa26f9d720b78ce07b90ed9730ee638
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] whitelist Addshore - change (integration/zuul-config)

2013-07-09 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: whitelist Addshore
..


whitelist Addshore

- he is on the wikidata team as an intern and is an experienced wikidata
  & wikipedia bot author.

Change-Id: I6d0acf8a03ec7c5b0a753421b0398efd63969c17
---
M layout.yaml
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Hashar: Looks good to me, approved
  Jeroen De Dauw: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/layout.yaml b/layout.yaml
index 9d63f75..1d78578 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -36,7 +36,7 @@
 # TODO: Figure out a way to not have to repeat this from pipeline 
'test'.
 # This email_filter and the one for 'test' can be removed once we have 
fixed bug 45499.
 email_filter:
- - 
^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de)).*$
+ - 
^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com)).*$
   - event: comment-added
 comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$
 success:
@@ -109,6 +109,7 @@
  - ^orbit@framezero\.com$ # Christian Williams
 
 # WMDE:
+ - ^addshorewiki@gmail\.com$
  - ^aude\.wiki@gmail\.com$
 
 # Trusted long term users:

-- 
To view, visit https://gerrit.wikimedia.org/r/72531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d0acf8a03ec7c5b0a753421b0398efd63969c17
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Demon 
Gerrit-Reviewer: Denny Vrandecic 
Gerrit-Reviewer: Dsc 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jeroen De Dauw 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] jobs for mw/ext/WikibaseQuery - change (integration/jenkins-job-builder-config)

2013-07-09 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: jobs for mw/ext/WikibaseQuery
..


jobs for mw/ext/WikibaseQuery

Change-Id: Ic2d06aa99e31ad7c6ed0415d1a7b7244789fb9d6
---
M mediawiki-extensions.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 453bc4e..a1b4411 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -389,6 +389,7 @@
  - WikibaseDatabase
  - WikibaseDataModel
  - WikibaseQueryEngine
+ - WikibaseQuery
  - WikiEditor
  - wikihiero
  - WikiLexicalData
@@ -431,6 +432,9 @@
  - '{name}-{ext-name}-testextensions-{mwbranch}':
 ext-name: WikibaseQueryEngine
 dependencies: 'Diff,DataValues,Ask,WikibaseDataModel,WikibaseDatabase'
+ - '{name}-{ext-name}-testextensions-{mwbranch}':
+ext-name: WikibaseQuery
+dependencies: 
'Diff,DataValues,Ask,WikibaseDataModel,WikibaseDatabase,WikibaseQueryEngine'
 
  - '{name}-{ext-name}-testextensions-{mwbranch}':
 name: mwext

-- 
To view, visit https://gerrit.wikimedia.org/r/72538
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2d06aa99e31ad7c6ed0415d1a7b7244789fb9d6
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] .gitignore, .gitreview, debian packaging files for mwbzutils - change (operations...mwbzutils)

2013-07-09 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72691


Change subject: .gitignore, .gitreview, debian packaging files for mwbzutils
..

.gitignore, .gitreview, debian packaging files for mwbzutils

Change-Id: I3968262ca15db99bc7f06caa77d2dbd62026d703
---
A .gitignore
A .gitreview
A debian/README.Debian
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
10 files changed, 150 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/mwbzutils 
refs/changes/91/72691/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..6a8b679
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+# Repository management
+.svn
+
+# Editors
+*~
+
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..90c9be4
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=operations/debs/mwbzutils.git
+defaultbranch=master
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 000..dbf2280
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,20 @@
+mwbzutils for Debian
+
+
+If you are reading this file, you will have a local copy of the debian package
+or have retrieved the debian files via
+
+  git clone https://gerrit.wikimedia.org/r/operations/debs/mwbzutils
+  or https://git.wikimedia.org/summary/operations%2Fdebs%2Fmwbzutils
+
+If you need to get the upstream source separately from this package,
+select the appropriate tag (currently mwbzutils_0.0.4) from here
+
+  https://git.wikimedia.org/summary/operations%2Fdumps.git
+
+and then select the compression option of your choice to get the source.
+Cd into the directory xmldumps-backup/mwbzutils to build, patch, etc.
+You can also 'make dist' from within the mwbzutils directory to get a
+tarball of just the utils.
+
+ -- Ariel T. Glenn   Fri, 05 Jul 2013 12:15:19 +0300
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..b908948
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+mwbzutils (0.0.4-0~wmf1+precise) precise-wikimedia; urgency=low
+
+  * Initial release
+
+ -- Ariel T. Glenn   Fri, 05 Jul 2013 12:15:19 +0300
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..9307918
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,18 @@
+Source: mwbzutils
+Section: misc
+Priority: extra
+Maintainer: Ariel T. Glenn 
+Build-Depends: debhelper (>= 8.0.0), libbz2-1.0, zlib1g
+Standards-Version: 3.9.2
+Homepage: https://www.mediawiki.org/wiki/Manual:Mwbzutils
+Vcs-Git: git clone https://gerrit.wikimedia.org/r/p/operations/dumps.git
+Vcs-Browser: https://git.wikimedia.org/summary/operations%2Fdumps.git
+
+Package: mwbzutils
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, libbz2-dev, zlib1g-dev
+Description: C utilities for processing bzipped MediaWiki XML files
+ C utilities for manipulating bzip compressed MediaWiki XML files:
+ elementary integrity checking, retrieving partial content, dumping
+ the last bzip2 block from a possibly truncated file, dumping page
+ metadata/content from a given offset in a file
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..f44f767
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,73 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: mwbzutils
+Source: 
+
+Files: *
+Copyright: 2001, 2012, 2013 Ariel T. Glenn 
+License: GPL-2+
+ 
+ 
+ .
+ 
+
+Files: bzlib*
+Copyright: 2010 Julian Seward 
+License: LICENSE_BZ
+
+Files: debian/*
+Copyright: 2013 Ariel T. Glenn 
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see 
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: LICENSE_BZ
+ This program, "bzip2", the associated library "libbzip2", and all
+ documentation, are copyright (C) 1996-2010 Julian R Seward.  All
+ rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditio

[MediaWiki-commits] [Gerrit] Removed toolbarlabel's get/setContent method - change (mediawiki...Wikibase)

2013-07-09 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72692


Change subject: Removed toolbarlabel's get/setContent method
..

Removed toolbarlabel's get/setContent method

There is no need to have dedicated get/setContent methods. After converting to 
a jQuery
widget, instead of using dedicated methods, jQuery's native contents() method 
can be used.

Change-Id: I21c279ccacfb27d2f47ef98fffc02a6d022630de
---
M lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js
M lib/resources/jquery.wikibase/toolbar/toolbarlabel.js
M lib/tests/qunit/jquery.wikibase/toolbar/toolbar.tests.js
M lib/tests/qunit/jquery.wikibase/toolbar/toolbarbutton.tests.js
M lib/tests/qunit/jquery.wikibase/toolbar/toolbarlabel.tests.js
M lib/tests/qunit/wikibase.ui.Tooltip.tests.js
6 files changed, 24 insertions(+), 66 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/92/72692/1

diff --git a/lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js 
b/lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js
index 108d67f..1b0a7ec 100644
--- a/lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js
+++ b/lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js
@@ -164,16 +164,18 @@
this.innerGroup = $innerGroup.data( 'toolbar' );
this.addElement( $innerGroup );
 
-   this.$tooltipAnchor = $( '' ).toolbarlabel( {
-   content: $( '', {
+   this.$tooltipAnchor = $( '' );
+
+   this.$tooltipAnchor
+   .append( $( '', {
'class': 'mw-help-field-hint',
style: 'display:inline;text-decoration:none;', // TODO: 
Get rid of inline styles.
html: ' ' // TODO find nicer way to hack Webkit 
browsers to display tooltip image (see also css)
-   } ),
-   stateChangeable: false // Tooltip anchor has no 
disabled/enabled behavior.
-   } );
+   } ) )
+   // Tooltip anchor has no disabled/enabled behavior.
+   .toolbarlabel( { stateChangeable: false } )
// Initialize the tooltip just to be able to change render 
variables like gravity:
-   this.$tooltipAnchor.data( 'toolbarlabel' ).setTooltip( '' );
+   .data( 'toolbarlabel' ).setTooltip( '' );
 
// Now, create the buttons we need for basic editing:
var self = this;
diff --git a/lib/resources/jquery.wikibase/toolbar/toolbarlabel.js 
b/lib/resources/jquery.wikibase/toolbar/toolbarlabel.js
index 2d9d6ae..3a11151 100644
--- a/lib/resources/jquery.wikibase/toolbar/toolbarlabel.js
+++ b/lib/resources/jquery.wikibase/toolbar/toolbarlabel.js
@@ -19,12 +19,7 @@
  * @extends wb.utilities.ui.StatableObject
  * @since 0.4
  *
- * @option {string|jQuery} The label's content.
- *
  * @option {boolean} isStateChangeable Whether object's state is changeable 
(enabled, disabled).
- *
- * TODO: Use widget method scheme (e.g.: content() instead of setContent() and 
getContent()).
- *  Probably, get rid of content option completely.
  */
 $.widget( 'wikibase.toolbarlabel', PARENT, {
/**
@@ -32,7 +27,6 @@
 * @type {Object}
 */
options: {
-   content: null,
stateChangeable: true
},
 
@@ -71,36 +65,6 @@
},
 
/**
-* Sets the label's content
-*
-* @param {string|jQuery} content
-*/
-   setContent: function( content ) {
-   this.element.empty();
-   if ( typeof content === 'string' ) {
-   content = $.trim( content );
-   }
-   this.element.append( content );
-   },
-
-   /**
-* Returns the labels content. If only text was set as content, a 
string will be returned, if
-* HTML nodes were set, this will return a jQuery object.
-*
-* @return {jQuery|string}
-*/
-   getContent: function() {
-   var contents = this.element.contents();
-
-   if( contents.length === 1 && contents[0].nodeType === 3 ) {
-   // return the text
-   return contents.text();
-   }
-   // return jQuery object
-   return contents;
-   },
-
-   /**
 * Determines whether state change (enabling, disabling) is possible 
for this object.
 *
 * @return {boolean} Whether changing the state is possible.
@@ -111,6 +75,8 @@
 
/**
 * Sets focus on this label.
+* TODO: Convert setFocus() and removeFocus() to combined focus() 
method or remove if not needed
+*  anymore.
 */
setFocus: function() {
this._makeFocusable();
@@ -126,6 +92,8 @@
 
/**
 * Applie

[MediaWiki-commits] [Gerrit] ULS to master - change (mediawiki/core)

2013-07-09 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72693


Change subject: ULS to master
..

ULS to master

Change-Id: Ic1954d41e7c41459896bbec61b6af6adfd6b4aff
---
M extensions/UniversalLanguageSelector
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/93/72693/1

diff --git a/extensions/UniversalLanguageSelector 
b/extensions/UniversalLanguageSelector
index 1b8d0eb..13dcfc9 16
--- a/extensions/UniversalLanguageSelector
+++ b/extensions/UniversalLanguageSelector
-Subproject commit 1b8d0eb169b10dcfd8d7118ce16ac9d1b6d25ea7
+Subproject commit 13dcfc9abc4e19920c01a6605d967a6a0ad5db8e

-- 
To view, visit https://gerrit.wikimedia.org/r/72693
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1954d41e7c41459896bbec61b6af6adfd6b4aff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf9
Gerrit-Owner: Nikerabbit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add. get functionality. - change (analytics/user-metrics)

2013-07-09 Thread Rfaulk (Code Review)

Rfaulk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72696


Change subject: add. get functionality.
..

add. get functionality.

Change-Id: Ibb05fc4f3b9adb66a06440695551cc61e1d0b788
---
M user_metrics/api/broker.py
1 file changed, 11 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics 
refs/changes/96/72696/1

diff --git a/user_metrics/api/broker.py b/user_metrics/api/broker.py
index 0b4d2e5..65d16c8 100644
--- a/user_metrics/api/broker.py
+++ b/user_metrics/api/broker.py
@@ -103,6 +103,15 @@
 for line in lines:
 f.write(line)
 
-
 def get(self, target, key):
-pass
+"""
+Retrieve a value with the given key
+"""
+with open(target, 'r') as f:
+lines = f.read().split('\n')
+for idx, line in enumerate(lines):
+item = json.loads(line)
+if item.keys()[0] == key:
+return item[key]
+return None
+

-- 
To view, visit https://gerrit.wikimedia.org/r/72696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb05fc4f3b9adb66a06440695551cc61e1d0b788
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: repair_runtime
Gerrit-Owner: Rfaulk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ULS to master - change (mediawiki/core)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: ULS to master
..


ULS to master

Change-Id: Ic1954d41e7c41459896bbec61b6af6adfd6b4aff
---
M extensions/UniversalLanguageSelector
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extensions/UniversalLanguageSelector 
b/extensions/UniversalLanguageSelector
index 1b8d0eb..13dcfc9 16
--- a/extensions/UniversalLanguageSelector
+++ b/extensions/UniversalLanguageSelector
-Subproject commit 1b8d0eb169b10dcfd8d7118ce16ac9d1b6d25ea7
+Subproject commit 13dcfc9abc4e19920c01a6605d967a6a0ad5db8e

-- 
To view, visit https://gerrit.wikimedia.org/r/72693
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1954d41e7c41459896bbec61b6af6adfd6b4aff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf9
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add. update functionality. - change (analytics/user-metrics)

2013-07-09 Thread Rfaulk (Code Review)

Rfaulk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72695


Change subject: add. update functionality.
..

add. update functionality.

Change-Id: I289045a03f4f6b886ed0053f6d1ffeb7dcb01c1b
---
M user_metrics/api/broker.py
1 file changed, 23 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics 
refs/changes/95/72695/1

diff --git a/user_metrics/api/broker.py b/user_metrics/api/broker.py
index fc4c3f1..0b4d2e5 100644
--- a/user_metrics/api/broker.py
+++ b/user_metrics/api/broker.py
@@ -37,6 +37,12 @@
 """
 raise NotImplementedError()
 
+def update(self, target, key, value):
+"""
+Remove a key/value pair to the broker
+"""
+raise NotImplementedError()
+
 def get(self, target, key):
 """
 Retrieve a key/value pair to the broker
@@ -75,12 +81,28 @@
 lines = f.read().split('\n')
 for idx, line in enumerate(lines):
 item = json.loads(line)
-if item['key'] == key:
+if item.keys()[0] == key:
 del lines[idx]
 break
 with open(target, 'w') as f:
 for line in lines:
 f.write(line)
 
+def update(self, target, key, value):
+"""
+Update element with the given key
+"""
+with open(target, 'r') as f:
+lines = f.read().split('\n')
+for idx, line in enumerate(lines):
+item = json.loads(line)
+if item.keys()[0] == key:
+lines[idx] = json.dumps({key: value}) + '\n'
+break
+with open(target, 'w') as f:
+for line in lines:
+f.write(line)
+
+
 def get(self, target, key):
 pass

-- 
To view, visit https://gerrit.wikimedia.org/r/72695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I289045a03f4f6b886ed0053f6d1ffeb7dcb01c1b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: repair_runtime
Gerrit-Owner: Rfaulk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add. remove functionality. - change (analytics/user-metrics)

2013-07-09 Thread Rfaulk (Code Review)

Rfaulk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72694


Change subject: add. remove functionality.
..

add. remove functionality.

Change-Id: I59779882310708f7c1e31c5238a1848fe522ed62
---
M user_metrics/api/broker.py
1 file changed, 13 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics 
refs/changes/94/72694/1

diff --git a/user_metrics/api/broker.py b/user_metrics/api/broker.py
index 35243d8..fc4c3f1 100644
--- a/user_metrics/api/broker.py
+++ b/user_metrics/api/broker.py
@@ -68,7 +68,19 @@
 f.write(json.dumps({key: value}) + '\n')
 
 def remove(self, target, key):
-pass
+"""
+Remove element with the given key
+"""
+with open(target, 'r') as f:
+lines = f.read().split('\n')
+for idx, line in enumerate(lines):
+item = json.loads(line)
+if item['key'] == key:
+del lines[idx]
+break
+with open(target, 'w') as f:
+for line in lines:
+f.write(line)
 
 def get(self, target, key):
 pass

-- 
To view, visit https://gerrit.wikimedia.org/r/72694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59779882310708f7c1e31c5238a1848fe522ed62
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: repair_runtime
Gerrit-Owner: Rfaulk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add. remove functionality. - change (analytics/user-metrics)

2013-07-09 Thread Rfaulk (Code Review)

Rfaulk has submitted this change and it was merged.

Change subject: add. remove functionality.
..


add. remove functionality.

Change-Id: I59779882310708f7c1e31c5238a1848fe522ed62
---
M user_metrics/api/broker.py
1 file changed, 13 insertions(+), 1 deletion(-)

Approvals:
  Rfaulk: Verified; Looks good to me, approved



diff --git a/user_metrics/api/broker.py b/user_metrics/api/broker.py
index 35243d8..fc4c3f1 100644
--- a/user_metrics/api/broker.py
+++ b/user_metrics/api/broker.py
@@ -68,7 +68,19 @@
 f.write(json.dumps({key: value}) + '\n')
 
 def remove(self, target, key):
-pass
+"""
+Remove element with the given key
+"""
+with open(target, 'r') as f:
+lines = f.read().split('\n')
+for idx, line in enumerate(lines):
+item = json.loads(line)
+if item['key'] == key:
+del lines[idx]
+break
+with open(target, 'w') as f:
+for line in lines:
+f.write(line)
 
 def get(self, target, key):
 pass

-- 
To view, visit https://gerrit.wikimedia.org/r/72694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I59779882310708f7c1e31c5238a1848fe522ed62
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: repair_runtime
Gerrit-Owner: Rfaulk 
Gerrit-Reviewer: Rfaulk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add. get functionality. - change (analytics/user-metrics)

2013-07-09 Thread Rfaulk (Code Review)

Rfaulk has submitted this change and it was merged.

Change subject: add. get functionality.
..


add. get functionality.

Change-Id: Ibb05fc4f3b9adb66a06440695551cc61e1d0b788
---
M user_metrics/api/broker.py
1 file changed, 11 insertions(+), 2 deletions(-)

Approvals:
  Rfaulk: Verified; Looks good to me, approved



diff --git a/user_metrics/api/broker.py b/user_metrics/api/broker.py
index 0b4d2e5..65d16c8 100644
--- a/user_metrics/api/broker.py
+++ b/user_metrics/api/broker.py
@@ -103,6 +103,15 @@
 for line in lines:
 f.write(line)
 
-
 def get(self, target, key):
-pass
+"""
+Retrieve a value with the given key
+"""
+with open(target, 'r') as f:
+lines = f.read().split('\n')
+for idx, line in enumerate(lines):
+item = json.loads(line)
+if item.keys()[0] == key:
+return item[key]
+return None
+

-- 
To view, visit https://gerrit.wikimedia.org/r/72696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb05fc4f3b9adb66a06440695551cc61e1d0b788
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: repair_runtime
Gerrit-Owner: Rfaulk 
Gerrit-Reviewer: Rfaulk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add. update functionality. - change (analytics/user-metrics)

2013-07-09 Thread Rfaulk (Code Review)

Rfaulk has submitted this change and it was merged.

Change subject: add. update functionality.
..


add. update functionality.

Change-Id: I289045a03f4f6b886ed0053f6d1ffeb7dcb01c1b
---
M user_metrics/api/broker.py
1 file changed, 23 insertions(+), 1 deletion(-)

Approvals:
  Rfaulk: Verified; Looks good to me, approved



diff --git a/user_metrics/api/broker.py b/user_metrics/api/broker.py
index fc4c3f1..0b4d2e5 100644
--- a/user_metrics/api/broker.py
+++ b/user_metrics/api/broker.py
@@ -37,6 +37,12 @@
 """
 raise NotImplementedError()
 
+def update(self, target, key, value):
+"""
+Remove a key/value pair to the broker
+"""
+raise NotImplementedError()
+
 def get(self, target, key):
 """
 Retrieve a key/value pair to the broker
@@ -75,12 +81,28 @@
 lines = f.read().split('\n')
 for idx, line in enumerate(lines):
 item = json.loads(line)
-if item['key'] == key:
+if item.keys()[0] == key:
 del lines[idx]
 break
 with open(target, 'w') as f:
 for line in lines:
 f.write(line)
 
+def update(self, target, key, value):
+"""
+Update element with the given key
+"""
+with open(target, 'r') as f:
+lines = f.read().split('\n')
+for idx, line in enumerate(lines):
+item = json.loads(line)
+if item.keys()[0] == key:
+lines[idx] = json.dumps({key: value}) + '\n'
+break
+with open(target, 'w') as f:
+for line in lines:
+f.write(line)
+
+
 def get(self, target, key):
 pass

-- 
To view, visit https://gerrit.wikimedia.org/r/72695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I289045a03f4f6b886ed0053f6d1ffeb7dcb01c1b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: repair_runtime
Gerrit-Owner: Rfaulk 
Gerrit-Reviewer: Rfaulk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] .gitignore, .gitreview, debian packaging files for mwbzutils - change (operations...mwbzutils)

2013-07-09 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: .gitignore, .gitreview, debian packaging files for mwbzutils
..


.gitignore, .gitreview, debian packaging files for mwbzutils

Change-Id: I3968262ca15db99bc7f06caa77d2dbd62026d703
---
A .gitignore
A .gitreview
A debian/README.Debian
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
10 files changed, 150 insertions(+), 0 deletions(-)

Approvals:
  ArielGlenn: Verified; Looks good to me, approved



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..6a8b679
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+# Repository management
+.svn
+
+# Editors
+*~
+
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..90c9be4
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=operations/debs/mwbzutils.git
+defaultbranch=master
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 000..dbf2280
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,20 @@
+mwbzutils for Debian
+
+
+If you are reading this file, you will have a local copy of the debian package
+or have retrieved the debian files via
+
+  git clone https://gerrit.wikimedia.org/r/operations/debs/mwbzutils
+  or https://git.wikimedia.org/summary/operations%2Fdebs%2Fmwbzutils
+
+If you need to get the upstream source separately from this package,
+select the appropriate tag (currently mwbzutils_0.0.4) from here
+
+  https://git.wikimedia.org/summary/operations%2Fdumps.git
+
+and then select the compression option of your choice to get the source.
+Cd into the directory xmldumps-backup/mwbzutils to build, patch, etc.
+You can also 'make dist' from within the mwbzutils directory to get a
+tarball of just the utils.
+
+ -- Ariel T. Glenn   Fri, 05 Jul 2013 12:15:19 +0300
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..b908948
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+mwbzutils (0.0.4-0~wmf1+precise) precise-wikimedia; urgency=low
+
+  * Initial release
+
+ -- Ariel T. Glenn   Fri, 05 Jul 2013 12:15:19 +0300
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..9307918
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,18 @@
+Source: mwbzutils
+Section: misc
+Priority: extra
+Maintainer: Ariel T. Glenn 
+Build-Depends: debhelper (>= 8.0.0), libbz2-1.0, zlib1g
+Standards-Version: 3.9.2
+Homepage: https://www.mediawiki.org/wiki/Manual:Mwbzutils
+Vcs-Git: git clone https://gerrit.wikimedia.org/r/p/operations/dumps.git
+Vcs-Browser: https://git.wikimedia.org/summary/operations%2Fdumps.git
+
+Package: mwbzutils
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, libbz2-dev, zlib1g-dev
+Description: C utilities for processing bzipped MediaWiki XML files
+ C utilities for manipulating bzip compressed MediaWiki XML files:
+ elementary integrity checking, retrieving partial content, dumping
+ the last bzip2 block from a possibly truncated file, dumping page
+ metadata/content from a given offset in a file
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..f44f767
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,73 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: mwbzutils
+Source: 
+
+Files: *
+Copyright: 2001, 2012, 2013 Ariel T. Glenn 
+License: GPL-2+
+ 
+ 
+ .
+ 
+
+Files: bzlib*
+Copyright: 2010 Julian Seward 
+License: LICENSE_BZ
+
+Files: debian/*
+Copyright: 2013 Ariel T. Glenn 
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see 
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: LICENSE_BZ
+ This program, "bzip2", the associated library "libbzip2", and all
+ documentation, are copyright (C) 1996-2010 Julian R Seward.  All
+ rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain

[MediaWiki-commits] [Gerrit] ULS to master - change (mediawiki/core)

2013-07-09 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72697


Change subject: ULS to master
..

ULS to master

Change-Id: I49d872d60fe5c39791dae541a559fd90caec7b6d
---
M extensions/UniversalLanguageSelector
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/97/72697/1

diff --git a/extensions/UniversalLanguageSelector 
b/extensions/UniversalLanguageSelector
index 1b8d0eb..13dcfc9 16
--- a/extensions/UniversalLanguageSelector
+++ b/extensions/UniversalLanguageSelector
-Subproject commit 1b8d0eb169b10dcfd8d7118ce16ac9d1b6d25ea7
+Subproject commit 13dcfc9abc4e19920c01a6605d967a6a0ad5db8e

-- 
To view, visit https://gerrit.wikimedia.org/r/72697
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49d872d60fe5c39791dae541a559fd90caec7b6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf8
Gerrit-Owner: Nikerabbit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Removed toolbarlabel's set/removeFocus - change (mediawiki...Wikibase)

2013-07-09 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72698


Change subject: Removed toolbarlabel's set/removeFocus
..

Removed toolbarlabel's set/removeFocus

toolbarlabel's set/removeFocus methods have become obsolete after converting 
the toolbar label
to a widget and after no more DOM replacing is being performed when changing a 
button's state.

Change-Id: Ibdca1cbd03e25e5b5878f4290fc40d2f3d25dc31
---
M lib/resources/jquery.wikibase/toolbar/addtoolbar.js
M lib/resources/jquery.wikibase/toolbar/edittoolbar.js
M lib/resources/jquery.wikibase/toolbar/toolbarbutton.js
M lib/resources/jquery.wikibase/toolbar/toolbarlabel.js
M lib/resources/wikibase.ui.PropertyEditTool.js
M lib/tests/qunit/jquery.wikibase/toolbar/toolbarbutton.tests.js
M lib/tests/qunit/jquery.wikibase/toolbar/toolbarlabel.tests.js
7 files changed, 8 insertions(+), 85 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/98/72698/1

diff --git a/lib/resources/jquery.wikibase/toolbar/addtoolbar.js 
b/lib/resources/jquery.wikibase/toolbar/addtoolbar.js
index 8c2c3dc..4691bd6 100644
--- a/lib/resources/jquery.wikibase/toolbar/addtoolbar.js
+++ b/lib/resources/jquery.wikibase/toolbar/addtoolbar.js
@@ -134,7 +134,7 @@
$node.trigger( event.type );
} else {

event.stopImmediatePropagation();
-   self.toolbar.$btnAdd.data( 
'toolbarbutton' ).setFocus();
+   self.toolbar.$btnAdd.focus();
}
}
);
diff --git a/lib/resources/jquery.wikibase/toolbar/edittoolbar.js 
b/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
index e293707..187ec05 100644
--- a/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
+++ b/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
@@ -172,7 +172,7 @@
editGroup.toNonEditMode();
self.enable();
self.toggleActionMessage( function() {
-   editGroup.$btnEdit.data( 
'toolbarbutton' ).setFocus();
+   editGroup.$btnEdit.focus();
} );
} )
.on( prefix + 'afterstartediting ' + prefix + 'change', 
function( event ) {
diff --git a/lib/resources/jquery.wikibase/toolbar/toolbarbutton.js 
b/lib/resources/jquery.wikibase/toolbar/toolbarbutton.js
index 486a2ba..94ecb30 100644
--- a/lib/resources/jquery.wikibase/toolbar/toolbarbutton.js
+++ b/lib/resources/jquery.wikibase/toolbar/toolbarbutton.js
@@ -78,13 +78,6 @@
$( wb ).off( 'restrictEntityPageActions.' + 
this.widgetName
+ 'blockEntityPageActions.' + this.widgetName );
}
-   },
-
-   /**
-* @see jQuery.wikibase.toolbarlabel.setFocus
-*/
-   setFocus: function() {
-   this.element.focus();
}
 
 } );
diff --git a/lib/resources/jquery.wikibase/toolbar/toolbarlabel.js 
b/lib/resources/jquery.wikibase/toolbar/toolbarlabel.js
index 3a11151..bb4919f 100644
--- a/lib/resources/jquery.wikibase/toolbar/toolbarlabel.js
+++ b/lib/resources/jquery.wikibase/toolbar/toolbarlabel.js
@@ -71,37 +71,6 @@
 */
isStateChangeable: function() {
return this.options.stateChangeable;
-   },
-
-   /**
-* Sets focus on this label.
-* TODO: Convert setFocus() and removeFocus() to combined focus() 
method or remove if not needed
-*  anymore.
-*/
-   setFocus: function() {
-   this._makeFocusable();
-   this.element.focus();
-   },
-
-   /**
-* Removes focus from this label.
-*/
-   removeFocus: function() {
-   this.element.blur();
-   },
-
-   /**
-* Applies tab index since regular HTML elements cannot be focused.
-* TODO: Evaluate if still needed since buttons/links are no more 
replaced with  when
-*  disabling.
-*/
-   _makeFocusable: function() {
-   var self = this;
-   this.element.attr( 'tabIndex', '0' );
-   // Do not apply the tab index permanently:
-   this.element.one( 'blur', function( event ) {
-   self.element.removeAttr( 'tabIndex' );
-   } );
}
 
 } );
diff --git a/lib/resources/wikibase.ui.PropertyEditTool.js 
b/lib/resources/wikibase.ui.PropertyEditTool.js
index 95f3e6d..3ac449a 100644
--- a/lib/resources/wikibase.ui.PropertyEditTool.js
+++ b/lib/resources/wikibase.ui.PropertyEditTool.js
@@ -135,9 +135,9 @@

[MediaWiki-commits] [Gerrit] ULS to master - change (mediawiki/core)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: ULS to master
..


ULS to master

Change-Id: I49d872d60fe5c39791dae541a559fd90caec7b6d
---
M extensions/UniversalLanguageSelector
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extensions/UniversalLanguageSelector 
b/extensions/UniversalLanguageSelector
index 1b8d0eb..13dcfc9 16
--- a/extensions/UniversalLanguageSelector
+++ b/extensions/UniversalLanguageSelector
-Subproject commit 1b8d0eb169b10dcfd8d7118ce16ac9d1b6d25ea7
+Subproject commit 13dcfc9abc4e19920c01a6605d967a6a0ad5db8e

-- 
To view, visit https://gerrit.wikimedia.org/r/72697
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I49d872d60fe5c39791dae541a559fd90caec7b6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf8
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ULS deployment phase 5 - change (operations/mediawiki-config)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: ULS deployment phase 5
..


ULS deployment phase 5

https://www.mediawiki.org/wiki/UniversalLanguageSelector/Deployment/Planning#Phase_5:_The_rest

Change-Id: Ifa5c99e3a5bed9fe2bbf2c8b40e9a0295b98b56d
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 98 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 43f8eda..43e61d9 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12162,104 +12162,7 @@
 ),
 
 'wmgUseUniversalLanguageSelector' => array(
-   'default' => false,
-   'special' => true,
-   'wikimedia' => true,
-   'amwiki' => true,
-   'amwikiquote' => true,
-   'amwiktionary' => true,
-   'arwiki' => true,
-   'arwikibooks' => true,
-   'arwikinews' => true,
-   'arwikiquote' => true,
-   'arwikisource' => true,
-   'arwikiversity' => true,
-   'arwiktionary' => true,
-   'aswiki' => true,
-   'aswikibooks' => true,
-   'aswikisource' => true,
-   'aswiktionary' => true,
-   'betawikiversity' => true,
-   'bhwiki' => true,
-   'bnwiki' => true,
-   'bnwikibooks' => true,
-   'bnwikisource' => true,
-   'bnwiktionary' => true,
-   'bpywiki' => true,
-   'bugwiki' => true,
-   'cawiki' => true,
-   'cebwiki' => true,
-   'dvwiki' => true,
-   'dvwiktionary' => true,
-   'enwiki' => true,
-   'enwikisource' => true,
-   'enwiktionary' => true,
-   'fawiki' => true,
-   'fiwiki' => true,
-   'frwikisource' => true,
-   'guwiki' => true,
-   'guwikibooks' => true,
-   'guwikiquote' => true,
-   'guwikisource' => true,
-   'guwiktionary' => true,
-   'hiwiki' => true,
-   'hiwikibooks' => true,
-   'hiwikiquote' => true,
-   'hiwiktionary' => true,
-   'jvwiki' => true,
-   'jvwiktionary' => true,
-   'kawiki' => true,
-   'knwiki' => true,
-   'knwikibooks' => true,
-   'knwikiquote' => true,
-   'knwikisource' => true,
-   'knwiktionary' => true,
-   'map_bmswiki' => true,
-   'mlwiki' => true,
-   'mlwikibooks' => true,
-   'mlwikiquote' => true,
-   'mlwikisource' => true,
-   'mlwiktionary' => true,
-   'mrwiki' => true,
-   'mrwikibooks' => true,
-   'mrwikiquote' => true,
-   'mrwikisource' => true,
-   'mrwiktionary' => true,
-   'mywiki' => true,
-   'mywiktionary' => true,
-   'newiki' => true,
-   'newikibooks' => true,
-   'newiktionary' => true,
-   'nowiki' => true,
-   'orwiki' => true,
-   'orwiktionary' => true,
-   'pawiki' => true,
-   'pawikibooks' => true,
-   'pawiktionary' => true,
-   'ptwiki' => true,
-   'sawiki' => true,
-   'sawikibooks' => true,
-   'sawikiquote' => true,
-   'sawikisource' => true,
-   'sawiktionary' => true,
-   'siwiki' => true,
-   'siwikibooks' => true,
-   'siwiktionary' => true,
-   'tawiki' => true,
-   'tawikibooks' => true,
-   'tawikinews' => true,
-   'tawikiquote' => true,
-   'tawikisource' => true,
-   'tawiktionary' => true,
-   'tewiki' => true,
-   'tewikibooks' => true,
-   'tewikiquote' => true,
-   'tewikisource' => true,
-   'tewiktionary' => true,
-   'ukwiki' => true,
-   'viwiki' => true,
-   'warwiki' => true,
-   'zhwiki' => true,
+   'default' => true,
 ),
 
 'wmgULSPosition' => array(

-- 
To view, visit https://gerrit.wikimedia.org/r/71971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa5c99e3a5bed9fe2bbf2c8b40e9a0295b98b56d
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] new Feature: Create dumpswith MathnML - change (mediawiki...MathSearch)

2013-07-09 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72699


Change subject: new Feature: Create dumpswith MathnML
..

new Feature: Create dumpswith MathnML

new plugin for export that installes a new filter called mathml

fix: adjustments to the new version of the math extension in
the math re-rendering script

Change-Id: I94749bafb9b0f94a62e517c748ee416368d2eecb
added: missing files for calculation of distances
TODO: Install script for these function
---
M maintenance/ReRenderMath.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch 
refs/changes/99/72699/1

diff --git a/maintenance/ReRenderMath.php b/maintenance/ReRenderMath.php
index a10212a..413835e 100644
--- a/maintenance/ReRenderMath.php
+++ b/maintenance/ReRenderMath.php
@@ -106,12 +106,12 @@
echo( "\t\t slow equation " . ( 
$anchorID -1 ) .
"beginning with" . substr( 
$formula, 0, 10 ) . "rendered in " . ( $tend -$tstart ) . "s. \n" );
}
-   if ( $renderer->getSuccess() ) {
-   $renderer->writeCache();
-   } else {
+   $renderer->writeCache();
+
+   if ( $renderer->getLastError() ) {
echo "F:\t\t equation " . ( $anchorID 
-1 ) .
"-failed beginning with" . 
substr( $formula, 0, 5 )
-   . "mathml:" . $renderer->mathml;
+   . "mathml:" . 
$renderer->getMathml();
}
}
return $matches;

-- 
To view, visit https://gerrit.wikimedia.org/r/72699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94749bafb9b0f94a62e517c748ee416368d2eecb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] new Feature: Create dumps with MathML - change (mediawiki...MathSearch)

2013-07-09 Thread Physikerwelt (Code Review)

Physikerwelt has submitted this change and it was merged.

Change subject: new Feature: Create dumps with MathML
..


new Feature: Create dumps with MathML

new plugin for export that installs a new filter called mathml

fix: adjustments to the new version of the math extension in
the ReRenderMath script

added: missing database functions for calculation of distances
used in the CalculateDistances script
(still open: write install script for these functions)

Change-Id: I94749bafb9b0f94a62e517c748ee416368d2eecb
---
M maintenance/ReRenderMath.php
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Physikerwelt: Verified; Looks good to me, approved



diff --git a/maintenance/ReRenderMath.php b/maintenance/ReRenderMath.php
index a10212a..413835e 100644
--- a/maintenance/ReRenderMath.php
+++ b/maintenance/ReRenderMath.php
@@ -106,12 +106,12 @@
echo( "\t\t slow equation " . ( 
$anchorID -1 ) .
"beginning with" . substr( 
$formula, 0, 10 ) . "rendered in " . ( $tend -$tstart ) . "s. \n" );
}
-   if ( $renderer->getSuccess() ) {
-   $renderer->writeCache();
-   } else {
+   $renderer->writeCache();
+
+   if ( $renderer->getLastError() ) {
echo "F:\t\t equation " . ( $anchorID 
-1 ) .
"-failed beginning with" . 
substr( $formula, 0, 5 )
-   . "mathml:" . $renderer->mathml;
+   . "mathml:" . 
$renderer->getMathml();
}
}
return $matches;

-- 
To view, visit https://gerrit.wikimedia.org/r/72699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I94749bafb9b0f94a62e517c748ee416368d2eecb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Physikerwelt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add ParserFunctions role. - change (mediawiki/vagrant)

2013-07-09 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72700


Change subject: Add ParserFunctions role.
..

Add ParserFunctions role.

Change-Id: I7db0fe63c1647ae006b9e5a809b43c5a3142f7e0
---
M puppet/manifests/roles.pp
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/00/72700/1

diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index 789e336..747c520 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -274,11 +274,18 @@
 }
 }
 
+class role::parserfunctions {
+include role::mediawiki
+
+@mediawiki::extension { 'ParserFunctions': }
+}
+
 # == Class: role::proofreadpage
 # Configures ProodreadPage, an extension to allow the proofreading of a text
 # in comparison with scanned images.
 class role::proofreadpage {
 include role::mediawiki
+include role::parserfunctions
 
 php::ini { 'proofreadpage':
 settings => {
@@ -290,7 +297,7 @@
 $packages = [ 'djvulibre-bin', 'ghostscript', 'netpbm' ]
 package { $packages: }
 
-$extras = [ 'LabeledSectionTransclusion', 'ParserFunctions', 'Cite' ]
+$extras = [ 'LabeledSectionTransclusion', 'Cite' ]
 @mediawiki::extension { $extras: }
 
 @mediawiki::extension { 'ProofreadPage':

-- 
To view, visit https://gerrit.wikimedia.org/r/72700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7db0fe63c1647ae006b9e5a809b43c5a3142f7e0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Revert "Disable default web font for language code "ml"" - change (mediawiki...UniversalLanguageSelector)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Revert "Disable default web font for language code "ml""
..


Revert "Disable default web font for language code "ml""

No longer needed given bug 51019.

This reverts commit 13dcfc9abc4e19920c01a6605d967a6a0ad5db8e.

Change-Id: Iae57333f4e0a22a371e83491a73e4685e9c044ff
---
M data/fontrepo/fonts/Meera/font.ini
M resources/js/ext.uls.webfonts.repository.js
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Santhosh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/data/fontrepo/fonts/Meera/font.ini 
b/data/fontrepo/fonts/Meera/font.ini
index cf9255b..d33ae15 100644
--- a/data/fontrepo/fonts/Meera/font.ini
+++ b/data/fontrepo/fonts/Meera/font.ini
@@ -1,5 +1,5 @@
 [Meera]
-languages=ml
+languages=ml*
 version=5.0.1
 license=GPL 3+ with exceptions
 licensefile=gpl-3.0.txt
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index 1229103..751e1f5 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -1,5 +1,5 @@
 // Please do not edit. This file is generated from data/fontrepo by 
data/fontrepo/scripts/compile.php
 ( function ( $ ) {
$.webfonts = $.webfonts || {};
-   $.webfonts.repository = 
{"base":"..\/data\/fontrepo\/fonts\/","languages":{"af":["system","OpenDyslexic"],"ahr":["Lohit
 
Marathi"],"akk":["Akkadian"],"am":["AbyssinicaSIL"],"ar":["Amiri"],"arb":["Amiri"],"arc":["Estarngelo
 Edessa","East Syriac Adiabene","SertoUrhoy"],"as":["system","Lohit 
Assamese"],"bh":["Lohit Devanagari"],"bho":["Lohit 
Devanagari"],"bk":["system","OpenDyslexic"],"bn":["Siyam Rupali","Lohit 
Bengali"],"bo":["Jomolhari"],"bpy":["Siyam Rupali","Lohit 
Bengali"],"bug":["Saweri"],"ca":["system","OpenDyslexic"],"cdo":["CharisSIL"],"cy":["system","OpenDyslexic"],"da":["system","OpenDyslexic"],"de":["system","OpenDyslexic"],"dv":["FreeFont-Thaana"],"dz":["Jomolhari"],"en":["system","OpenDyslexic"],"es":["system","OpenDyslexic"],"et":["system","OpenDyslexic"],"fa":["system","Iranian
 
Sans","Amiri"],"fi":["system","OpenDyslexic"],"fo":["system","OpenDyslexic"],"fr":["system","OpenDyslexic"],"fy":["system","OpenDyslexic"],"ga":["system","OpenDyslexic"],"gd":["system","OpenDyslexic"],"gl":["system","OpenDyslexic"],"gom":["Lohit
 Devanagari"],"gu":["Lohit Gujarati"],"hbo":["Taamey Frank 
CLM","Alef"],"he":["system","Alef","Miriam CLM","Taamey Frank 
CLM"],"hi":["Lohit 
Devanagari"],"hu":["system","OpenDyslexic"],"id":["system","OpenDyslexic"],"is":["system","OpenDyslexic"],"it":["system","OpenDyslexic"],"jv":["system","Tuladha
 Jejeg"],"jv-java":["Tuladha 
Jejeg"],"km":["KhmerOSbattambang","KhmerOS","KhmerOSbokor","KhmerOSfasthand","KhmerOSfreehand","KhmerOSmuol","KhmerOSmuollight","KhmerOSmuolpali","KhmerOSsiemreap"],"kn":["Lohit
 Kannada","Gubbi"],"kok":["Lohit 
Devanagari"],"lb":["system","OpenDyslexic"],"li":["system","OpenDyslexic"],"mai":["Lohit
 
Devanagari"],"mak":["Saweri"],"mi":["system","OpenDyslexic"],"ml":["system","Meera","AnjaliOldLipi"],"mr":["Lohit
 
Marathi"],"ms":["system","OpenDyslexic"],"my":["TharLon","Myanmar3","Padauk"],"nan":["Doulos
 SIL","CharisSIL"],"nb":["system","OpenDyslexic"],"ne":["Lohit 
Nepali","Madan"],"nl":["system","OpenDyslexic"],"oc":["system","OpenDyslexic"],"or":["Lohit
 Oriya","Utkal"],"pa":["Lohit 
Punjabi","Saab"],"pt":["system","OpenDyslexic"],"sa":["Lohit 
Devanagari"],"saz":["Pagul"],"sq":["system","OpenDyslexic"],"sux":["Akkadian"],"sv":["system","OpenDyslexic"],"sw":["system","OpenDyslexic"],"syc":["Estarngelo
 Edessa","East Syriac Adiabene","SertoUrhoy"],"ta":["system","Lohit 
Tamil","Lohit Tamil Classical","Thendral","Thenee"],"tcy":["Lohit 
Kannada","Gubbi"],"te":["Lohit 
Telugu"],"ti":["AbyssinicaSIL"],"tl":["system","OpenDyslexic"],"tr":["system","OpenDyslexic"],"wa":["system","OpenDyslexic"],"yi":["system","Alef"]},"fonts":{"AbyssinicaSIL":{"version":"1.200","license":"OFL
 
1.1","eot":"AbyssinicaSIL\/AbyssinicaSIL-R.eot","ttf":"AbyssinicaSIL\/AbyssinicaSIL-R.ttf","woff":"AbyssinicaSIL\/AbyssinicaSIL-R.woff"},"Akkadian":{"version":"2.56","license":null,"eot":"Akkadian\/Akkadian.eot","ttf":"Akkadian\/Akkadian.ttf","woff":"Akkadian\/Akkadian.woff"},"Alef":{"version":"1.0","license":"OFL
 
1.1","ttf":"Alef\/Alef-Regular.ttf","eot":"Alef\/Alef-Regular.eot","woff":"Alef\/Alef-Regular.woff","variants":{"bold":"Alef
 Bold"}},"Alef Bold":{"version":"1.0","license":"OFL 
1.1","fontweight":"bold","ttf":"Alef\/Alef-Bold.ttf","eot":"Alef\/Alef-Bold.eot","woff":"Alef\/Alef-Bold.woff"},"Amiri":{"version":"1.0.2","license":"OFL
 
1.1","ttf":"amiri\/amiri-regular.ttf","eot":"amiri\/amiri-regular.eot","woff":"amiri\/amiri-regular.woff","variants":{"bold":"Amiri
 Bold","bolditalic":"Amiri Bold Italic","italic":"Amiri Italic"}},"Amiri 
Bold":{"version":"1.0.2","license":"OFL 
1.1","fontweight":"bold","ttf":"amir

[MediaWiki-commits] [Gerrit] Disable ULS on ml.* - change (operations/mediawiki-config)

2013-07-09 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72702


Change subject: Disable ULS on ml.*
..

Disable ULS on ml.*

Bug: 51019
Change-Id: Iad9493b6e980ae99341fd44d8a10dd9a5aa5de40
---
M wmf-config/InitialiseSettings.php
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/02/72702/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 43e61d9..9eb7f9d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12163,6 +12163,12 @@
 
 'wmgUseUniversalLanguageSelector' => array(
'default' => true,
+   // Bug 51019
+   'mlwiki' => false,
+   'mlwikibooks' => false,
+   'mlwikiquote' => false,
+   'mlwikisource' => false,
+   'mlwiktionary' => false,
 ),
 
 'wmgULSPosition' => array(

-- 
To view, visit https://gerrit.wikimedia.org/r/72702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad9493b6e980ae99341fd44d8a10dd9a5aa5de40
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ULS to master - change (mediawiki/core)

2013-07-09 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72703


Change subject: ULS to master
..

ULS to master

Change-Id: I6d6d423d22a64a6072383167646d0aedb648787d
---
M extensions/UniversalLanguageSelector
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/72703/1

diff --git a/extensions/UniversalLanguageSelector 
b/extensions/UniversalLanguageSelector
index 13dcfc9..489b949 16
--- a/extensions/UniversalLanguageSelector
+++ b/extensions/UniversalLanguageSelector
-Subproject commit 13dcfc9abc4e19920c01a6605d967a6a0ad5db8e
+Subproject commit 489b949aa9e9a0634a4c634078b27c76a85aa9f4

-- 
To view, visit https://gerrit.wikimedia.org/r/72703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d6d423d22a64a6072383167646d0aedb648787d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf8
Gerrit-Owner: Nikerabbit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ULS to master - change (mediawiki/core)

2013-07-09 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72704


Change subject: ULS to master
..

ULS to master

Change-Id: Iae605b7dab7200b521de6edea290715ae7b6edb4
---
M extensions/UniversalLanguageSelector
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/04/72704/1

diff --git a/extensions/UniversalLanguageSelector 
b/extensions/UniversalLanguageSelector
index 13dcfc9..489b949 16
--- a/extensions/UniversalLanguageSelector
+++ b/extensions/UniversalLanguageSelector
-Subproject commit 13dcfc9abc4e19920c01a6605d967a6a0ad5db8e
+Subproject commit 489b949aa9e9a0634a4c634078b27c76a85aa9f4

-- 
To view, visit https://gerrit.wikimedia.org/r/72704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae605b7dab7200b521de6edea290715ae7b6edb4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf9
Gerrit-Owner: Nikerabbit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ULS to master - change (mediawiki/core)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: ULS to master
..


ULS to master

Change-Id: I6d6d423d22a64a6072383167646d0aedb648787d
---
M extensions/UniversalLanguageSelector
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extensions/UniversalLanguageSelector 
b/extensions/UniversalLanguageSelector
index 13dcfc9..489b949 16
--- a/extensions/UniversalLanguageSelector
+++ b/extensions/UniversalLanguageSelector
-Subproject commit 13dcfc9abc4e19920c01a6605d967a6a0ad5db8e
+Subproject commit 489b949aa9e9a0634a4c634078b27c76a85aa9f4

-- 
To view, visit https://gerrit.wikimedia.org/r/72703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d6d423d22a64a6072383167646d0aedb648787d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf8
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Disable ULS on ml.* - change (operations/mediawiki-config)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Disable ULS on ml.*
..


Disable ULS on ml.*

Bug: 51019
Change-Id: Iad9493b6e980ae99341fd44d8a10dd9a5aa5de40
---
M wmf-config/InitialiseSettings.php
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  Siebrand: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 43e61d9..9eb7f9d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12163,6 +12163,12 @@
 
 'wmgUseUniversalLanguageSelector' => array(
'default' => true,
+   // Bug 51019
+   'mlwiki' => false,
+   'mlwikibooks' => false,
+   'mlwikiquote' => false,
+   'mlwikisource' => false,
+   'mlwiktionary' => false,
 ),
 
 'wmgULSPosition' => array(

-- 
To view, visit https://gerrit.wikimedia.org/r/72702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad9493b6e980ae99341fd44d8a10dd9a5aa5de40
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ULS to master - change (mediawiki/core)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: ULS to master
..


ULS to master

Change-Id: Iae605b7dab7200b521de6edea290715ae7b6edb4
---
M extensions/UniversalLanguageSelector
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extensions/UniversalLanguageSelector 
b/extensions/UniversalLanguageSelector
index 13dcfc9..489b949 16
--- a/extensions/UniversalLanguageSelector
+++ b/extensions/UniversalLanguageSelector
-Subproject commit 13dcfc9abc4e19920c01a6605d967a6a0ad5db8e
+Subproject commit 489b949aa9e9a0634a4c634078b27c76a85aa9f4

-- 
To view, visit https://gerrit.wikimedia.org/r/72704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae605b7dab7200b521de6edea290715ae7b6edb4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf9
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tweaks to entry point file - change (mediawiki...Ask)

2013-07-09 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72705


Change subject: Tweaks to entry point file
..

Tweaks to entry point file

Change-Id: I280f19a0e0f0f7913afcc14b2edda5ba644f9fe5
---
M Ask.php
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ask 
refs/changes/05/72705/1

diff --git a/Ask.php b/Ask.php
index 508f5ea..c7ea60c 100644
--- a/Ask.php
+++ b/Ask.php
@@ -36,15 +36,15 @@
 define( 'Ask_VERSION', '0.1 alpha' );
 
 // Attempt to include the DataValues lib if that hasn't been done yet.
-// This is the path the DataValues entry point will be at when loaded as 
MediaWiki extension.
-if ( !defined( 'DataValues_VERSION' ) && file_exists( __DIR__ . 
'/../DataValues/DataValues.php' ) ) {
-   include_once( __DIR__ . '/../DataValues/DataValues.php' );
+// This is the path to the autoloader generated by composer in case of a 
composer install.
+if ( !defined( 'DataValues_VERSION' ) && is_readable( __DIR__ . 
'/vendor/autoload.php' ) ) {
+   include_once( __DIR__ . '/vendor/autoload.php' );
 }
 
 // Attempt to include the DataValues lib if that hasn't been done yet.
-// This is the path to the autoloader generated by composer in case of a 
composer install.
-if ( !defined( 'DataValues_VERSION' ) && file_exists( __DIR__ . 
'/vendor/autoload.php' ) ) {
-   include_once( __DIR__ . '/vendor/autoload.php' );
+// This is the path the DataValues entry point will be at when loaded as 
MediaWiki extension.
+if ( !defined( 'DataValues_VERSION' ) && is_readable( __DIR__ . 
'/../DataValues/DataValues.php' ) ) {
+   include_once( __DIR__ . '/../DataValues/DataValues.php' );
 }
 
 // Only initialize the extension when all dependencies are present.

-- 
To view, visit https://gerrit.wikimedia.org/r/72705
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I280f19a0e0f0f7913afcc14b2edda5ba644f9fe5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Ask
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Rename source folder to src - change (mediawiki...Ask)

2013-07-09 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72706


Change subject: Rename source folder to src
..

Rename source folder to src

Change-Id: I64f4c844300f701b4391f9bc356d39af2fa3d1eb
---
M Ask.php
R src/Ask/Comparable.php
R src/Ask/Deserializers/DescriptionDeserializer.php
R src/Ask/Deserializers/Deserializer.php
R src/Ask/Deserializers/DispatchingDeserializer.php
R src/Ask/Deserializers/Exceptions/DeserializationException.php
R src/Ask/Deserializers/Exceptions/InvalidAttributeException.php
R src/Ask/Deserializers/Exceptions/MissingAttributeException.php
R src/Ask/Deserializers/Exceptions/MissingTypeException.php
R src/Ask/Deserializers/Exceptions/UnsupportedTypeException.php
R src/Ask/Deserializers/SelectionRequestDeserializer.php
R src/Ask/Deserializers/SortExpressionDeserializer.php
R src/Ask/Deserializers/TypedObjectDeserializer.php
R src/Ask/Hashable.php
R src/Ask/Immutable.php
R src/Ask/Language/Description/AnyValue.php
R src/Ask/Language/Description/Conjunction.php
R src/Ask/Language/Description/Description.php
R src/Ask/Language/Description/DescriptionCollection.php
R src/Ask/Language/Description/Disjunction.php
R src/Ask/Language/Description/SomeProperty.php
R src/Ask/Language/Description/ValueDescription.php
R src/Ask/Language/Option/PropertyValueSortExpression.php
R src/Ask/Language/Option/QueryOptions.php
R src/Ask/Language/Option/SortExpression.php
R src/Ask/Language/Option/SortOptions.php
R src/Ask/Language/Query.php
R src/Ask/Language/Selection/PropertySelection.php
R src/Ask/Language/Selection/SelectionRequest.php
R src/Ask/Language/Selection/SubjectSelection.php
R src/Ask/Serializers/DescriptionSerializer.php
R src/Ask/Serializers/DispatchingSerializer.php
R src/Ask/Serializers/Exceptions/SerializationException.php
R src/Ask/Serializers/Exceptions/UnsupportedObjectException.php
R src/Ask/Serializers/QueryOptionsSerializer.php
R src/Ask/Serializers/QuerySerializer.php
R src/Ask/Serializers/SelectionRequestSerializer.php
R src/Ask/Serializers/Serializer.php
R src/Ask/Serializers/SortExpressionSerializer.php
R src/Ask/Typeable.php
40 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ask 
refs/changes/06/72706/1

diff --git a/Ask.php b/Ask.php
index 508f5ea..792d8e1 100644
--- a/Ask.php
+++ b/Ask.php
@@ -70,7 +70,7 @@
 
if ( $namespaceSegments[0] === 'Ask' ) {
if ( count( $namespaceSegments ) === 1 || $namespaceSegments[1] 
!== 'Tests' ) {
-   require_once __DIR__ . '/includes/' . $fileName;
+   require_once __DIR__ . '/src/' . $fileName;
}
}
 } );
diff --git a/includes/Ask/Comparable.php b/src/Ask/Comparable.php
similarity index 100%
rename from includes/Ask/Comparable.php
rename to src/Ask/Comparable.php
diff --git a/includes/Ask/Deserializers/DescriptionDeserializer.php 
b/src/Ask/Deserializers/DescriptionDeserializer.php
similarity index 100%
rename from includes/Ask/Deserializers/DescriptionDeserializer.php
rename to src/Ask/Deserializers/DescriptionDeserializer.php
diff --git a/includes/Ask/Deserializers/Deserializer.php 
b/src/Ask/Deserializers/Deserializer.php
similarity index 100%
rename from includes/Ask/Deserializers/Deserializer.php
rename to src/Ask/Deserializers/Deserializer.php
diff --git a/includes/Ask/Deserializers/DispatchingDeserializer.php 
b/src/Ask/Deserializers/DispatchingDeserializer.php
similarity index 100%
rename from includes/Ask/Deserializers/DispatchingDeserializer.php
rename to src/Ask/Deserializers/DispatchingDeserializer.php
diff --git a/includes/Ask/Deserializers/Exceptions/DeserializationException.php 
b/src/Ask/Deserializers/Exceptions/DeserializationException.php
similarity index 100%
rename from includes/Ask/Deserializers/Exceptions/DeserializationException.php
rename to src/Ask/Deserializers/Exceptions/DeserializationException.php
diff --git 
a/includes/Ask/Deserializers/Exceptions/InvalidAttributeException.php 
b/src/Ask/Deserializers/Exceptions/InvalidAttributeException.php
similarity index 100%
rename from includes/Ask/Deserializers/Exceptions/InvalidAttributeException.php
rename to src/Ask/Deserializers/Exceptions/InvalidAttributeException.php
diff --git 
a/includes/Ask/Deserializers/Exceptions/MissingAttributeException.php 
b/src/Ask/Deserializers/Exceptions/MissingAttributeException.php
similarity index 100%
rename from includes/Ask/Deserializers/Exceptions/MissingAttributeException.php
rename to src/Ask/Deserializers/Exceptions/MissingAttributeException.php
diff --git a/includes/Ask/Deserializers/Exceptions/MissingTypeException.php 
b/src/Ask/Deserializers/Exceptions/MissingTypeException.php
similarity index 100%
rename from includes/Ask/Deserializers/Exceptions/MissingTypeException.php
rename to src/Ask/Deserializers/Exceptions/MissingTypeException.php
diff --git a/includes/Ask/Deserializers/

[MediaWiki-commits] [Gerrit] Fix some bad @group annotations - change (mediawiki...Wikibase)

2013-07-09 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72707


Change subject: Fix some bad @group annotations
..

Fix some bad @group annotations

Note that EntityContentTest is abstract.

Change-Id: Icebcc69ab1d5e37185a3b0901858b4b8b42062a7
---
M repo/tests/phpunit/includes/api/SetSiteLinkTest.php
M repo/tests/phpunit/includes/content/EntityContentTest.php
2 files changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/07/72707/1

diff --git a/repo/tests/phpunit/includes/api/SetSiteLinkTest.php 
b/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
index 082ab62..4d61654 100644
--- a/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
+++ b/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
@@ -36,7 +36,6 @@
  * @group WikibaseAPI
  * @group SetSiteLinkTest
  * @group BreakingTheSlownessBarrier
- * @group XXX
  *
  * The database group has as a side effect that temporal database tables are 
created. This makes
  * it possible to test without poisoning a production database.
diff --git a/repo/tests/phpunit/includes/content/EntityContentTest.php 
b/repo/tests/phpunit/includes/content/EntityContentTest.php
index 8c6100b..d78b502 100644
--- a/repo/tests/phpunit/includes/content/EntityContentTest.php
+++ b/repo/tests/phpunit/includes/content/EntityContentTest.php
@@ -28,12 +28,6 @@
  * @ingroup WikibaseRepoTest
  * @ingroup Test
  *
- * @group Wikibase
- * @group WikibaseEntity
- * @group WikibaseContent
- *
- * @group Database
- *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  * @author John Erling Blad < jeb...@gmail.com >

-- 
To view, visit https://gerrit.wikimedia.org/r/72707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icebcc69ab1d5e37185a3b0901858b4b8b42062a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix some bad @group annotations - change (mediawiki...Wikibase)

2013-07-09 Thread Addshore (Code Review)

Addshore has submitted this change and it was merged.

Change subject: Fix some bad @group annotations
..


Fix some bad @group annotations

Note that EntityContentTest is abstract.

Change-Id: Icebcc69ab1d5e37185a3b0901858b4b8b42062a7
---
M repo/tests/phpunit/includes/api/SetSiteLinkTest.php
M repo/tests/phpunit/includes/content/EntityContentTest.php
2 files changed, 0 insertions(+), 7 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/tests/phpunit/includes/api/SetSiteLinkTest.php 
b/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
index 082ab62..4d61654 100644
--- a/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
+++ b/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
@@ -36,7 +36,6 @@
  * @group WikibaseAPI
  * @group SetSiteLinkTest
  * @group BreakingTheSlownessBarrier
- * @group XXX
  *
  * The database group has as a side effect that temporal database tables are 
created. This makes
  * it possible to test without poisoning a production database.
diff --git a/repo/tests/phpunit/includes/content/EntityContentTest.php 
b/repo/tests/phpunit/includes/content/EntityContentTest.php
index 8c6100b..d78b502 100644
--- a/repo/tests/phpunit/includes/content/EntityContentTest.php
+++ b/repo/tests/phpunit/includes/content/EntityContentTest.php
@@ -28,12 +28,6 @@
  * @ingroup WikibaseRepoTest
  * @ingroup Test
  *
- * @group Wikibase
- * @group WikibaseEntity
- * @group WikibaseContent
- *
- * @group Database
- *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  * @author John Erling Blad < jeb...@gmail.com >

-- 
To view, visit https://gerrit.wikimedia.org/r/72707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icebcc69ab1d5e37185a3b0901858b4b8b42062a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] deployment script: better error handling, make correct remot... - change (operations/dumps)

2013-07-09 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72708


Change subject: deployment script: better error handling, make correct remote 
dirs
..

deployment script: better error handling, make correct remote dirs

Change-Id: I59474ed0bea6303a002a9eb0e207b1954d4b6811
---
M deployment/copy-dir.sh
1 file changed, 14 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps 
refs/changes/08/72708/1

diff --git a/deployment/copy-dir.sh b/deployment/copy-dir.sh
index dff87f2..7874b10 100644
--- a/deployment/copy-dir.sh
+++ b/deployment/copy-dir.sh
@@ -32,10 +32,10 @@
 fi
 
 while [ $# -gt 0 ]; do
-if [ $1 == "--deploydir" ]; then
+if [ "$1" == "--deploydir" ]; then
deploydir="$2"
shift; shift
-elif [ $1 == "--hosts" ]; then
+elif [ "$1" == "--hosts" ]; then
hostnames="$2"
shift; shift
 else
@@ -107,8 +107,9 @@
 
 # make sure the directory exists before we try to copy it to the remote hosts
 if [ ! -d "$basedir/deploy/$deploydir" ]; then
-echo "Directory $basedir/deploy/$deploydir does not exist or it's not a 
directory, exiting"
-exit 1
+echo "Directory $basedir/deploy/$deploydir does not exist or it's not a 
directory,"
+echo "did you forget to specify --deploydir?"
+usage
 fi
 
 exitcode=0
@@ -116,7 +117,7 @@
 echo "Copying..."
 
 for h in $hostnames; do
-ssh root@$h "mkdir -p $basedir/deploy/"
+ssh root@$h "mkdir -p $deploymentbase"
 scp -rp -q -o ConnectTimeOut=20 $basedir/deploy/$deploydir  
root@$h:$deploymentbase/
 if [ $? -ne 0 ]; then
# serious whine
@@ -124,6 +125,10 @@
exitcode=1
 fi
 done
+
+if [ "$exitcode" == "1" ]; then
+exit 1
+fi
 
 # why don't we do this on the source host? because all kinds of people have 
access there, and we don't want them to 
 # see passwords or whatever that might be in config files.
@@ -137,5 +142,9 @@
 fi
 done
 
+if [ "$exitcode" == "1" ]; then
+exit 1
+fi
+
 echo "Done!"
 

-- 
To view, visit https://gerrit.wikimedia.org/r/72708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59474ed0bea6303a002a9eb0e207b1954d4b6811
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: ariel
Gerrit-Owner: ArielGlenn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Drop WebFonts and Narayam - change (translatewiki)

2013-07-09 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72709


Change subject: Drop WebFonts and Narayam
..

Drop WebFonts and Narayam

Change-Id: I53fc21b99ca6e15244a7623819265682279e171e
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 7 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/09/72709/1

diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index a0b0c34..1ac82c0 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -839,8 +839,9 @@
 Namespace Relations
 descmsg = nsrels-desc
 
-Narayam
-optional = narayam-help-page
+# Superseded by ULS
+# Narayam
+# optional = narayam-help-page
 
 Natural Language List
 descmsg = nll-desc
@@ -1620,9 +1621,10 @@
 Web Chat
 aliasfile = WebChat/WebChat.alias.php
 
-Web Fonts
-aliasfile = WebFonts/WebFonts.alias.php
-ignored = webfonts-help-page
+# Supserseded by ULS
+# Web Fonts
+# aliasfile = WebFonts/WebFonts.alias.php
+# ignored = webfonts-help-page
 
 White Space
 

-- 
To view, visit https://gerrit.wikimedia.org/r/72709
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53fc21b99ca6e15244a7623819265682279e171e
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove unmaintained extensions Narayam and WebFonts - change (translatewiki)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove unmaintained extensions Narayam and WebFonts
..


Remove unmaintained extensions Narayam and WebFonts

Change-Id: I65dd8ae7903077955dbb24ddfe88c5035387a0e5
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 4 insertions(+), 5 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index a0b0c34..48883e9 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -839,8 +839,8 @@
 Namespace Relations
 descmsg = nsrels-desc
 
-Narayam
-optional = narayam-help-page
+# Unmaintained / Siebrand 2013-07-09
+#Narayam
 
 Natural Language List
 descmsg = nll-desc
@@ -1620,9 +1620,8 @@
 Web Chat
 aliasfile = WebChat/WebChat.alias.php
 
-Web Fonts
-aliasfile = WebFonts/WebFonts.alias.php
-ignored = webfonts-help-page
+# Unmaintained / Siebrand 2013-07-09
+#Web Fonts
 
 White Space
 

-- 
To view, visit https://gerrit.wikimedia.org/r/72710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I65dd8ae7903077955dbb24ddfe88c5035387a0e5
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove unmaintained extensions Narayam and WebFonts - change (translatewiki)

2013-07-09 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72710


Change subject: Remove unmaintained extensions Narayam and WebFonts
..

Remove unmaintained extensions Narayam and WebFonts

Change-Id: I65dd8ae7903077955dbb24ddfe88c5035387a0e5
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/10/72710/1

diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index a0b0c34..48883e9 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -839,8 +839,8 @@
 Namespace Relations
 descmsg = nsrels-desc
 
-Narayam
-optional = narayam-help-page
+# Unmaintained / Siebrand 2013-07-09
+#Narayam
 
 Natural Language List
 descmsg = nll-desc
@@ -1620,9 +1620,8 @@
 Web Chat
 aliasfile = WebChat/WebChat.alias.php
 
-Web Fonts
-aliasfile = WebFonts/WebFonts.alias.php
-ignored = webfonts-help-page
+# Unmaintained / Siebrand 2013-07-09
+#Web Fonts
 
 White Space
 

-- 
To view, visit https://gerrit.wikimedia.org/r/72710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65dd8ae7903077955dbb24ddfe88c5035387a0e5
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] deployment script: better error handling, make correct remot... - change (operations/dumps)

2013-07-09 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: deployment script: better error handling, make correct remote 
dirs
..


deployment script: better error handling, make correct remote dirs

Change-Id: I59474ed0bea6303a002a9eb0e207b1954d4b6811
---
M deployment/copy-dir.sh
1 file changed, 14 insertions(+), 5 deletions(-)

Approvals:
  ArielGlenn: Verified; Looks good to me, approved



diff --git a/deployment/copy-dir.sh b/deployment/copy-dir.sh
index dff87f2..7874b10 100644
--- a/deployment/copy-dir.sh
+++ b/deployment/copy-dir.sh
@@ -32,10 +32,10 @@
 fi
 
 while [ $# -gt 0 ]; do
-if [ $1 == "--deploydir" ]; then
+if [ "$1" == "--deploydir" ]; then
deploydir="$2"
shift; shift
-elif [ $1 == "--hosts" ]; then
+elif [ "$1" == "--hosts" ]; then
hostnames="$2"
shift; shift
 else
@@ -107,8 +107,9 @@
 
 # make sure the directory exists before we try to copy it to the remote hosts
 if [ ! -d "$basedir/deploy/$deploydir" ]; then
-echo "Directory $basedir/deploy/$deploydir does not exist or it's not a 
directory, exiting"
-exit 1
+echo "Directory $basedir/deploy/$deploydir does not exist or it's not a 
directory,"
+echo "did you forget to specify --deploydir?"
+usage
 fi
 
 exitcode=0
@@ -116,7 +117,7 @@
 echo "Copying..."
 
 for h in $hostnames; do
-ssh root@$h "mkdir -p $basedir/deploy/"
+ssh root@$h "mkdir -p $deploymentbase"
 scp -rp -q -o ConnectTimeOut=20 $basedir/deploy/$deploydir  
root@$h:$deploymentbase/
 if [ $? -ne 0 ]; then
# serious whine
@@ -124,6 +125,10 @@
exitcode=1
 fi
 done
+
+if [ "$exitcode" == "1" ]; then
+exit 1
+fi
 
 # why don't we do this on the source host? because all kinds of people have 
access there, and we don't want them to 
 # see passwords or whatever that might be in config files.
@@ -137,5 +142,9 @@
 fi
 done
 
+if [ "$exitcode" == "1" ]; then
+exit 1
+fi
+
 echo "Done!"
 

-- 
To view, visit https://gerrit.wikimedia.org/r/72708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I59474ed0bea6303a002a9eb0e207b1954d4b6811
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: ariel
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added DispatchingDeserializer - change (mediawiki...Ask)

2013-07-09 Thread Denny Vrandecic (Code Review)

Denny Vrandecic has submitted this change and it was merged.

Change subject: Added DispatchingDeserializer
..


Added DispatchingDeserializer

Change-Id: I53802bf1ebb98887b6fe9d37974d732196d00cdb
---
A Tests/Phpunit/Deserializers/DispatchingDeserializerTest.php
A includes/Ask/Deserializers/DispatchingDeserializer.php
M includes/Ask/Serializers/DispatchingSerializer.php
3 files changed, 198 insertions(+), 0 deletions(-)

Approvals:
  Denny Vrandecic: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Tests/Phpunit/Deserializers/DispatchingDeserializerTest.php 
b/Tests/Phpunit/Deserializers/DispatchingDeserializerTest.php
new file mode 100644
index 000..ac31d7a
--- /dev/null
+++ b/Tests/Phpunit/Deserializers/DispatchingDeserializerTest.php
@@ -0,0 +1,123 @@
+
+ */
+class DispatchingDeserializerTest extends \PHPUnit_Framework_TestCase {
+
+   public function testCanConstructWithNoDeserializers() {
+   new DispatchingDeserializer( array() );
+   $this->assertTrue( true );
+   }
+
+   public function testCannotConstructWithNonDeserializers() {
+   $this->setExpectedException( 'InvalidArgumentException' );
+   new DispatchingDeserializer( array( 42, 'foobar' ) );
+   }
+
+   public function testCanDeserialize() {
+   $subDeserializer = $this->getMock( 
'Ask\Deserializers\Deserializer' );
+
+   $subDeserializer->expects( $this->exactly( 4 ) )
+   ->method( 'canDeserialize' )
+   ->will( $this->returnCallback( function( $value ) {
+   return $value > 9000;
+   } ) );
+
+   $serializer = new DispatchingDeserializer( array( 
$subDeserializer ) );
+
+   $this->assertFalse( $serializer->canDeserialize( 0 ) );
+   $this->assertFalse( $serializer->canDeserialize( 42 ) );
+   $this->assertTrue( $serializer->canDeserialize( 9001 ) );
+   $this->assertTrue( $serializer->canDeserialize( 31337 ) );
+   }
+
+   public function testDeserializeWithDeserializableValues() {
+   $subDeserializer = $this->getMock( 
'Ask\Deserializers\Deserializer' );
+
+   $subDeserializer->expects( $this->any() )
+   ->method( 'canDeserialize' )
+   ->will( $this->returnValue( true ) );
+
+   $subDeserializer->expects( $this->any() )
+   ->method( 'deserialize' )
+   ->will( $this->returnValue( 42 ) );
+
+   $serializer = new DispatchingDeserializer( array( 
$subDeserializer ) );
+
+   $this->assertEquals( 42, $serializer->deserialize( 'foo' ) );
+   $this->assertEquals( 42, $serializer->deserialize( null ) );
+   }
+
+   public function testSerializeWithUnserializableValue() {
+   $subDeserializer = $this->getMock( 
'Ask\Deserializers\Deserializer' );
+
+   $subDeserializer->expects( $this->once() )
+   ->method( 'canDeserialize' )
+   ->will( $this->returnValue( false ) );
+
+   $serializer = new DispatchingDeSerializer( array( 
$subDeserializer ) );
+
+   $this->setExpectedException( 
'Ask\Deserializers\Exceptions\DeserializationException' );
+   $serializer->deserialize( 0 );
+   }
+
+   public function testSerializeWithMultipleSubSerializers() {
+   $subDeserializer0 = $this->getMock( 
'Ask\Deserializers\Deserializer' );
+
+   $subDeserializer0->expects( $this->any() )
+   ->method( 'canDeserialize' )
+   ->will( $this->returnValue( true ) );
+
+   $subDeserializer0->expects( $this->any() )
+   ->method( 'deserialize' )
+   ->will( $this->returnValue( 42 ) );
+
+   $subDeserializer1 = $this->getMock( 
'Ask\Deserializers\Deserializer' );
+
+   $subDeserializer1->expects( $this->any() )
+   ->method( 'canDeserialize' )
+   ->will( $this->returnValue( false ) );
+
+   $subDeserializer2 = clone $subDeserializer1;
+
+   $serializer = new DispatchingDeserializer( array( 
$subDeserializer1, $subDeserializer0, $subDeserializer2 ) );
+
+   $this->assertEquals( 42, $serializer->deserialize( 'foo' ) );
+   }
+
+   public function testAddSerializer() {
+   $deserializer = new DispatchingDeserializer( array() );
+
+   $subDeserializer = $this->getMock( 
'Ask\Deserializers\Deserializer' );
+
+   $subDeserializer->expects( $this->any() )
+   ->method( 'canDeserialize' )
+   ->will( $this->returnValue( true ) );
+
+   $subDeserializer->expects( $this->any() )

[MediaWiki-commits] [Gerrit] Introduced TypedObjectDeserializer to avoid code duplication - change (mediawiki...Ask)

2013-07-09 Thread Denny Vrandecic (Code Review)

Denny Vrandecic has submitted this change and it was merged.

Change subject: Introduced TypedObjectDeserializer to avoid code duplication
..


Introduced TypedObjectDeserializer to avoid code duplication

Change-Id: I03dbd3321a7ddb66651bf98c8129cd8365bc4483
---
M includes/Ask/Deserializers/DescriptionDeserializer.php
M includes/Ask/Deserializers/SortExpressionDeserializer.php
A includes/Ask/Deserializers/TypedObjectDeserializer.php
3 files changed, 188 insertions(+), 109 deletions(-)

Approvals:
  Denny Vrandecic: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Ask/Deserializers/DescriptionDeserializer.php 
b/includes/Ask/Deserializers/DescriptionDeserializer.php
index 0eb7de7..553b25d 100644
--- a/includes/Ask/Deserializers/DescriptionDeserializer.php
+++ b/includes/Ask/Deserializers/DescriptionDeserializer.php
@@ -27,7 +27,7 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  */
-class DescriptionDeserializer implements Deserializer {
+class DescriptionDeserializer extends TypedObjectDeserializer {
 
protected $dataValueFactory;
 
@@ -35,62 +35,40 @@
$this->dataValueFactory = $dataValueFactory;
}
 
-   public function deserialize( $serialization ) {
-   $this->assertCanDeserialize( $serialization );
-   return $this->getDeserializedDescription( $serialization );
+   /**
+* @see TypedObjectDeserializer::getObjectType
+*
+* @since 0.1
+*
+* @return string
+*/
+   protected function getObjectType() {
+   return 'description';
}
 
-   protected function assertCanDeserialize( $serialization ) {
-   if ( !$this->hasObjectType( $serialization ) ) {
-   throw new MissingTypeException( $this );
-   }
-
-   if ( !$this->hasCorrectObjectType( $serialization ) ) {
-   throw new UnsupportedTypeException( 
$serialization['objectType'], $this );
-   }
+   /**
+* @see TypedObjectDeserializer::getSubTypeKey
+*
+* @since 0.1
+*
+* @return string
+*/
+   protected function getSubTypeKey() {
+   return 'descriptionType';
}
 
-   public function canDeserialize( $serialization ) {
-   return $this->hasObjectType( $serialization ) && 
$this->hasCorrectObjectType( $serialization );
-   }
-
-   protected function hasCorrectObjectType( $serialization ) {
-   return $serialization['objectType'] === 'description';
-   }
-
-   protected function hasObjectType( $serialization ) {
-   return is_array( $serialization )
-   && array_key_exists( 'objectType', $serialization );
-   }
-
-   protected function getDeserializedDescription( array $serialization ) {
-   if ( !array_key_exists( 'descriptionType', $serialization ) ) {
-   throw new MissingAttributeException(
-   'descriptionType',
-   $this
-   );
-   }
-
-   $this->requireAttribute( $serialization, 'descriptionType' );
-   $this->requireAttribute( $serialization, 'value' );
-   $this->assertAttributeIsArray( $serialization, 'value' );
-
-   $descriptionType = $serialization['descriptionType'];
-   $descriptionValue = $serialization['value'];
-
-   return $this->getDeserializedValue( $descriptionType, 
$descriptionValue );
-   }
-
-   protected function requireAttributes( array $array ) {
-   $requiredAttributes = func_get_args();
-   array_shift( $requiredAttributes );
-
-   foreach ( $requiredAttributes as $attribute ) {
-   $this->requireAttribute( $array, $attribute );
-   }
-   }
-
-   protected function getDeserializedValue( $descriptionType, 
$descriptionValue ) {
+   /**
+* @see TypedObjectDeserializer::getDeserializedValue
+*
+* @since 0.1
+*
+* @param string $descriptionType
+* @param array $descriptionValue
+*
+* @return object
+* @throws DeserializationException
+*/
+   protected function getDeserializedValue( $descriptionType, array 
$descriptionValue ) {
if ( $descriptionType === 'anyValue' ) {
return new AnyValue();
}
@@ -184,24 +162,6 @@
}
 
return $descriptions;
-   }
-
-   protected function requireAttribute( array $array, $attributeName ) {
-   if ( !array_key_exists( $attributeName, $array ) ) {
-   throw new MissingAttributeException(
-   $at

[MediaWiki-commits] [Gerrit] Allow rendering of entities without an ID. - change (mediawiki...Wikibase)

2013-07-09 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72711


Change subject: Allow rendering of entities without an ID.
..

Allow rendering of entities without an ID.

Refactors EntityView::getEditUrl()
and removes EntityView::extractEntityInfo().

Change-Id: I3c7eec765fc3e212614b4b21db76b07909ba640d
---
M repo/includes/EntityView.php
M repo/includes/ItemView.php
2 files changed, 47 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/11/72711/1

diff --git a/repo/includes/EntityView.php b/repo/includes/EntityView.php
index 628e562..803bd6c 100644
--- a/repo/includes/EntityView.php
+++ b/repo/includes/EntityView.php
@@ -119,7 +119,9 @@
wfProfileIn( __METHOD__ );
 
//NOTE: even though $editable is unused at the moment, we will 
need it for the JS-less editing model.
-   $info = $this->extractEntityInfo( $entity, $lang );
+   if ( !$lang ) {
+   $lang = $this->getLanguage();
+   }
 
$entityId = $entity->getEntity()->getId() ?: 'new'; // if id is 
not set, use 'new' suffix for css classes
$html = '';
@@ -127,8 +129,8 @@
$html .= wfTemplate( 'wb-entity',
$entity->getEntity()->getType(),
$entityId,
-   $info['lang']->getCode(),
-   $info['lang']->getDir(),
+   $lang->getCode(),
+   $lang->getDir(),
$this->getInnerHtml( $entity, $lang, $editable )
);
 
@@ -140,7 +142,7 @@
var $div = $( "" ).addClass( 
"wb-entity-spinner mw-small-spinner" );
$div.css( "top", $div.height() + "px" );
$div.css(
-   ( "' . $info['lang']->getDir() . '" === 
"rtl" ) ? "right" : "left",
+   ( "' . $lang->getDir() . '" === "rtl" ) 
? "right" : "left",
( parseInt( $( this ).width() / 2 ) - 
$div.width() / 2 ) + "px"
);
return $div;
@@ -162,6 +164,10 @@
}
 
protected function getFormattedIdForEntity( Entity $entity ) {
+   if ( !$entity->getId() ) {
+   return ''; //XXX: should probably throw an exception
+   }
+
return $this->idFormatter->format( $entity->getId() );
}
 
@@ -284,12 +290,16 @@
public function getHtmlForLabel( EntityContent $entity, Language $lang 
= null, $editable = true ) {
wfProfileIn( __METHOD__ );
 
-   $info = $this->extractEntityInfo( $entity, $lang );
-   $label = $entity->getEntity()->getLabel( 
$info['lang']->getCode() );
-   $editUrl = $this->getEditUrl( $info['id'], $info['lang'], 
'SetLabel' );
+   if ( !$lang ) {
+   $lang = $this->getLanguage();
+   }
+
+   $label = $entity->getEntity()->getLabel( $lang->getCode() );
+   $editUrl = $this->getEditUrl( 'SetLabel', $entity->getEntity(), 
$lang );
+   $prefixedId = $this->getFormattedIdForEntity( 
$entity->getEntity() );
 
$html = wfTemplate( 'wb-label',
-   $info['id'],
+   $prefixedId,
wfTemplate( 'wb-property',
$label === false ? 'wb-value-empty' : '',
$label === false ? wfMessage( 
'wikibase-label-empty' )->text() : htmlspecialchars( $label ),
@@ -314,9 +324,12 @@
public function getHtmlForDescription( EntityContent $entity, Language 
$lang = null, $editable = true ) {
wfProfileIn( __METHOD__ );
 
-   $info = $this->extractEntityInfo( $entity, $lang );
-   $description = $entity->getEntity()->getDescription( 
$info['lang']->getCode() );
-   $editUrl = $this->getEditUrl( $info['id'], $info['lang'], 
'SetDescription' );
+   if ( !$lang ) {
+   $lang = $this->getLanguage();
+   }
+
+   $description = $entity->getEntity()->getDescription( 
$lang->getCode() );
+   $editUrl = $this->getEditUrl( 'SetDescription', 
$entity->getEntity(), $lang );
 
$html = wfTemplate( 'wb-description',
wfTemplate( 'wb-property',
@@ -343,9 +356,12 @@
public function getHtmlForAliases( EntityContent $entity, Language 
$lang = null, $editable = true ) {
wfProfileIn( __METHOD__ );
 
-   $info = $this->extractEntityInfo( $entity, $lang );
-   $aliases = $entity->getEntity()->getAliases

[MediaWiki-commits] [Gerrit] Added SelectionRequestDeserializer - change (mediawiki...Ask)

2013-07-09 Thread Denny Vrandecic (Code Review)

Denny Vrandecic has submitted this change and it was merged.

Change subject: Added SelectionRequestDeserializer
..


Added SelectionRequestDeserializer

Change-Id: Ibaaf7d0c4a263370a65c190939e96b20d721880e
---
A Tests/Phpunit/Deserializers/SelectionRequestDeserializerTest.php
M Tests/Phpunit/Deserializers/SortExpressionDeserializerTest.php
A includes/Ask/Deserializers/SelectionRequestDeserializer.php
M includes/Ask/Deserializers/SortExpressionDeserializer.php
4 files changed, 286 insertions(+), 21 deletions(-)

Approvals:
  Denny Vrandecic: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Tests/Phpunit/Deserializers/SelectionRequestDeserializerTest.php 
b/Tests/Phpunit/Deserializers/SelectionRequestDeserializerTest.php
new file mode 100644
index 000..65e6960
--- /dev/null
+++ b/Tests/Phpunit/Deserializers/SelectionRequestDeserializerTest.php
@@ -0,0 +1,194 @@
+
+ */
+class SelectionRequestDeserializerTest extends \PHPUnit_Framework_TestCase {
+
+   protected function newSelectionRequestDeserializer() {
+   $dvFactory = new DataValueFactory();
+   $dvFactory->registerDataValue( 'string', 
'DataValues\StringValue' );
+
+   return new SelectionRequestDeserializer( $dvFactory );
+   }
+
+   /**
+* @dataProvider invalidObjectTypeProvider
+*/
+   public function testCannotDeserializeWithInvalidObjectType( 
$notASelectionRequest ) {
+   $serializer = $this->newSelectionRequestDeserializer();
+
+   $this->assertFalse( $serializer->canDeserialize( 
$notASelectionRequest ) );
+
+   $this->setExpectedException( 
'Ask\Deserializers\Exceptions\UnsupportedTypeException' );
+   $serializer->deserialize( $notASelectionRequest );
+   }
+
+   public function invalidObjectTypeProvider() {
+   $argLists = array();
+
+   $argLists[] = array( array(
+   'objectType' => 'foobar',
+   'selectionRequestType' => 'property',
+   'value' => array()
+   ) );
+
+   $argLists[] = array( array(
+   'objectType' => 'DESCRIPTION',
+   'selectionRequestType' => 'property',
+   'value' => array()
+   ) );
+
+   $argLists[] = array( array(
+   'objectType' => null,
+   'selectionRequestType' => 'property',
+   'value' => array()
+   ) );
+
+   $argLists[] = array( array(
+   'objectType' => array(),
+   'selectionRequestType' => 'property',
+   'value' => array()
+   ) );
+
+   $argLists[] = array( array(
+   'objectType' => 42,
+   'selectionRequestType' => 'property',
+   'value' => array()
+   ) );
+
+   return $argLists;
+   }
+
+   /**
+* @dataProvider missingObjectTypeProvider
+*/
+   public function testCannotDeserilaizeWithoutObjectType( 
$notASelectionRequest ) {
+   $serializer = $this->newSelectionRequestDeserializer();
+
+   $this->assertFalse( $serializer->canDeserialize( 
$notASelectionRequest ) );
+
+   $this->setExpectedException( 
'Ask\Deserializers\Exceptions\MissingTypeException' );
+   $serializer->deserialize( $notASelectionRequest );
+   }
+
+   public function missingObjectTypeProvider() {
+   $argLists = array();
+
+   $argLists[] = array( null );
+   $argLists[] = array( array() );
+   $argLists[] = array( 'foo bar' );
+
+   $argLists[] = array( array(
+   'selectionRequestType' => 'property',
+   'value' => array()
+   ) );
+
+   $argLists[] = array( array(
+   'ObjectType' => 'sortExpression',
+   'selectionRequestType' => 'property',
+   'value' => array()
+   ) );
+
+   $argLists[] = array( array(
+   'OBJECTTYPE' => 'sortExpression',
+   'selectionRequestType' => 'property',
+   'value' => array()
+   ) );
+
+   return $argLists;
+   }
+
+   public function testCannotDeserilaizeWithUnknownDescriptionType() {
+   $notASelectionRequest = array(
+   'objectType' => 'selectionRequest',
+   'selectionRequestType' => 'fooBar',
+   'value' => array()
+   );
+
+   $this->setExpectedException( 
'Ask\Deserializers\Exceptions\InvalidAttributeException' );
+   $this->newSelectionRequestDeserializ

[MediaWiki-commits] [Gerrit] mw.ViewPageTarget.init: Clarify reason for FF12 / FF14 black... - change (mediawiki...VisualEditor)

2013-07-09 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72712


Change subject: mw.ViewPageTarget.init: Clarify reason for FF12 / FF14 blacklist
..

mw.ViewPageTarget.init: Clarify reason for FF12 / FF14 blacklist

Follows-up I7a9dddb693091f.

Change-Id: I49a952f6b1714808cd4f063c48cf3102997f8746
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/12/72712/1

diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 7e40fd5..6d0d0a6 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -89,7 +89,8 @@
'msie': [['<=', 10]],
// Android 2.x and below "support" CE but don't trigger 
keyboard input
'android': [['<', 3]],
-   // Bug 50720 - apparently Firefox is broken in versions 
14 and below
+   // Firefox issues in versions 12 and below (bug 50780)
+   // Wikilink [[./]] bug in Firefox 14 and below (bug 
50720)
'firefox': [['<=', 14]],
// Blacklist all versions:
'opera': null,

-- 
To view, visit https://gerrit.wikimedia.org/r/72712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49a952f6b1714808cd4f063c48cf3102997f8746
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Settings for categories created by Extension:Babel for Ukrai... - change (operations/mediawiki-config)

2013-07-09 Thread DixonD (Code Review)

DixonD has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72713


Change subject: Settings for categories created by Extension:Babel for 
Ukrainian Wikisource.
..

Settings for categories created by Extension:Babel for Ukrainian
Wikisource.

The community has approved this change here:
https://uk.wikisource.org/w/index.php?oldid=30734#.D0.9A.D0.B0.D1.82.D0.B5.D0.B3.D0.BE.D1.80.D0.B8.D0.B7.D0.B0.D1.86.D1.96.D1.8F_.7B.7B.23babel.7D.7D

Change-Id: Ibe401354c596a8a5b2a95e278b5339881d9efe53
---
M wmf-config/InitialiseSettings.php
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/13/72713/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9eb7f9d..a859424 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11567,6 +11567,15 @@
'5' => 'User %code%-5',
'N' => 'User %code%-N',
), // Bug 46489
+'ukwikisource' => array(
+'0' => 'Користувачі %code%-0',
+'1' => 'Користувачі %code%-1',
+'2' => 'Користувачі %code%-2',
+'3' => 'Користувачі %code%-3',
+'4' => 'Користувачі %code%-4',
+'5' => 'Користувачі %code%-5',
+'N' => 'Користувачі %code%-N',
+),
'vowiktionary' => array(
'0' => 'Geban %code%-0',
'1' => 'Geban %code%-1',
@@ -11682,6 +11691,7 @@
'udmwiki' => 'User %code%', // Bug 47749
'ukwiki' => 'User %code%',
'ukwikinews' => 'User %code%', // Bug 46489
+'ukwikisource' => 'Користувачі %code%',
'wikidata' => 'User %code%',
'zhwiktionary' => '%wikiname%使用者',
'zhwiki' => '%code%_使用者',

-- 
To view, visit https://gerrit.wikimedia.org/r/72713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe401354c596a8a5b2a95e278b5339881d9efe53
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DixonD 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Optimized imports - change (mediawiki...Ask)

2013-07-09 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72714


Change subject: Optimized imports
..

Optimized imports

Change-Id: I40d48a0935981e49c8ca97c95b0ad45c05373314
---
M src/Ask/Deserializers/DescriptionDeserializer.php
A src/Ask/Deserializers/QueryOptionsDeserializer.php
M src/Ask/Deserializers/SortExpressionDeserializer.php
M src/Ask/Deserializers/TypedObjectDeserializer.php
M src/Ask/Serializers/QuerySerializer.php
M src/Ask/Serializers/SelectionRequestSerializer.php
6 files changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ask 
refs/changes/14/72714/1

diff --git a/src/Ask/Deserializers/DescriptionDeserializer.php 
b/src/Ask/Deserializers/DescriptionDeserializer.php
index 553b25d..a296498 100644
--- a/src/Ask/Deserializers/DescriptionDeserializer.php
+++ b/src/Ask/Deserializers/DescriptionDeserializer.php
@@ -4,15 +4,12 @@
 
 use Ask\Deserializers\Exceptions\DeserializationException;
 use Ask\Deserializers\Exceptions\InvalidAttributeException;
-use Ask\Deserializers\Exceptions\MissingAttributeException;
-use Ask\Deserializers\Exceptions\MissingTypeException;
 use Ask\Language\Description\AnyValue;
 use Ask\Language\Description\Conjunction;
 use Ask\Language\Description\Description;
 use Ask\Language\Description\Disjunction;
 use Ask\Language\Description\SomeProperty;
 use Ask\Language\Description\ValueDescription;
-use Ask\Deserializers\Exceptions\UnsupportedTypeException;
 use DataValues\DataValueFactory;
 
 /**
diff --git a/src/Ask/Deserializers/QueryOptionsDeserializer.php 
b/src/Ask/Deserializers/QueryOptionsDeserializer.php
new file mode 100644
index 000..1388bd5
--- /dev/null
+++ b/src/Ask/Deserializers/QueryOptionsDeserializer.php
@@ -0,0 +1,8 @@
+requireAttribute( $serialization, $this->getSubTypeKey() 
);
-   $this->requireAttribute( $serialization, 'value' );
+   $this->requireAttributes( $serialization, 'value' );
$this->assertAttributeIsArray( $serialization, 'value' );
 
$specificType = $serialization[$this->getSubTypeKey()];
diff --git a/src/Ask/Serializers/QuerySerializer.php 
b/src/Ask/Serializers/QuerySerializer.php
index 93138c6..3073a05 100644
--- a/src/Ask/Serializers/QuerySerializer.php
+++ b/src/Ask/Serializers/QuerySerializer.php
@@ -3,7 +3,6 @@
 namespace Ask\Serializers;
 
 use Ask\Language\Query;
-use Ask\Language\Selection\SelectionRequest;
 use Ask\Serializers\Exceptions\UnsupportedObjectException;
 
 /**
diff --git a/src/Ask/Serializers/SelectionRequestSerializer.php 
b/src/Ask/Serializers/SelectionRequestSerializer.php
index dbbf972..0f86c2c 100644
--- a/src/Ask/Serializers/SelectionRequestSerializer.php
+++ b/src/Ask/Serializers/SelectionRequestSerializer.php
@@ -2,7 +2,6 @@
 
 namespace Ask\Serializers;
 
-use Ask\Language\Option\QueryOptions;
 use Ask\Language\Selection\PropertySelection;
 use Ask\Language\Selection\SelectionRequest;
 use Ask\Language\Selection\SubjectSelection;

-- 
To view, visit https://gerrit.wikimedia.org/r/72714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I40d48a0935981e49c8ca97c95b0ad45c05373314
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Ask
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Don't trigger filter hits for nonexisting filter 0 - change (mediawiki...AbuseFilter)

2013-07-09 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72716


Change subject: Don't trigger filter hits for nonexisting filter 0
..

Don't trigger filter hits for nonexisting filter 0

AbuseFilter::getConsequencesForFilters uses filter ids as
array keys, that causes problems if both local and global
filters were hit, because array_merge reindexes arrays.

Example:
https://www.mediawiki.org/wiki/Special:AbuseLog/18687

Change-Id: I81cb110322461e30113199cfa313cd8e8e8b2262
---
M AbuseFilter.class.php
1 file changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/16/72716/1

diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 46a41a0..3eaf0bd 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -641,10 +641,7 @@
 
if ( count( $globalFilters ) ) {
$fdb = wfGetDB( DB_SLAVE, array(), 
$wgAbuseFilterCentralDB );
-   $consequences = array_merge(
-   $consequences,
-   self::loadConsequencesFromDB( $fdb, 
$globalFilters, 'global-' )
-   );
+   $consequences = $consequences + 
self::loadConsequencesFromDB( $fdb, $globalFilters, 'global-' );
}
 
return $consequences;

-- 
To view, visit https://gerrit.wikimedia.org/r/72716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81cb110322461e30113199cfa313cd8e8e8b2262
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tweaks to entry point file - change (mediawiki...Ask)

2013-07-09 Thread Denny Vrandecic (Code Review)

Denny Vrandecic has submitted this change and it was merged.

Change subject: Tweaks to entry point file
..


Tweaks to entry point file

Change-Id: I280f19a0e0f0f7913afcc14b2edda5ba644f9fe5
---
M Ask.php
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Denny Vrandecic: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Ask.php b/Ask.php
index 508f5ea..c7ea60c 100644
--- a/Ask.php
+++ b/Ask.php
@@ -36,15 +36,15 @@
 define( 'Ask_VERSION', '0.1 alpha' );
 
 // Attempt to include the DataValues lib if that hasn't been done yet.
-// This is the path the DataValues entry point will be at when loaded as 
MediaWiki extension.
-if ( !defined( 'DataValues_VERSION' ) && file_exists( __DIR__ . 
'/../DataValues/DataValues.php' ) ) {
-   include_once( __DIR__ . '/../DataValues/DataValues.php' );
+// This is the path to the autoloader generated by composer in case of a 
composer install.
+if ( !defined( 'DataValues_VERSION' ) && is_readable( __DIR__ . 
'/vendor/autoload.php' ) ) {
+   include_once( __DIR__ . '/vendor/autoload.php' );
 }
 
 // Attempt to include the DataValues lib if that hasn't been done yet.
-// This is the path to the autoloader generated by composer in case of a 
composer install.
-if ( !defined( 'DataValues_VERSION' ) && file_exists( __DIR__ . 
'/vendor/autoload.php' ) ) {
-   include_once( __DIR__ . '/vendor/autoload.php' );
+// This is the path the DataValues entry point will be at when loaded as 
MediaWiki extension.
+if ( !defined( 'DataValues_VERSION' ) && is_readable( __DIR__ . 
'/../DataValues/DataValues.php' ) ) {
+   include_once( __DIR__ . '/../DataValues/DataValues.php' );
 }
 
 // Only initialize the extension when all dependencies are present.

-- 
To view, visit https://gerrit.wikimedia.org/r/72705
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I280f19a0e0f0f7913afcc14b2edda5ba644f9fe5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Ask
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 
Gerrit-Reviewer: Denny Vrandecic 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove Utils::lookup[User]MultilangText() and related functions - change (mediawiki...Wikibase)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove Utils::lookup[User]MultilangText() and related functions
..


Remove Utils::lookup[User]MultilangText() and related functions

Replaced by language fallback chain.

Utils::languageChain(), which has no usage in Wikibase, is removed too.

Other removed functions include those lookup* functions' dependency,
Utils::filterMultilangText() and Utils::reorderArray().

Change-Id: I40ad9647ba489a7950773f21a2ec04273ef1fe9e
---
M lib/includes/LanguageFallbackChain.php
M lib/includes/Utils.php
M lib/tests/phpunit/LanguageFallbackChainTest.php
M repo/Wikibase.hooks.php
M repo/includes/actions/EditEntityAction.php
M repo/includes/actions/ViewEntityAction.php
6 files changed, 164 insertions(+), 250 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/LanguageFallbackChain.php 
b/lib/includes/LanguageFallbackChain.php
index ee91987..5802287 100644
--- a/lib/includes/LanguageFallbackChain.php
+++ b/lib/includes/LanguageFallbackChain.php
@@ -1,6 +1,7 @@
  finally fetched and translated value
 *  'language' => language code of the language which final value 
is in
 *  'source' => language code of the language where the value is 
fetched
-* ), or null when no data can be found.
+* ), or null when no "acceptable" data can be found.
 */
public function extractPreferredValue( $data ) {
 
@@ -80,4 +81,36 @@
 
return null;
}
+
+   /**
+* Try to fetch the best value in a multilingual data array first.
+* If no "acceptable" value exists, return any value known.
+*
+* @param string[] $data Multilingual data with language codes as keys
+*
+* @return null|array of three items: array(
+*  'value' => finally fetched and translated value
+*  'language' => language code of the language which final value 
is in
+*  'source' => language code of the language where the value is 
fetched
+* ), or null when no data with a valid language code can be found.
+*/
+   public function extractPreferredValueOrAny( $data ) {
+
+   $preferred = $this->extractPreferredValue( $data );
+   if ( $preferred ) {
+   return $preferred;
+   }
+
+   foreach ( $data as $code => $value ) {
+   if ( Language::isValidCode( $code ) ) {
+   return array(
+   'value' => $value,
+   'language' => $code,
+   'source' => $code,
+   );
+   }
+   }
+
+   return null;
+   }
 }
diff --git a/lib/includes/Utils.php b/lib/includes/Utils.php
index c6ce523..e12dc70 100644
--- a/lib/includes/Utils.php
+++ b/lib/includes/Utils.php
@@ -232,200 +232,6 @@
}
 
/**
-* Reorder an array with keys with the order given by a second array.
-*
-* Note that this function will do an intersection and then organize
-* the resulting array in the order given by the array in the second
-* argument. The sorting is not by the keys, but by the order the
-* entries are inserted into the resulting array. Another way to
-* describe this is to change the insertion order of the first array
-* according to the sequence of values in the second array.
-*
-* @since 0.1
-*
-* @param array $array
-* @param array $sequence
-*
-* @return array
-*/
-   static public function reorderArray( array $array, array $sequence ) {
-
-   // First create an intersection with our wanted entries as keys
-   $common = array_intersect_key( array_flip( $sequence ), $array 
);
-
-   // Then do a merge with our previous array, and with a new 
intersection
-   return array_merge( $common, array_intersect_key( $array, 
$common ) );
-   }
-
-   /**
-* Find the multilingual texts that has keys in the the sequence.
-*
-* The final result will be in the order given by the sequence.
-*
-* @since 0.1
-*
-* @param array $texts the key-value pairs to check for existence
-* @param array $sequence the list of keys that should exist
-*
-* @return array
-*/
-   static public function filterMultilangText( array $texts = null, array 
$sequence = null ) {
-
-   // Prerequisites for further processing
-   if ( is_null( $texts ) || is_null( $sequence ) ) {
-   return array(); // makes the simplest use case
-   }
-
-

[MediaWiki-commits] [Gerrit] Remove Serializer from SerializationException - change (mediawiki...Ask)

2013-07-09 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72717


Change subject: Remove Serializer from SerializationException
..

Remove Serializer from SerializationException

Change-Id: I7e3be7547c14b2c7c4d9d2102a1f0ae8031aaf39
---
M Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
M src/Ask/Serializers/DescriptionSerializer.php
M src/Ask/Serializers/DispatchingSerializer.php
M src/Ask/Serializers/Exceptions/SerializationException.php
M src/Ask/Serializers/Exceptions/UnsupportedObjectException.php
M src/Ask/Serializers/QueryOptionsSerializer.php
M src/Ask/Serializers/QuerySerializer.php
M src/Ask/Serializers/SelectionRequestSerializer.php
M src/Ask/Serializers/SortExpressionSerializer.php
9 files changed, 17 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ask 
refs/changes/17/72717/1

diff --git 
a/Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php 
b/Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
index 5b67a5f..5b4a3f1 100644
--- a/Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
+++ b/Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
@@ -20,29 +20,26 @@
 
public function testConstructorWithOnlyRequiredArguments() {
$object = (object)array( 'the' => 'game' );
-   $serializer = $this->getMock( 'Ask\Serializers\Serializer' );
 
-   $exception = new UnsupportedObjectException( $object, 
$serializer );
+   $exception = new UnsupportedObjectException( $object );
 
-   $this->assertRequiredFieldsAreSet( $exception, $object, 
$serializer );
+   $this->assertRequiredFieldsAreSet( $exception, $object );
}
 
public function testConstructorWithAllArguments() {
$object = (object)array( 'the' => 'game' );
-   $serializer = $this->getMock( 'Ask\Serializers\Serializer' );
$message = 'NyanData all the way across the sky!';
$previous = new \Exception( 'Onoez!' );
 
-   $exception = new UnsupportedObjectException( $object, 
$serializer, $message, $previous );
+   $exception = new UnsupportedObjectException( $object, $message, 
$previous );
 
-   $this->assertRequiredFieldsAreSet( $exception, $object, 
$serializer );
+   $this->assertRequiredFieldsAreSet( $exception, $object );
$this->assertEquals( $message, $exception->getMessage() );
$this->assertEquals( $previous, $exception->getPrevious() );
}
 
-   protected function assertRequiredFieldsAreSet( 
UnsupportedObjectException $exception, $object, $serializer ) {
+   protected function assertRequiredFieldsAreSet( 
UnsupportedObjectException $exception, $object ) {
$this->assertEquals( $object, 
$exception->getUnsupportedObject() );
-   $this->assertEquals( $serializer, $exception->getSerializer() );
}
 
 }
diff --git a/src/Ask/Serializers/DescriptionSerializer.php 
b/src/Ask/Serializers/DescriptionSerializer.php
index 40bf0a6..a998fe3 100644
--- a/src/Ask/Serializers/DescriptionSerializer.php
+++ b/src/Ask/Serializers/DescriptionSerializer.php
@@ -66,12 +66,12 @@
);
}
 
-   throw new UnsupportedObjectException( $description, $this );
+   throw new UnsupportedObjectException( $description );
}
 
protected function assertCanSerialize( $askObject ) {
if ( !$this->canSerialize( $askObject ) ) {
-   throw new UnsupportedObjectException( $askObject, $this 
);
+   throw new UnsupportedObjectException( $askObject );
}
}
 
diff --git a/src/Ask/Serializers/DispatchingSerializer.php 
b/src/Ask/Serializers/DispatchingSerializer.php
index db9a9ac..7f1aab2 100644
--- a/src/Ask/Serializers/DispatchingSerializer.php
+++ b/src/Ask/Serializers/DispatchingSerializer.php
@@ -44,7 +44,7 @@
}
}
 
-   throw new UnsupportedObjectException( $askObject, $this );
+   throw new UnsupportedObjectException( $askObject );
}
 
public function canSerialize( $askObject ) {
diff --git a/src/Ask/Serializers/Exceptions/SerializationException.php 
b/src/Ask/Serializers/Exceptions/SerializationException.php
index d7ac062..6593eb6 100644
--- a/src/Ask/Serializers/Exceptions/SerializationException.php
+++ b/src/Ask/Serializers/Exceptions/SerializationException.php
@@ -2,8 +2,6 @@
 
 namespace Ask\Serializers\Exceptions;
 
-use Ask\Serializers\Serializer;
-
 /**
  * @since 0.1
  *
@@ -15,19 +13,8 @@
  */
 abstract class SerializationException extends \RuntimeException {
 
-   protected $serializer;
-
-   public function __con

[MediaWiki-commits] [Gerrit] Added attributeValue to InvalidAttributeException - change (mediawiki...Ask)

2013-07-09 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72718


Change subject: Added attributeValue to InvalidAttributeException
..

Added attributeValue to InvalidAttributeException

Change-Id: I522941a30609aa6307142ac36857548a7bfa894a
---
M Tests/Phpunit/Deserializers/Exceptions/InvalidAttributeExceptionTest.php
M src/Ask/Deserializers/Exceptions/InvalidAttributeException.php
M src/Ask/Deserializers/Strategies/DescriptionDeserializationStrategy.php
M src/Ask/Deserializers/Strategies/SelectionRequestDeserializationStrategy.php
M src/Ask/Deserializers/Strategies/SortExpressionDeserializationStrategy.php
M src/Ask/Deserializers/Strategies/TypedDeserializationStrategy.php
M src/Ask/Deserializers/TypedObjectDeserializer.php
7 files changed, 26 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ask 
refs/changes/18/72718/1

diff --git 
a/Tests/Phpunit/Deserializers/Exceptions/InvalidAttributeExceptionTest.php 
b/Tests/Phpunit/Deserializers/Exceptions/InvalidAttributeExceptionTest.php
index 844c53d..a8110fb 100644
--- a/Tests/Phpunit/Deserializers/Exceptions/InvalidAttributeExceptionTest.php
+++ b/Tests/Phpunit/Deserializers/Exceptions/InvalidAttributeExceptionTest.php
@@ -20,26 +20,29 @@
 
public function testConstructorWithOnlyRequiredArguments() {
$attributeName = 'theGame';
+   $attributeValue = 'youJustLostIt';
 
-   $exception = new InvalidAttributeException( $attributeName );
+   $exception = new InvalidAttributeException( $attributeName, 
$attributeValue );
 
-   $this->assertRequiredFieldsAreSet( $exception, $attributeName );
+   $this->assertRequiredFieldsAreSet( $exception, $attributeName, 
$attributeValue );
}
 
public function testConstructorWithAllArguments() {
$attributeName = 'theGame';
+   $attributeValue = 'youJustLostIt';
$message = 'NyanData all the way across the sky!';
$previous = new \Exception( 'Onoez!' );
 
-   $exception = new InvalidAttributeException( $attributeName, 
$message, $previous );
+   $exception = new InvalidAttributeException( $attributeName, 
$attributeValue, $message, $previous );
 
-   $this->assertRequiredFieldsAreSet( $exception, $attributeName );
+   $this->assertRequiredFieldsAreSet( $exception, $attributeName, 
$attributeValue );
$this->assertEquals( $message, $exception->getMessage() );
$this->assertEquals( $previous, $exception->getPrevious() );
}
 
-   protected function assertRequiredFieldsAreSet( 
InvalidAttributeException $exception, $attributeName ) {
+   protected function assertRequiredFieldsAreSet( 
InvalidAttributeException $exception, $attributeName, $attributeValue ) {
$this->assertEquals( $attributeName, 
$exception->getAttributeName() );
+   $this->assertEquals( $attributeValue, 
$exception->getAttributeValue() );
}
 
 }
diff --git a/src/Ask/Deserializers/Exceptions/InvalidAttributeException.php 
b/src/Ask/Deserializers/Exceptions/InvalidAttributeException.php
index de70237..834d77a 100644
--- a/src/Ask/Deserializers/Exceptions/InvalidAttributeException.php
+++ b/src/Ask/Deserializers/Exceptions/InvalidAttributeException.php
@@ -14,14 +14,17 @@
 class InvalidAttributeException extends DeserializationException {
 
protected $attributeName;
+   protected $attributeValue;
 
/**
 * @param string $attributeName
+* @param mixed $attributeValue
 * @param string $message
 * @param \Exception $previous
 */
-   public function __construct( $attributeName, $message = '', \Exception 
$previous = null ) {
+   public function __construct( $attributeName, $attributeValue, $message 
= '', \Exception $previous = null ) {
$this->attributeName = $attributeName;
+   $this->attributeValue = $attributeValue;
 
parent::__construct( $message, $previous );
}
@@ -33,4 +36,11 @@
return $this->attributeName;
}
 
+   /**
+* @return string
+*/
+   public function getAttributeValue() {
+   return $this->attributeValue;
+   }
+
 }
diff --git 
a/src/Ask/Deserializers/Strategies/DescriptionDeserializationStrategy.php 
b/src/Ask/Deserializers/Strategies/DescriptionDeserializationStrategy.php
index f020e99..67da399 100644
--- a/src/Ask/Deserializers/Strategies/DescriptionDeserializationStrategy.php
+++ b/src/Ask/Deserializers/Strategies/DescriptionDeserializationStrategy.php
@@ -69,6 +69,7 @@
 
throw new InvalidAttributeException(
'descriptionType',
+   $descriptionType,
'The provided descrip

[MediaWiki-commits] [Gerrit] Show entity label with language fallback in action=history - change (mediawiki...Wikibase)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Show entity label with language fallback in action=history
..


Show entity label with language fallback in action=history

Change-Id: I79e99d34cf4e6318a7a865e5a910b144d23677da
---
M repo/includes/actions/HistoryEntityAction.php
1 file changed, 40 insertions(+), 1 deletion(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/actions/HistoryEntityAction.php 
b/repo/includes/actions/HistoryEntityAction.php
index 2fc5ff8..de38277 100644
--- a/repo/includes/actions/HistoryEntityAction.php
+++ b/repo/includes/actions/HistoryEntityAction.php
@@ -18,6 +18,38 @@
 class HistoryEntityAction extends \HistoryAction {
 
/**
+* @var LanguageFallbackChain
+*/
+   protected $languageFallbackChain;
+
+   /**
+* Get the language fallback chain for current context.
+*
+* @since 0.4
+*
+* @return LanguageFallbackChain
+*/
+   public function getLanguageFallbackChain() {
+   if ( $this->languageFallbackChain === null ) {
+   $this->languageFallbackChain = 
WikibaseRepo::getDefaultInstance()->getLanguageFallbackChainFactory()
+   ->newFromContext( $this->getContext() );
+   }
+
+   return $this->languageFallbackChain;
+   }
+
+   /**
+* Set language fallback chain.
+*
+* @since 0.4
+*
+* @param LanguageFallbackChain $chain
+*/
+   public function setLanguageFallbackChain( LanguageFallbackChain $chain 
) {
+   $this->languageFallbackChain = $chain;
+   }
+
+   /**
 * Returns the content of the page being viewed.
 *
 * @since 0.3
@@ -45,7 +77,14 @@
 
$entity = $content->getEntity();
 
-   $labelText = $entity->getLabel( 
$this->getContext()->getLanguage()->getCode() );
+   $languageFallbackChain = $this->getLanguageFallbackChain();
+   $labelData = 
$languageFallbackChain->extractPreferredValueOrAny( 
$content->getEntity()->getLabels() );
+
+   if ( $labelData ) {
+   $labelText = $labelData['value'];
+   } else {
+   $labelText = null;
+   }
 
$idPrefixer = 
WikibaseRepo::getDefaultInstance()->getIdFormatter();
$prefixedId = ucfirst( $idPrefixer->format( $entity->getId() ) 
);

-- 
To view, visit https://gerrit.wikimedia.org/r/71865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I79e99d34cf4e6318a7a865e5a910b144d23677da
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Liangent 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Denny Vrandecic 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] jquery.makeCollapsible: Togglers keyboard accessibility - change (mediawiki/core)

2013-07-09 Thread Matmarex (Code Review)

Matmarex has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72719


Change subject: jquery.makeCollapsible: Togglers keyboard accessibility
..

jquery.makeCollapsible: Togglers keyboard accessibility

Handle keypresses where e.which is 13 (Enter key) in addition to clicks.

Followup to If59590de.

Bug: 17616
Change-Id: Ib86833dbbbe8d5e4109090c70f1949ba97b9d119
---
M resources/jquery/jquery.makeCollapsible.js
1 file changed, 19 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/19/72719/1

diff --git a/resources/jquery/jquery.makeCollapsible.js 
b/resources/jquery/jquery.makeCollapsible.js
index 3a6c1b1..5ca0b12 100644
--- a/resources/jquery/jquery.makeCollapsible.js
+++ b/resources/jquery/jquery.makeCollapsible.js
@@ -143,7 +143,7 @@
}
 
/**
-* Handles clicking on the collapsible element toggle and other
+* Handles clicking/keypressing on the collapsible element toggle and 
other
 * situations where a collapsible element is toggled (e.g. the initial
 * toggle for collapsed ones).
 *
@@ -160,8 +160,11 @@
}
 
if ( e ) {
-   // Don't fire if a link was clicked, if requested  (for 
premade togglers by default)
-   if ( options.linksPassthru && $.nodeName( e.target, 'a' 
) ) {
+   if ( e.type === 'click' && options.linksPassthru && 
$.nodeName( e.target, 'a' ) ) {
+   // Don't fire if a link was clicked, if 
requested  (for premade togglers by default)
+   return;
+   } else if ( e.type === 'keypress' && e.which !== 13 ) {
+   // Only handle keypresses on the "Enter" key
return;
} else {
e.preventDefault();
@@ -227,7 +230,7 @@
}
 
return this.each( function () {
-   var $collapsible, collapseText, expandText, $toggle, 
clickHandler, buildDefaultToggleLink,
+   var $collapsible, collapseText, expandText, $toggle, 
actionHandler, buildDefaultToggleLink,
premadeToggleHandler, $toggleLink, $firstItem, 
collapsibleId, $customTogglers, firstval;
 
// Ensure class "mw-collapsible" is present in case 
.makeCollapsible()
@@ -245,8 +248,8 @@
collapseText = options.collapseText || 
$collapsible.attr( 'data-collapsetext' ) || mw.msg( 'collapsible-collapse' );
expandText = options.expandText || $collapsible.attr( 
'data-expandtext' ) || mw.msg( 'collapsible-expand' );
 
-   // Default click handler and toggle link to use when 
none is present
-   clickHandler = function ( e, opts ) {
+   // Default click/keypress handler and toggle link to 
use when none is present
+   actionHandler = function ( e, opts ) {
var defaultOpts = {
toggleClasses: true,
toggleText: { collapseText: 
collapseText, expandText: expandText }
@@ -262,7 +265,7 @@
.parent()
.prepend( ' [' )
.append( '] ' )
-   .on( 'click.mw-collapsible', 
clickHandler );
+   .on( 'click.mw-collapsible 
keypress.mw-collapsible', actionHandler );
};
 
// Default handler for clicking on premade toggles
@@ -291,14 +294,14 @@
 
// Bind the togglers
if ( $customTogglers && $customTogglers.length ) {
-   clickHandler = function ( e, opts ) {
+   actionHandler = function ( e, opts ) {
var defaultOpts = {};
opts = $.extend( defaultOpts, options, 
opts );
togglingHandler( $( this ), 
$collapsible, e, opts );
};
 
$toggleLink = $customTogglers;
-   $toggleLink.on( 'click.mw-collapsible', 
clickHandler );
+   $toggleLink.on( 'click.mw-collapsible 
keypress.mw-collapsible', actionHandler );
 
} else {
// If this is not a custom case, do the 
default: wrap the
@@ -313,8 +316,8 @@
if ( !$toggle.length ) {

[MediaWiki-commits] [Gerrit] LanguageWithConversion: Allow lazy language object construction - change (mediawiki...Wikibase)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: LanguageWithConversion: Allow lazy language object construction
..


LanguageWithConversion: Allow lazy language object construction

It seems language object construction is too expensive.

Change-Id: I4ae84a8c2dc40874733d64866db4076ff8f43fd8
---
M lib/includes/LanguageWithConversion.php
M lib/tests/phpunit/LanguageWithConversionTest.php
2 files changed, 161 insertions(+), 40 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/LanguageWithConversion.php 
b/lib/includes/LanguageWithConversion.php
index 5528e75..c8de917 100644
--- a/lib/includes/LanguageWithConversion.php
+++ b/lib/includes/LanguageWithConversion.php
@@ -33,7 +33,9 @@
static protected $objectCache = array();
 
protected $language;
+   protected $languageCode;
protected $sourceLanguage;
+   protected $sourceLanguageCode;
protected $parentLanguage;
 
protected $translateCache = array();
@@ -42,50 +44,104 @@
/**
 * Constructor.
 *
-* @param $language Language
-* @param $sourceLanguage null|Language
-* @param $parentLanguage null|Language
+* @param null|Language $language
+* @param string $languageCode
+* @param null|Language $sourceLanguage
+* @param null|string $sourceLanguageCode
+* @param null|Language $parentLanguage
 */
-   protected function __construct( Language $language, $sourceLanguage, 
$parentLanguage ) {
+   protected function __construct( $language, $languageCode, 
$sourceLanguage, $sourceLanguageCode, $parentLanguage ) {
$this->language = $language;
+   $this->languageCode = $languageCode;
$this->sourceLanguage = $sourceLanguage;
+   $this->sourceLanguageCode = $sourceLanguageCode;
$this->parentLanguage = $parentLanguage;
+   }
+
+   /**
+* Validate a language code. Logic taken from class Language.
+*
+* @param string $code Language code
+*
+* @return string Validated and normalized code.
+*
+* @throw MWException on invalid code
+*/
+   public static function validateLanguageCode( $code ) {
+   global $wgDummyLanguageCodes;
+
+   if ( isset( $wgDummyLanguageCodes[$code] ) ) {
+   $code = $wgDummyLanguageCodes[$code];
+   }
+
+   if ( !Language::isValidCode( $code )
+   || strcspn( $code, ":/\\\000" ) !== strlen( $code )
+   ) {
+   throw new MWException( __METHOD__ . ': invalid language 
code ' . $code );
+   }
+
+   return $code;
}
 
/**
 * Get a LanguageWithConversion object.
 *
-* @param $language Language: Language for this object
-* @param $sourceLanguage null|Language:
-*  Source language if this is a converted language, or null
+* @param $language Language|string: Language (code) for this object
+* @param $sourceLanguage null|Language|string:
+*  Source language (code) if this is a converted language, or 
null
 * @return LanguageWithConversion
 */
-   public static function factory( Language $language, $sourceLanguage = 
null ) {
-   $sourceCode = $sourceLanguage ? $sourceLanguage->getCode() : '';
-   if ( isset( 
self::$objectCache[$language->getCode()][$sourceCode] ) ) {
-   return 
self::$objectCache[$language->getCode()][$sourceCode];
+   public static function factory( $language, $sourceLanguage = null ) {
+   if ( is_string( $language ) ) {
+   $languageCode = self::validateLanguageCode( $language );
+   $language = null;
+   } else {
+   $languageCode = $language->getCode();
}
 
-   if ( $sourceLanguage ) {
-   $parentLanguage = $language->getParentLanguage();
-   $sourceParentLanguage = 
$sourceLanguage->getParentLanguage();
-   if ( !$parentLanguage || !$sourceParentLanguage ) {
-   throw new MWException( __METHOD__ .
-   ': either $language or $sourceLanguage 
does not support conversion.'
-   );
+   if ( is_string( $sourceLanguage ) ) {
+   $sourceLanguageCode = self::validateLanguageCode( 
$sourceLanguage );
+   $sourceLanguage = null;
+   } elseif ( $sourceLanguage === null ) {
+   $sourceLanguageCode = null;
+   } else {
+   $sour

[MediaWiki-commits] [Gerrit] Updated Ruby gems - change (qa/browsertests)

2013-07-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72720


Change subject: Updated Ruby gems
..

Updated Ruby gems

Change-Id: Ic75f93f1e6db23e3daa08e566a5405d661434715
---
M Gemfile.lock
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/20/72720/1

diff --git a/Gemfile.lock b/Gemfile.lock
index 80cd7a8..21d2d55 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,11 +5,12 @@
 childprocess (0.3.9)
   ffi (~> 1.0, >= 1.0.11)
 chunky_png (1.2.8)
-cucumber (1.3.2)
+cucumber (1.3.3)
   builder (>= 2.1.2)
   diff-lcs (>= 1.1.3)
   gherkin (~> 2.12.0)
-  multi_json (~> 1.3)
+  multi_json (~> 1.7.5)
+  multi_test (~> 0.0.1)
 data_magic (0.14)
   faker (>= 1.1.2)
   yml_reader (>= 0.2)
@@ -25,6 +26,7 @@
 i18n (0.6.4)
 json (1.8.0)
 multi_json (1.7.7)
+multi_test (0.0.1)
 net-http-persistent (2.8)
 page-object (0.9.0)
   page_navigation (>= 0.8)
@@ -36,7 +38,7 @@
 parallel_tests (0.15.0)
   parallel
 rake (10.1.0)
-rspec-expectations (2.13.0)
+rspec-expectations (2.14.0)
   diff-lcs (>= 1.1.3, < 2.0)
 rubyzip (0.9.9)
 selenium-webdriver (2.33.0)

-- 
To view, visit https://gerrit.wikimedia.org/r/72720
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic75f93f1e6db23e3daa08e566a5405d661434715
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] LanguageFallbackChainFactory: Avoid creating Language objects - change (mediawiki...Wikibase)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: LanguageFallbackChainFactory: Avoid creating Language objects
..


LanguageFallbackChainFactory: Avoid creating Language objects

Change-Id: Ief3adf61cfa24ee58f6d2a6eb99d5ba6fe56a098
---
M lib/includes/LanguageFallbackChainFactory.php
M lib/tests/phpunit/LanguageFallbackChainFactoryTest.php
2 files changed, 118 insertions(+), 15 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/LanguageFallbackChainFactory.php 
b/lib/includes/LanguageFallbackChainFactory.php
index 5bcfda1..475db4e 100644
--- a/lib/includes/LanguageFallbackChainFactory.php
+++ b/lib/includes/LanguageFallbackChainFactory.php
@@ -1,7 +1,7 @@
 languageCache[$languageCode][$mode] ) ) {
+   return $this->languageCache[$languageCode][$mode];
+   }
+
+   $chain = $this->buildFromLanguage( $languageCode, $mode );
+   $languageFallbackChain = new LanguageFallbackChain( $chain );
+
+   $this->languageCache[$languageCode][$mode] = 
$languageFallbackChain;
+
+   return $languageFallbackChain;
+   }
+
+   /**
+* Build fallback chain array for a given language or validated 
language code.
+*
+* @param $language Language object or language code as string
 * @param $mode bitfield of self::FALLBACK_*
 * @param LanguageFallbackChain[] $chain for recursive calls
 * @param array $fetched for recursive calls
 *
 * @return LanguageWithConversion[]
 */
-   public function buildFromLanguage( Language $language, $mode, &$chain = 
array(), &$fetched = array() ) {
+   public function buildFromLanguage( $language, $mode, &$chain = array(), 
&$fetched = array() ) {
wfProfileIn( __METHOD__ );
 
+   if ( is_string( $language ) ) {
+   $languageCode = $language;
+   } else {
+   $languageCode = $language->getCode();
+   }
+
if ( $mode & self::FALLBACK_SELF ) {
-   if ( !isset( $fetched[$language->getCode()] ) ) {
+   if ( !isset( $fetched[$languageCode] ) ) {
$chain[] = LanguageWithConversion::factory( 
$language );
-   $fetched[$language->getCode()] = true;
+   $fetched[$languageCode] = true;
}
}
 
if ( $mode & self::FALLBACK_VARIANTS ) {
+   if ( is_string( $language ) ) {
+   $language = Language::factory( $language );
+   }
$parentLanguage = $language->getParentLanguage();
if ( $parentLanguage ) {
// It's less likely to trigger conversion 
mistakes by converting
// zh-tw to zh-hk first instead of converting 
zh-cn to zh-tw.
$variantFallbacks = 
$parentLanguage->getConverter()
-   ->getVariantFallbacks( 
$language->getCode() );
+   ->getVariantFallbacks( $languageCode );
if ( is_array( $variantFallbacks ) ) {
$variants = array_unique( array_merge(
$variantFallbacks, 
$parentLanguage->getVariants()
@@ -119,13 +152,12 @@
}
 
foreach ( $variants as $variant ) {
-   $variantLanguage = Language::factory( 
$variant );
-   if ( isset( 
$fetched[$variantLanguage->getCode()] ) ) {
+   if ( isset( $fetched[$variant] ) ) {
continue;
}
 
-   $chain[] = 
LanguageWithConversion::factory( $language, $variantLanguage );
-   $fetched[$variantLanguage->getCode()] = 
true;
+   $chain[] = 
LanguageWithConversion::factory( $language, $variant );
+   $fetched[$variant] = true;
}
}
}
@@ -138,8 +170,8 @@
$recursiveMode = $mode;
$recursiveMode &= self::FALLBACK_VARIANTS;
$recursiveMode |= self::FALLBACK_SELF;
-   foreach ( $language->getFallbackLanguages() as $other ) 
{
-   $this->buildFromLanguage( Language::factory( 
$other ), $recursiveMode, $chai

[MediaWiki-commits] [Gerrit] LanguageFallbackChain: Avoid creating Language objects - change (mediawiki...Wikibase)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: LanguageFallbackChain: Avoid creating Language objects
..


LanguageFallbackChain: Avoid creating Language objects

Change-Id: I7c8c27026310adeeb8530de508e3fddb02fae557
---
M lib/includes/LanguageFallbackChain.php
M lib/tests/phpunit/LanguageFallbackChainTest.php
2 files changed, 10 insertions(+), 3 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/LanguageFallbackChain.php 
b/lib/includes/LanguageFallbackChain.php
index ee91987..795dbf2 100644
--- a/lib/includes/LanguageFallbackChain.php
+++ b/lib/includes/LanguageFallbackChain.php
@@ -66,8 +66,8 @@
public function extractPreferredValue( $data ) {
 
foreach ( $this->chain as $languageWithConversion ) {
-   $fetchCode = 
$languageWithConversion->getFetchLanguage()->getCode();
-   $languageCode = 
$languageWithConversion->getLanguage()->getCode();
+   $fetchCode = 
$languageWithConversion->getFetchLanguageCode();
+   $languageCode = 
$languageWithConversion->getLanguageCode();
 
if ( isset( $data[$fetchCode] ) ) {
return array(
diff --git a/lib/tests/phpunit/LanguageFallbackChainTest.php 
b/lib/tests/phpunit/LanguageFallbackChainTest.php
index 455c981..8a81978 100644
--- a/lib/tests/phpunit/LanguageFallbackChainTest.php
+++ b/lib/tests/phpunit/LanguageFallbackChainTest.php
@@ -26,7 +26,7 @@
 */
public function testExtractPreferredValue( $lang, $mode, $data, 
$expected ) {
$factory = new LanguageFallbackChainFactory();
-   $chain = $factory->newFromLanguage( \Language::factory( $lang 
), $mode );
+   $chain = $factory->newFromLanguageCode( $lang, $mode );
 
$resolved = $chain->extractPreferredValue( $data );
 
@@ -38,6 +38,8 @@
'en' => 'foo',
'nl' => 'bar',
'zh-cn' => '测试',
+   'lzh' => '試',
+   'zh-classical' => '驗',
);
 
return array(
@@ -46,6 +48,11 @@
'language' => 'en',
'source' => 'en',
) ),
+   array( 'zh-classical', 
LanguageFallbackChainFactory::FALLBACK_ALL, $data, array(
+   'value' => '試',
+   'language' => 'lzh',
+   'source' => 'lzh',
+   ) ),
array( 'nl', 
LanguageFallbackChainFactory::FALLBACK_ALL, $data, array(
'value' => 'bar',
'language' => 'nl',

-- 
To view, visit https://gerrit.wikimedia.org/r/72353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c8c27026310adeeb8530de508e3fddb02fae557
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Liangent 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Denny Vrandecic 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] SerializationOptions: Avoid creating Language objects - change (mediawiki...Wikibase)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: SerializationOptions: Avoid creating Language objects
..


SerializationOptions: Avoid creating Language objects

Change-Id: I8884ac5c90883628282c8406a474974dd53408c8
---
M lib/includes/serializers/SerializationOptions.php
M lib/tests/phpunit/serializers/SerializationOptionsTest.php
2 files changed, 3 insertions(+), 6 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/serializers/SerializationOptions.php 
b/lib/includes/serializers/SerializationOptions.php
index a026d76..9236f3f 100644
--- a/lib/includes/serializers/SerializationOptions.php
+++ b/lib/includes/serializers/SerializationOptions.php
@@ -1,7 +1,6 @@
 getLanguageFallbackChainFactory()->newFromLanguage(
-   Language::factory( $languageCode ), 
LanguageFallbackChainFactory::FALLBACK_SELF
+   $languageFallbackChain = 
$this->getLanguageFallbackChainFactory()->newFromLanguageCode(
+   $languageCode, 
LanguageFallbackChainFactory::FALLBACK_SELF
);
}
 
diff --git a/lib/tests/phpunit/serializers/SerializationOptionsTest.php 
b/lib/tests/phpunit/serializers/SerializationOptionsTest.php
index 106ba97..91e6a9d 100644
--- a/lib/tests/phpunit/serializers/SerializationOptionsTest.php
+++ b/lib/tests/phpunit/serializers/SerializationOptionsTest.php
@@ -58,9 +58,7 @@
 
foreach ( $languages as $languageKey => &$languageValue ) {
if ( !is_numeric( $languageKey ) ) {
-   $languageValue = $factory->newFromLanguage(
-   \Language::factory( $languageKey ), 
$languageValue
-   );
+   $languageValue = $factory->newFromLanguageCode( 
$languageKey, $languageValue );
}
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/72354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8884ac5c90883628282c8406a474974dd53408c8
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Liangent 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Denny Vrandecic 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] rake wrapper to run puppet module tests - change (operations/puppet)

2013-07-09 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72721


Change subject: rake wrapper to run puppet module tests
..

rake wrapper to run puppet module tests

Some of our puppet modules have tests based using
puppetlabs_spec_helper. One would usually cd under the module and simply
invokes 'rake spec' to have a test report and repeat this for other
modules.  I noticed the fixtures directory are always recloned when
doing so which is not very nice when you are repeating the command over
and over.  We are also lacking a way to run unit tests on all modules.

This patch creates a new 'spec' targets in our rakefile which one could
invoke as:

 rake spec

The task does:
- lookup files named modules/*/Rakefile
- invoke 'rake spec_prep' to have the fixtures cloned from github
  whenever they do not exist (but not update them :/)
- run git pull to update the fixtures if they were already cloned
- invoke 'rake spec_standalone' which runs the tests using the already
  existing fixtures and does not delete them on completion.

That should let us run unit tests in Jenkins with a job that simplies
does 'rake spec' and let everyone easily run all the tests by running
that command.

Change-Id: I5ea0cee53cf52f4abee243f780fa31649a7c5282
---
M rakefile
1 file changed, 65 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/72721/1

diff --git a/rakefile b/rakefile
index 996d3f3..547a529 100644
--- a/rakefile
+++ b/rakefile
@@ -156,6 +156,71 @@
sh "puppet parser validate #{$puppetcolor} #{manifests}"
 end
 
+desc "Run spec tests found in modules"
+task :spec do
+
+   # Hold a list of modules not passing tests
+   failed_modules = []
+
+   # Invoke rake whenever a module has a Rakefile
+   FileList["modules/*/Rakefile"].each do |rakefile|
+
+   module_name = rakefile.match('modules/(.+)/')[1]
+
+   if not run_module_spec(module_name)
+   failed_modules << module_name  # recording
+   end
+   puts "\n"
+
+   end
+
+   puts '-' * 80
+   puts 'Finished running tests for all modules'
+   puts '-' * 80
+
+   unless failed_modules.empty?
+   puts "\nThe following modules are NOT passing tests:\n"
+   puts '- ' + failed_modules * "\n- "
+   puts
+   raise "Some modules had failures, sorry."
+   end
+end
+
+# Wrapper to run rspec in a module
+def run_module_spec(module_name)
+
+   puts '-' * 80
+   puts "Running rspec tests for module #{module_name}"
+   puts '-' * 80
+
+   Dir.chdir("modules/#{module_name}") do
+
+   puts "Initializing fixtures..."
+   # This will clone github repositories containing fixtures 
whenever they
+   # do not exist.
+   system('rake spec_prep')
+
+   puts "Updating fixtures..."
+   # If the git repositories already existed, they haven't been 
updated
+   FileList[Dir.pwd + '/spec/fixtures/modules/*'].each do |fixture|
+   # `spec_prep` symlink the tested module and we only 
want to
+   # update real directories.
+   if File.symlink?(fixture) or not 
File.directory?(fixture)
+   puts "Skipping #{fixture}"
+   next
+   end
+   puts "git pull in #{fixture}"
+   system("cd #{fixture}; git pull")
+   end
+
+   puts "All fixtures should now be up to date."
+   puts
+   puts "Invoking tests on module #{module_name}"
+   system('rake spec_standalone')
+   end
+end
+
+
 =begin lint
 amass profit
 donate!

-- 
To view, visit https://gerrit.wikimedia.org/r/72721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ea0cee53cf52f4abee243f780fa31649a7c5282
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix last commit add MathDump.php file - change (mediawiki...MathSearch)

2013-07-09 Thread Physikerwelt (Code Review)

Physikerwelt has submitted this change and it was merged.

Change subject: Fix last commit add MathDump.php file
..


Fix last commit
add MathDump.php file

Change-Id: If13c029f7843daa61c7a2a5f031802c97836ca5c
---
A maintenance/MathDump.php
1 file changed, 75 insertions(+), 0 deletions(-)

Approvals:
  Physikerwelt: Verified; Looks good to me, approved



diff --git a/maintenance/MathDump.php b/maintenance/MathDump.php
new file mode 100644
index 000..9abf1c9
--- /dev/null
+++ b/maintenance/MathDump.php
@@ -0,0 +1,75 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @ingroup Maintenance
+ */
+# Alert the user that this is not a valid entry point to MediaWiki if they try 
to access the special pages file directly.
+if ( !defined( 'MEDIAWIKI' ) ) {
+   die( "This is not a valid entry point to MediaWiki.\n"
+   . "To run the script use:\n"
+   . 'php ../../../maintenance/dumpBackup.php --current 
--plugin=MathMLFilter:./MathDump.php --filter=mathml'
+   . "\n" );
+}
+
+/**
+ * Simple dump output filter to exclude all talk pages.
+ * @ingroup Dump
+ */
+class MathMLFilter extends DumpFilter {
+   public static function register( $backupDumper ) {
+   $backupDumper->registerFilter( 'mathml', 'MathMLFilter' );
+
+   }
+
+   /**
+* Callback function that replaces TeX by MathML
+* @param array $match
+* @return string
+*/
+   private static function renderMath( $match ) {
+   $formula = $match[1];
+   $renderer = MathRenderer::getRenderer( $formula, array(), 
MW_MATH_LATEXML );
+   $renderer->render();
+   // TODO: check if there is a Mediawiki function for that
+   $res = htmlspecialchars( $renderer->getMathml() );
+   return $res;
+   }
+
+   /**
+* Replaces the math tags with rendered Mathml
+* @param unknown $pText
+* @return string
+*/
+   private static function replaceMath( $pText ) {
+   $pText = Sanitizer::removeHTMLcomments( $pText );
+   return preg_replace_callback( 
"# $(.*?)$ #s", 'self::renderMath', $pText );
+   }
+
+
+   /**
+* @param $rev
+* @param $string the revision text
+*/
+   function writeRevision( $rev, $string ) {
+   if ( $this->sendingThisPage ) {
+   $string = $this->replaceMath( $string );
+   $this->sink->writeRevision( $rev, $string );
+   }
+   }
+
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/72722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If13c029f7843daa61c7a2a5f031802c97836ca5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Physikerwelt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix last commit add MathDump.php file - change (mediawiki...MathSearch)

2013-07-09 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72722


Change subject: Fix last commit add MathDump.php file
..

Fix last commit
add MathDump.php file

Change-Id: If13c029f7843daa61c7a2a5f031802c97836ca5c
---
A maintenance/MathDump.php
1 file changed, 75 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch 
refs/changes/22/72722/1

diff --git a/maintenance/MathDump.php b/maintenance/MathDump.php
new file mode 100644
index 000..9abf1c9
--- /dev/null
+++ b/maintenance/MathDump.php
@@ -0,0 +1,75 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @ingroup Maintenance
+ */
+# Alert the user that this is not a valid entry point to MediaWiki if they try 
to access the special pages file directly.
+if ( !defined( 'MEDIAWIKI' ) ) {
+   die( "This is not a valid entry point to MediaWiki.\n"
+   . "To run the script use:\n"
+   . 'php ../../../maintenance/dumpBackup.php --current 
--plugin=MathMLFilter:./MathDump.php --filter=mathml'
+   . "\n" );
+}
+
+/**
+ * Simple dump output filter to exclude all talk pages.
+ * @ingroup Dump
+ */
+class MathMLFilter extends DumpFilter {
+   public static function register( $backupDumper ) {
+   $backupDumper->registerFilter( 'mathml', 'MathMLFilter' );
+
+   }
+
+   /**
+* Callback function that replaces TeX by MathML
+* @param array $match
+* @return string
+*/
+   private static function renderMath( $match ) {
+   $formula = $match[1];
+   $renderer = MathRenderer::getRenderer( $formula, array(), 
MW_MATH_LATEXML );
+   $renderer->render();
+   // TODO: check if there is a Mediawiki function for that
+   $res = htmlspecialchars( $renderer->getMathml() );
+   return $res;
+   }
+
+   /**
+* Replaces the math tags with rendered Mathml
+* @param unknown $pText
+* @return string
+*/
+   private static function replaceMath( $pText ) {
+   $pText = Sanitizer::removeHTMLcomments( $pText );
+   return preg_replace_callback( 
"# $(.*?)$ #s", 'self::renderMath', $pText );
+   }
+
+
+   /**
+* @param $rev
+* @param $string the revision text
+*/
+   function writeRevision( $rev, $string ) {
+   if ( $this->sendingThisPage ) {
+   $string = $this->replaceMath( $string );
+   $this->sink->writeRevision( $rev, $string );
+   }
+   }
+
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/72722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If13c029f7843daa61c7a2a5f031802c97836ca5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Rename source folder to src - change (mediawiki...Ask)

2013-07-09 Thread Denny Vrandecic (Code Review)

Denny Vrandecic has submitted this change and it was merged.

Change subject: Rename source folder to src
..


Rename source folder to src

Change-Id: I64f4c844300f701b4391f9bc356d39af2fa3d1eb
---
M Ask.php
R src/Ask/Comparable.php
R src/Ask/Deserializers/DescriptionDeserializer.php
R src/Ask/Deserializers/Deserializer.php
R src/Ask/Deserializers/DispatchingDeserializer.php
R src/Ask/Deserializers/Exceptions/DeserializationException.php
R src/Ask/Deserializers/Exceptions/InvalidAttributeException.php
R src/Ask/Deserializers/Exceptions/MissingAttributeException.php
R src/Ask/Deserializers/Exceptions/MissingTypeException.php
R src/Ask/Deserializers/Exceptions/UnsupportedTypeException.php
R src/Ask/Deserializers/SelectionRequestDeserializer.php
R src/Ask/Deserializers/SortExpressionDeserializer.php
R src/Ask/Deserializers/TypedObjectDeserializer.php
R src/Ask/Hashable.php
R src/Ask/Immutable.php
R src/Ask/Language/Description/AnyValue.php
R src/Ask/Language/Description/Conjunction.php
R src/Ask/Language/Description/Description.php
R src/Ask/Language/Description/DescriptionCollection.php
R src/Ask/Language/Description/Disjunction.php
R src/Ask/Language/Description/SomeProperty.php
R src/Ask/Language/Description/ValueDescription.php
R src/Ask/Language/Option/PropertyValueSortExpression.php
R src/Ask/Language/Option/QueryOptions.php
R src/Ask/Language/Option/SortExpression.php
R src/Ask/Language/Option/SortOptions.php
R src/Ask/Language/Query.php
R src/Ask/Language/Selection/PropertySelection.php
R src/Ask/Language/Selection/SelectionRequest.php
R src/Ask/Language/Selection/SubjectSelection.php
R src/Ask/Serializers/DescriptionSerializer.php
R src/Ask/Serializers/DispatchingSerializer.php
R src/Ask/Serializers/Exceptions/SerializationException.php
R src/Ask/Serializers/Exceptions/UnsupportedObjectException.php
R src/Ask/Serializers/QueryOptionsSerializer.php
R src/Ask/Serializers/QuerySerializer.php
R src/Ask/Serializers/SelectionRequestSerializer.php
R src/Ask/Serializers/Serializer.php
R src/Ask/Serializers/SortExpressionSerializer.php
R src/Ask/Typeable.php
40 files changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Denny Vrandecic: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Ask.php b/Ask.php
index 508f5ea..792d8e1 100644
--- a/Ask.php
+++ b/Ask.php
@@ -70,7 +70,7 @@
 
if ( $namespaceSegments[0] === 'Ask' ) {
if ( count( $namespaceSegments ) === 1 || $namespaceSegments[1] 
!== 'Tests' ) {
-   require_once __DIR__ . '/includes/' . $fileName;
+   require_once __DIR__ . '/src/' . $fileName;
}
}
 } );
diff --git a/includes/Ask/Comparable.php b/src/Ask/Comparable.php
similarity index 100%
rename from includes/Ask/Comparable.php
rename to src/Ask/Comparable.php
diff --git a/includes/Ask/Deserializers/DescriptionDeserializer.php 
b/src/Ask/Deserializers/DescriptionDeserializer.php
similarity index 100%
rename from includes/Ask/Deserializers/DescriptionDeserializer.php
rename to src/Ask/Deserializers/DescriptionDeserializer.php
diff --git a/includes/Ask/Deserializers/Deserializer.php 
b/src/Ask/Deserializers/Deserializer.php
similarity index 100%
rename from includes/Ask/Deserializers/Deserializer.php
rename to src/Ask/Deserializers/Deserializer.php
diff --git a/includes/Ask/Deserializers/DispatchingDeserializer.php 
b/src/Ask/Deserializers/DispatchingDeserializer.php
similarity index 100%
rename from includes/Ask/Deserializers/DispatchingDeserializer.php
rename to src/Ask/Deserializers/DispatchingDeserializer.php
diff --git a/includes/Ask/Deserializers/Exceptions/DeserializationException.php 
b/src/Ask/Deserializers/Exceptions/DeserializationException.php
similarity index 100%
rename from includes/Ask/Deserializers/Exceptions/DeserializationException.php
rename to src/Ask/Deserializers/Exceptions/DeserializationException.php
diff --git 
a/includes/Ask/Deserializers/Exceptions/InvalidAttributeException.php 
b/src/Ask/Deserializers/Exceptions/InvalidAttributeException.php
similarity index 100%
rename from includes/Ask/Deserializers/Exceptions/InvalidAttributeException.php
rename to src/Ask/Deserializers/Exceptions/InvalidAttributeException.php
diff --git 
a/includes/Ask/Deserializers/Exceptions/MissingAttributeException.php 
b/src/Ask/Deserializers/Exceptions/MissingAttributeException.php
similarity index 100%
rename from includes/Ask/Deserializers/Exceptions/MissingAttributeException.php
rename to src/Ask/Deserializers/Exceptions/MissingAttributeException.php
diff --git a/includes/Ask/Deserializers/Exceptions/MissingTypeException.php 
b/src/Ask/Deserializers/Exceptions/MissingTypeException.php
similarity index 100%
rename from includes/Ask/Deserializers/Exceptions/MissingTypeException.php
rename to src/Ask/Deserializers/Exceptions/MissingTypeException.php
diff --git a/includes/Ask/Deserializers/Exceptions/UnsupportedTypeException.php 
b/s

[MediaWiki-commits] [Gerrit] Split off StrategicDeserializer from TypedObjectDeserializer... - change (mediawiki...Ask)

2013-07-09 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72723


Change subject: Split off StrategicDeserializer from TypedObjectDeserializer 
and added QueryOptionsDeserializer
..

Split off StrategicDeserializer from TypedObjectDeserializer and added 
QueryOptionsDeserializer

Change-Id: Ia808de8b65fdcc61466bc5c152b79583407c02a5
---
A Tests/Phpunit/Deserializers/QueryOptionsDeserializerTest.php
M src/Ask/Deserializers/DescriptionDeserializer.php
M src/Ask/Deserializers/QueryOptionsDeserializer.php
M src/Ask/Deserializers/SelectionRequestDeserializer.php
M src/Ask/Deserializers/SortExpressionDeserializer.php
A src/Ask/Deserializers/StrategicDeserializer.php
M src/Ask/Deserializers/TypedObjectDeserializer.php
7 files changed, 305 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ask 
refs/changes/23/72723/1

diff --git a/Tests/Phpunit/Deserializers/QueryOptionsDeserializerTest.php 
b/Tests/Phpunit/Deserializers/QueryOptionsDeserializerTest.php
new file mode 100644
index 000..4601e9b
--- /dev/null
+++ b/Tests/Phpunit/Deserializers/QueryOptionsDeserializerTest.php
@@ -0,0 +1,190 @@
+
+ */
+class QueryOptionsDeserializerTest extends \PHPUnit_Framework_TestCase {
+
+   protected function newQueryOptionsDeserializer() {
+   $dvFactory = new DataValueFactory();
+   $dvFactory->registerDataValue( 'string', 
'DataValues\StringValue' );
+
+   $sortExpressionSerializer = new SortExpressionDeserializer( 
$dvFactory );
+
+   return new QueryOptionsDeserializer( $sortExpressionSerializer 
);
+   }
+
+   /**
+* @dataProvider invalidObjectTypeProvider
+*/
+   public function testCannotDeserializeWithInvalidObjectType( 
$notQueryOptions ) {
+   $serializer = $this->newQueryOptionsDeserializer();
+
+   $this->assertFalse( $serializer->canDeserialize( 
$notQueryOptions ) );
+
+   $this->setExpectedException( 
'Ask\Deserializers\Exceptions\UnsupportedTypeException' );
+   $serializer->deserialize( $notQueryOptions );
+   }
+
+   public function invalidObjectTypeProvider() {
+   $argLists = array();
+
+   $argLists[] = array( array(
+   'objectType' => 'foobar',
+   'limit' => 10,
+   'offset' => 0,
+   'sort' => array(
+   'expressions' => array()
+   )
+   ) );
+
+   $argLists[] = array( array(
+   'objectType' => 'QUERYOPTIONS',
+   ) );
+
+   $argLists[] = array( array(
+   'objectType' => null,
+   ) );
+
+   $argLists[] = array( array(
+   'objectType' => array(),
+   ) );
+
+   $argLists[] = array( array(
+   'objectType' => 42,
+   ) );
+
+   return $argLists;
+   }
+
+   /**
+* @dataProvider missingObjectTypeProvider
+*/
+   public function testCannotDeserilaizeWithoutObjectType( 
$notQueryOptions ) {
+   $serializer = $this->newQueryOptionsDeserializer();
+
+   $this->assertFalse( $serializer->canDeserialize( 
$notQueryOptions ) );
+
+   $this->setExpectedException( 
'Ask\Deserializers\Exceptions\MissingTypeException' );
+   $serializer->deserialize( $notQueryOptions );
+   }
+
+   public function missingObjectTypeProvider() {
+   $argLists = array();
+
+   $argLists[] = array( null );
+   $argLists[] = array( array() );
+   $argLists[] = array( 'foo bar' );
+
+   $argLists[] = array( array(
+   'limit' => 10,
+   'offset' => 0,
+   'sort' => array(
+   'expressions' => array()
+   )
+   ) );
+
+   $argLists[] = array( array(
+   'ObjectType' => 'sortExpression',
+   ) );
+
+   $argLists[] = array( array(
+   'OBJECTTYPE' => 'sortExpression',
+   ) );
+
+   return $argLists;
+   }
+
+   /**
+* @dataProvider optionsWithMissingAttributeProvider
+*/
+   public function testPropertySelectionRequiresAllAttributes( array 
$incompleteSerialization ) {
+   $this->setExpectedException( 
'Ask\Deserializers\Exceptions\MissingAttributeException' );
+   $this->newQueryOptionsDeserializer()->deserialize( 
$incompleteSerialization );
+   }
+
+
+
+   public function optionsWithMissingAttributeProvider() {
+   $argLists = array();
+
+   $argLists[] = array( array(
+

[MediaWiki-commits] [Gerrit] Refactor AbuseFilterView::canEdit* functions - change (mediawiki...AbuseFilter)

2013-07-09 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72724


Change subject: Refactor AbuseFilterView::canEdit* functions
..

Refactor AbuseFilterView::canEdit* functions

Don't use global state in here and centralize
the logic for global filters.

This also makes the UI for global filters nicer
in case the user can't edit them (as all fields
are disabled then).

Change-Id: Ica4e77536d315d8ef39a45666c6b8834315bee77
---
M Views/AbuseFilterView.php
M Views/AbuseFilterViewEdit.php
M Views/AbuseFilterViewList.php
3 files changed, 33 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/24/72724/1

diff --git a/Views/AbuseFilterView.php b/Views/AbuseFilterView.php
index c874760..49fdbd2 100644
--- a/Views/AbuseFilterView.php
+++ b/Views/AbuseFilterView.php
@@ -22,33 +22,36 @@
abstract function show();
 
/**
-* @static
+* @param User $user
+*
 * @return bool
 */
-   static function canEdit() {
-   global $wgUser;
-   static $canEdit = null;
-
-   if ( is_null( $canEdit ) ) {
-   $canEdit = $wgUser->isAllowed( 'abusefilter-modify' );
-   }
-
-   return $canEdit;
+   public function canEdit( $user ) {
+   return $user->isAllowed( 'abusefilter-modify' );
}
 
/**
-* @static
+* @param User $user
+*
 * @return bool
 */
-   static function canEditGlobal() {
-   global $wgUser;
-   static $canEditGlobal = null;
+   static function canEditGlobal( $user ) {
+   return $user->isAllowed( 'abusefilter-modify-global' );
+   }
 
-   if ( is_null( $canEditGlobal ) ) {
-   $canEditGlobal = $wgUser->isAllowed( 
'abusefilter-modify-global' );
-   }
-
-   return $canEditGlobal;
+   /**
+* Whether the user can edit the given filter.
+*
+* @param object $row Filter row
+* @param User $user
+*
+* @return bool
+*/
+   public function canEditFilter( $row, $user ) {
+   return (
+   $this->canEdit( $user ) &&
+   !( isset( $row->af_global ) && $row->af_global == 1 && 
!$this->canEditGlobal( $user ) )
+   );
}
 
/**
@@ -60,7 +63,7 @@
static $canView = null;
 
if ( is_null( $canView ) ) {
-   $canView = self::canEdit() || $wgUser->isAllowed( 
'abusefilter-view-private' );
+   $canView = $wgUser->isAllowed( 'abusefilter-modify' ) 
|| $wgUser->isAllowed( 'abusefilter-view-private' );
}
 
return $canView;
diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php
index 5d82db8..3a17ea0 100644
--- a/Views/AbuseFilterViewEdit.php
+++ b/Views/AbuseFilterViewEdit.php
@@ -29,7 +29,7 @@
}
 
$editToken = $request->getVal( 'wpEditToken' );
-   $didEdit = $this->canEdit()
+   $didEdit = $this->canEdit( $user )
&& $user->matchEditToken( $editToken, array( 
'abusefilter', $filter ) );
 
if ( $didEdit ) {
@@ -59,9 +59,7 @@
 
// Don't allow adding a new global rule, or updating a
// rule that is currently global, without permissions.
-   if ( ( $newRow->af_global == 1 || 
$newRow->mOriginalRow->af_global == 1 )
-   && !$this->canEditGlobal()
-   ) {
+   if ( !$this->canEditFilter( $newRow, $user ) || 
!$this->canEditFilter( $newRow->mOriginalRow, $user ) ) {
$out->addWikiMsg( 
'abusefilter-edit-notallowed-global' );
return;
}
@@ -335,7 +333,7 @@
$readOnlyAttrib = array();
$cbReadOnlyAttrib = array(); // For checkboxes
 
-   if ( !$this->canEdit() || ( isset( $row->af_global ) && 
$row->af_global == 1 && !$this->canEditGlobal() ) ) {
+   if ( !$this->canEditFilter( $row, $user ) ) {
$readOnlyAttrib['readonly'] = 'readonly';
$cbReadOnlyAttrib['disabled'] = 'disabled';
}
@@ -405,7 +403,7 @@
$row->af_pattern,
'wpFilterRules',
true,
-   $this->canEdit()
+   $this->canEditFilter( $row, $user )
);
$fields['abusefilter-edit-notes'] = Xml::textarea(
'wpFilterNotes',
@@ -445,7 +443,7 @@
$dbField = "af_$checkboxId";

[MediaWiki-commits] [Gerrit] (bug 40810) Extend SimpleSiteLink by badges. - change (mediawiki...WikibaseDataModel)

2013-07-09 Thread Code Review

Michał Łazowik has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72725


Change subject: (bug 40810) Extend SimpleSiteLink by badges.
..

(bug 40810) Extend SimpleSiteLink by badges.

Add badges support to Wikidata DataModel.

Change-Id: I7cfcaf6bab6ed381140a878358d3e0e6b5441274
---
M DataModel/SimpleSiteLink.php
1 file changed, 19 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseDataModel 
refs/changes/25/72725/1

diff --git a/DataModel/SimpleSiteLink.php b/DataModel/SimpleSiteLink.php
index 87ea341..5da7654 100644
--- a/DataModel/SimpleSiteLink.php
+++ b/DataModel/SimpleSiteLink.php
@@ -4,6 +4,8 @@
 
 use InvalidArgumentException;
 
+use MWDebug;
+
 /**
  * Class representing a link to another site.
  *
@@ -29,13 +31,15 @@
  *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroended...@gmail.com >
+ * @author Michał Łazowik
  */
 class SimpleSiteLink {
 
protected $siteId;
protected $pageName;
+   protected $badges;
 
-   public function __construct( $siteId, $pageName ) {
+   public function __construct( $siteId, $pageName, $badges = array() ) {
if ( !is_string( $siteId ) ) {
throw new InvalidArgumentException( '$siteId needs to 
be a string' );
}
@@ -44,8 +48,13 @@
throw new InvalidArgumentException( '$pageName needs to 
be a string' );
}
 
+   if ( !is_array( $badges ) ) {
+   throw new InvalidArgumentExcpetion( '$badges needs to 
an array' );
+   }
+
$this->siteId = $siteId;
$this->pageName = $pageName;
+   $this->badges = $badges;
}
 
/**
@@ -66,4 +75,13 @@
return $this->pageName;
}
 
+   /**
+* @since 0.5
+*
+* @return array
+*/
+   public function getBadges() {
+   return $this->badges;
+   }
+
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/72725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cfcaf6bab6ed381140a878358d3e0e6b5441274
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseDataModel
Gerrit-Branch: master
Gerrit-Owner: Michał Łazowik 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Move search key generation to TermSqlIndex. - change (mediawiki...Wikibase)

2013-07-09 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Move search key generation to TermSqlIndex.
..


Move search key generation to TermSqlIndex.

Search key generation is specific to the storage/search engine.
The code was misplaced in the Term class, which required awkward
hacks to get access to the required helper classes / servces.

Change-Id: I8fd9eba0999b1bfcb69dba0bd84723e491f1e012
---
M lib/includes/Term.php
M lib/includes/store/sql/TermSqlIndex.php
M lib/tests/phpunit/TermTest.php
M repo/includes/store/sql/SqlStore.php
M repo/includes/store/sql/TermSearchKeyBuilder.php
M repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
6 files changed, 135 insertions(+), 135 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/Term.php b/lib/includes/Term.php
index 6fba0e7..807b763 100644
--- a/lib/includes/Term.php
+++ b/lib/includes/Term.php
@@ -211,76 +211,6 @@
}
 
/**
-* @since 0.2
-*
-* @return string|null
-*/
-   public function getNormalizedText() {
-   $text = $this->getText();
-   $lang = $this->getLanguage();
-   return $text === null? null : self::normalizeText( $text, $lang 
);
-   }
-
-   /**
-* @since 0.2
-*
-* @param string $text
-* @param string $lang language code of the text's language, may be used
-*for specialized normalization.
-*
-* @return string
-*
-* @todo: Move this to TermSqlIndex
-*/
-   public static function normalizeText( $text, $lang = 'en' ) {
-   if ( $text === '' ) {
-   return '';
-   }
-
-   //FIXME: move normalizeText to TermSqlIndex to avoid this mess!
-   if ( class_exists( 'Wikibase\Repo\WikibaseRepo' ) ) {
-   $normalizer = 
WikibaseRepo::getDefaultInstance()->getStringNormalizer();
-   } elseif ( class_exists( 'Wikibase\Client\WikibaseClient' ) ) {
-   $normalizer = 
WikibaseClient::getDefaultInstance()->getStringNormalizer();
-   } else {
-   throw new \RuntimeException( "Found nither WikibaseRepo 
not WikibaseClient" );
-   }
-
-   // composed normal form
-   $nfcText = $normalizer->cleanupToNFC( $text );
-
-   if ( !is_string( $nfcText ) || $nfcText === '' ) {
-   wfWarn( "Unicode normalization failed for `$text`" );
-   }
-
-   // \p{Z} - whitespace
-   // \p{C} - control chars
-   // WARNING: *any* invalid UTF8 sequence causes preg_replace to 
return an empty string.
-   $strippedText = $nfcText;
-   $strippedText = preg_replace( '/[\p{Cc}\p{Cf}\p{Cn}\p{Cs}]+/u', 
' ', $strippedText );
-   $strippedText = preg_replace( '/^[\p{Z}]+|[\p{Z}]+$/u', '', 
$strippedText );
-
-   if ( $strippedText === '' ) {
-   // NOTE: This happens when there is only whitespace in 
the string.
-   //   However, preg_replace will also return an 
empty string if it
-   //   encounters any invalid utf-8 sequence.
-   return '';
-   }
-
-   //TODO: Use Language::lc to convert to lower case.
-   //  But that requires us to load ALL the language objects,
-   //  which loads ALL the messages, which makes us run out
-   //  of RAM (see bug 41103).
-   $normalized = mb_strtolower( $strippedText, 'UTF-8' );
-
-   if ( !is_string( $normalized ) || $normalized === '' ) {
-   wfWarn( "mb_strtolower normalization failed for 
`$strippedText`" );
-   }
-
-   return $normalized;
-   }
-
-   /**
 * Returns true if this Term object is equals to $that. This Term 
object is considered
 * equal to $that if $that is also an instance of Term, and 
$that->fields contains the
 * same values for the same fields as $this->fields.
diff --git a/lib/includes/store/sql/TermSqlIndex.php 
b/lib/includes/store/sql/TermSqlIndex.php
index 783d022..f9c10d8 100644
--- a/lib/includes/store/sql/TermSqlIndex.php
+++ b/lib/includes/store/sql/TermSqlIndex.php
@@ -41,6 +41,11 @@
protected $tableName;
 
/**
+* @var StringNormalizer
+*/
+   protected $stringNormalizer;
+
+   /**
 * Maps table fields to TermIndex interface field names.
 *
 * @since 0.2
@@ -58,14 +63,15 @@
/**
 * Constructor.
 *
-* @since 0.1
+* @since0.4
 *
-* @param string $tableName
-* @param string|bool $wikiDb
+

[MediaWiki-commits] [Gerrit] Factor string normalization functions out of Utils. - change (mediawiki...Wikibase)

2013-07-09 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Factor string normalization functions out of Utils.
..


Factor string normalization functions out of Utils.

This introduces a StringNormalizer service and replaces
any use of the static normalization functions in Utils.

Change-Id: Ieeba2470dccf797b37243355ddcb2ccf5e5b18c0
---
M client/includes/WikibaseClient.php
M lib/WikibaseLib.classes.php
A lib/includes/StringNormalizer.php
M lib/includes/Term.php
M lib/includes/Utils.php
M lib/includes/specials/SpecialWikibasePage.php
A lib/tests/phpunit/StringNormalizerTest.php
M lib/tests/phpunit/UtilsTest.php
M repo/includes/Summary.php
M repo/includes/WikibaseRepo.php
M repo/includes/api/EditEntity.php
M repo/includes/api/GetEntities.php
M repo/includes/api/ModifyEntity.php
M repo/includes/api/SetAliases.php
M repo/includes/api/SetDescription.php
M repo/includes/api/SetLabel.php
M repo/includes/api/SetSiteLink.php
M repo/includes/specials/SpecialItemByTitle.php
M repo/includes/specials/SpecialNewEntity.php
19 files changed, 327 insertions(+), 131 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/client/includes/WikibaseClient.php 
b/client/includes/WikibaseClient.php
index 18adf6f..0d43bc4 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -21,6 +21,7 @@
 use Wikibase\RepoLinker;
 use Wikibase\Settings;
 use Wikibase\SettingsArray;
+use Wikibase\StringNormalizer;
 use Wikibase\Test\MockRepository;
 
 /**
@@ -76,6 +77,11 @@
protected $isInTestMode;
 
private $storeInstances = array();
+
+   /**
+* @var StringNormalizer
+*/
+   private $stringNormalizer;
 
/**
 * @since 0.4
@@ -203,6 +209,19 @@
/**
 * @since 0.4
 *
+* @return StringNormalizer
+*/
+   public function getStringNormalizer() {
+   if ( $this->stringNormalizer === null ) {
+   $this->stringNormalizer = new StringNormalizer();
+   }
+
+   return $this->stringNormalizer;
+   }
+
+   /**
+* @since 0.4
+*
 * @return RepoLinker
 */
public function newRepoLinker() {
diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
index 5bad03e..abdffc9 100644
--- a/lib/WikibaseLib.classes.php
+++ b/lib/WikibaseLib.classes.php
@@ -64,6 +64,7 @@
'Wikibase\Term' => 'includes/Term.php',
'Wikibase\Lib\TermsToClaimsTranslator' => 
'includes/TermsToClaimsTranslator.php',
'Wikibase\Lib\TypedValueFormatter' => 
'includes/TypedValueFormatter.php',
+   'Wikibase\StringNormalizer' => 'includes/StringNormalizer.php',
'Wikibase\Utils' => 'includes/Utils.php',
'Wikibase\WikibaseDiffOpFactory' => 
'includes/WikibaseDiffOpFactory.php',
'Wikibase\Lib\WikibaseDataTypeBuilders' => 
'includes/WikibaseDataTypeBuilders.php',
diff --git a/lib/includes/StringNormalizer.php 
b/lib/includes/StringNormalizer.php
new file mode 100644
index 000..269d7ea
--- /dev/null
+++ b/lib/includes/StringNormalizer.php
@@ -0,0 +1,82 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @license GPL 2+
+ * @file
+ *
+ * @author Daniel Kinzler
+ * @author John Erling Blad < jeb...@gmail.com >
+ */
+
+
+namespace Wikibase;
+
+
+use UtfNormal;
+
+/**
+ * StringNormalizer provides several methods for normalizing strings.
+ *
+ * @since 0.4
+ *
+ * @package Wikibase
+ */
+class StringNormalizer {
+
+
+   /**
+* Trim initial and trailing whitespace and control chars, and 
optionally compress internal ones.
+*
+* @param string $inputString The actual string to process.
+*
+* @return string where whitespace possibly are removed.
+*/
+   public function trimWhitespace( $inputString ) {
+   // \p{Z} - whitespace
+   // \p{Cc} - control chars
+   $trimmed = preg_replace( '/^[\p{Z}\p{Cc}]+|[\p{Z}\p{Cc}]+$/u', 
'', $inputString );
+   $trimmed = preg_replace( '/[\p{Cc}]+/u', ' ', $trimmed );
+   return $trimmed;
+   }
+
+   /**
+* Normalize string into NFC by using the cleanup metod from UtfNormal.
+*
+* @param string $inputString The actual string to process.
+*
+* @return string where whitespace possibly are removed.
+*/
+   public function cleanupToNFC( $inputString ) {
+   return UtfNormal::cleanUp( $inputString );
+   }
+
+   /**
+* Do a cleanupToNFC after the string is trimmed
+*
+* @param string $inputString
+*
+* @return string on NFC form
+*/
+   public function trimToNFC( $inputString ) {
+   return $this->cleanupToNFC( $this->trimWhitespace( $inp

[MediaWiki-commits] [Gerrit] Adding Christian Aistleitner account on analytics nodes. RT... - change (operations/puppet)

2013-07-09 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72726


Change subject: Adding Christian Aistleitner account on analytics nodes.  RT 
5403
..

Adding Christian Aistleitner account on analytics nodes.  RT 5403

Change-Id: Id9c524bb0a1e295e1c6e54e152b5244476b4a900
---
M manifests/admins.pp
M manifests/role/analytics.pp
2 files changed, 31 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/72726/1

diff --git a/manifests/admins.pp b/manifests/admins.pp
index b9b1b15..0fdee9b 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -2921,9 +2921,10 @@
 }
 }
 
-class springle inherits baseaccount {
-$username = "springle"
-$realname = "Sean Pringle"
+# RT 5403
+class qchris inherits baseaccount {
+$username = "qchris"
+$realname = "Christian Aistleitner"
 $uid = 645
 
 unixaccount { $realname: username => $username, uid => $uid, gid => 
$gid }
@@ -2932,11 +2933,32 @@
 Ssh_authorized_key { require => Unixaccount[$realname] }
 
 ssh_authorized_key {
-"sean@mintaka":
+"christ...@quelltextlich.at":
 ensure => present,
 user   => $username,
 type   => "ssh-rsa",
-key=> 
"B3NzaC1yc2EDAQABAAABAQDZ632eqrXOJ2vVKmxwode44lGL6UGEXUWG8muUP1ItqSCdYqmG11zaeH3uJNfsbqUu0jJbKpO7uiKSwolaYrHDPLDl5v5jNyRx7aQDzMgCjtVGAZIN3zQGGybl7v8ZQ635L9SAaATuYd7nOdDGa5TZ46YiAv1BA/+RGnUSz5h/ycb09V7o+RlQbHRTsTCIxjIMg45Rqnn3ukBeGNEZAU4IgaTRkg19PfPeSH9q6Ni6Wa1jz32ygmotT38vKuCvOXZxigrHJKwovS6xdfdxC67UBMV5J+KICpRPVAn1iIQMyiatdG4tBlPOUEecZcL6f7QaZufZwI/gU3wkC2zlVchF",
+key=> 
"B3NzaC1yc2EDAQABAAABAQC/FKzYz14zzwGZBltEn/PKw90dTxGvvmMUK2no5qE9gHd+zGlYNoriQK0dRsiGyWEf0O0V0dEMhkM/LjSVMqxBK0nOoAY01sgJrAH2VTYgB6RnTqAG2gUWuPEfPMZ+5tJMVgr0hRkbrZQoEvBRAv45xfywXI9if0pBtbG710JrEbAryyLfU4tt6gRAPgaAZ5ch9ISnMXden2c+N+KmjC0IXwtN7DteaCbvsL4vQHZ1JyC2OjPbHaH/6gJwE/IRbZSxTUzkH9UL/+v9N/b4yFYFGKP/2yZgHtWQfOsDpClOUiooik0pK/w9oQA+kOcKdjm2oumss4FQwRswDYJhaKI/"
+}
+}
+}
+
+# RT 5274
+class manybubbles inherits baseaccount {
+$username = "manybubbles"
+$realname = "Nik Everett"
+$uid = 644
+
+unixaccount { $realname: username => $username, uid => $uid, gid => 
$gid }
+
+if $manage_home {
+Ssh_authorized_key { require => Unixaccount[$realname] }
+
+ssh_authorized_key {
+"manybubbles@manybubbles-laptop":
+ensure => present,
+user   => $username,
+type   => "ssh-rsa",
+key=> 
"B3NzaC1yc2EDAQABAAABAQCvG6VYTnUwHQyLYFUv0g1EUfp+OByn2agzc6Y3oSj9JhjYT2zbzpfquCB5aL8mLv4A1J8iKVwWHGeib44QY8uggX/66xdRrvEZ6QaM3GkVehDS4MpKl8m61rnVfITSxmPg0n83pBDhKfXPzE6vzchBA7ZhonccObwpcr4jvpUrvFcgWDrhjbC+YeJ1YKz5lm6IPW0yeY6Ni/0LRNbIUkv0Bj1epsFqBPORO9GoWc9ydV3rDLJJGJJ5YhOlbFSjc6nblUDMwBToxov+5icnT22wNdlHizGPUafluw6Wf790Bls3Znoje0qY5KgC7zOoQWWR+3k1kZVpuOIVQU6U3/uP",
 }
 }
 }
diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index 07e3e60..f18e5d6 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -50,7 +50,8 @@
 accounts::ram,  # RT 5059
 accounts::maryana,  # RT 5017
 accounts::halfak,   # RT 5233
-accounts::abaso # RT 5273
+accounts::abaso,# RT 5273
+accounts::qchris# RT 5403
 
 # add Analytics team members to the stats group so they can
 # access data group owned by 'stats'.
@@ -65,6 +66,8 @@
 User<|title == otto|>{ groups +> [ "stats" ] }
 User<|title == spetrea|> { groups +> [ "stats" ] }
 User<|title == abaso|>   { groups +> [ "stats" ] }
+User<|title == qchris|>  { groups +> [ "stats" ] }
+
 
 # Diederik, David and Otto have sudo privileges on Analytics nodes.
 sudo_user { [ "diederik", "dsc", "otto" ]: privileges => ['ALL = (ALL) 
NOPASSWD: ALL'] }

-- 
To view, visit https://gerrit.wikimedia.org/r/72726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9c524bb0a1e295e1c6e54e152b5244476b4a900
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Adding Christian Aistleitner account on analytics nodes. RT... - change (operations/puppet)

2013-07-09 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Adding Christian Aistleitner account on analytics nodes.  RT 
5403
..


Adding Christian Aistleitner account on analytics nodes.  RT 5403

Change-Id: Id9c524bb0a1e295e1c6e54e152b5244476b4a900
---
M manifests/admins.pp
M manifests/role/analytics.pp
2 files changed, 31 insertions(+), 6 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/admins.pp b/manifests/admins.pp
index b9b1b15..0fdee9b 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -2921,9 +2921,10 @@
 }
 }
 
-class springle inherits baseaccount {
-$username = "springle"
-$realname = "Sean Pringle"
+# RT 5403
+class qchris inherits baseaccount {
+$username = "qchris"
+$realname = "Christian Aistleitner"
 $uid = 645
 
 unixaccount { $realname: username => $username, uid => $uid, gid => 
$gid }
@@ -2932,11 +2933,32 @@
 Ssh_authorized_key { require => Unixaccount[$realname] }
 
 ssh_authorized_key {
-"sean@mintaka":
+"christ...@quelltextlich.at":
 ensure => present,
 user   => $username,
 type   => "ssh-rsa",
-key=> 
"B3NzaC1yc2EDAQABAAABAQDZ632eqrXOJ2vVKmxwode44lGL6UGEXUWG8muUP1ItqSCdYqmG11zaeH3uJNfsbqUu0jJbKpO7uiKSwolaYrHDPLDl5v5jNyRx7aQDzMgCjtVGAZIN3zQGGybl7v8ZQ635L9SAaATuYd7nOdDGa5TZ46YiAv1BA/+RGnUSz5h/ycb09V7o+RlQbHRTsTCIxjIMg45Rqnn3ukBeGNEZAU4IgaTRkg19PfPeSH9q6Ni6Wa1jz32ygmotT38vKuCvOXZxigrHJKwovS6xdfdxC67UBMV5J+KICpRPVAn1iIQMyiatdG4tBlPOUEecZcL6f7QaZufZwI/gU3wkC2zlVchF",
+key=> 
"B3NzaC1yc2EDAQABAAABAQC/FKzYz14zzwGZBltEn/PKw90dTxGvvmMUK2no5qE9gHd+zGlYNoriQK0dRsiGyWEf0O0V0dEMhkM/LjSVMqxBK0nOoAY01sgJrAH2VTYgB6RnTqAG2gUWuPEfPMZ+5tJMVgr0hRkbrZQoEvBRAv45xfywXI9if0pBtbG710JrEbAryyLfU4tt6gRAPgaAZ5ch9ISnMXden2c+N+KmjC0IXwtN7DteaCbvsL4vQHZ1JyC2OjPbHaH/6gJwE/IRbZSxTUzkH9UL/+v9N/b4yFYFGKP/2yZgHtWQfOsDpClOUiooik0pK/w9oQA+kOcKdjm2oumss4FQwRswDYJhaKI/"
+}
+}
+}
+
+# RT 5274
+class manybubbles inherits baseaccount {
+$username = "manybubbles"
+$realname = "Nik Everett"
+$uid = 644
+
+unixaccount { $realname: username => $username, uid => $uid, gid => 
$gid }
+
+if $manage_home {
+Ssh_authorized_key { require => Unixaccount[$realname] }
+
+ssh_authorized_key {
+"manybubbles@manybubbles-laptop":
+ensure => present,
+user   => $username,
+type   => "ssh-rsa",
+key=> 
"B3NzaC1yc2EDAQABAAABAQCvG6VYTnUwHQyLYFUv0g1EUfp+OByn2agzc6Y3oSj9JhjYT2zbzpfquCB5aL8mLv4A1J8iKVwWHGeib44QY8uggX/66xdRrvEZ6QaM3GkVehDS4MpKl8m61rnVfITSxmPg0n83pBDhKfXPzE6vzchBA7ZhonccObwpcr4jvpUrvFcgWDrhjbC+YeJ1YKz5lm6IPW0yeY6Ni/0LRNbIUkv0Bj1epsFqBPORO9GoWc9ydV3rDLJJGJJ5YhOlbFSjc6nblUDMwBToxov+5icnT22wNdlHizGPUafluw6Wf790Bls3Znoje0qY5KgC7zOoQWWR+3k1kZVpuOIVQU6U3/uP",
 }
 }
 }
diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index 07e3e60..edd023d 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -50,7 +50,8 @@
 accounts::ram,  # RT 5059
 accounts::maryana,  # RT 5017
 accounts::halfak,   # RT 5233
-accounts::abaso # RT 5273
+accounts::abaso,# RT 5273
+accounts::qchris# RT 5403
 
 # add Analytics team members to the stats group so they can
 # access data group owned by 'stats'.
@@ -65,6 +66,8 @@
 User<|title == otto|>{ groups +> [ "stats" ] }
 User<|title == spetrea|> { groups +> [ "stats" ] }
 User<|title == abaso|>   { groups +> [ "stats" ] }
+User<|title == qchris|>  { groups +> [ "stats" ] }
+
 
 # Diederik, David and Otto have sudo privileges on Analytics nodes.
 sudo_user { [ "diederik", "dsc", "otto" ]: privileges => ['ALL = (ALL) 
NOPASSWD: ALL'] }

-- 
To view, visit https://gerrit.wikimedia.org/r/72726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9c524bb0a1e295e1c6e54e152b5244476b4a900
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fixing copy/paste error in admins.pp - change (operations/puppet)

2013-07-09 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72727


Change subject: Fixing copy/paste error in admins.pp
..

Fixing copy/paste error in admins.pp

Change-Id: Id985fc8cf7d000c9bb884370371427eee26e6105
---
M manifests/admins.pp
1 file changed, 22 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/72727/1

diff --git a/manifests/admins.pp b/manifests/admins.pp
index 0fdee9b..78aac90 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -2921,11 +2921,32 @@
 }
 }
 
+
+class springle inherits baseaccount {
+$username = "springle"
+$realname = "Sean Pringle"
+$uid = 645
+
+unixaccount { $realname: username => $username, uid => $uid, gid => 
$gid }
+
+if $manage_home {
+Ssh_authorized_key { require => Unixaccount[$realname] }
+
+ssh_authorized_key {
+"sean@mintaka":
+ensure => present,
+user   => $username,
+type   => "ssh-rsa",
+key=> 
"B3NzaC1yc2EDAQABAAABAQDZ632eqrXOJ2vVKmxwode44lGL6UGEXUWG8muUP1ItqSCdYqmG11zaeH3uJNfsbqUu0jJbKpO7uiKSwolaYrHDPLDl5v5jNyRx7aQDzMgCjtVGAZIN3zQGGybl7v8ZQ635L9SAaATuYd7nOdDGa5TZ46YiAv1BA/+RGnUSz5h/ycb09V7o+RlQbHRTsTCIxjIMg45Rqnn3ukBeGNEZAU4IgaTRkg19PfPeSH9q6Ni6Wa1jz32ygmotT38vKuCvOXZxigrHJKwovS6xdfdxC67UBMV5J+KICpRPVAn1iIQMyiatdG4tBlPOUEecZcL6f7QaZufZwI/gU3wkC2zlVchF",
+}
+}
+}
+
 # RT 5403
 class qchris inherits baseaccount {
 $username = "qchris"
 $realname = "Christian Aistleitner"
-$uid = 645
+$uid = 646
 
 unixaccount { $realname: username => $username, uid => $uid, gid => 
$gid }
 
@@ -2938,27 +2959,6 @@
 user   => $username,
 type   => "ssh-rsa",
 key=> 
"B3NzaC1yc2EDAQABAAABAQC/FKzYz14zzwGZBltEn/PKw90dTxGvvmMUK2no5qE9gHd+zGlYNoriQK0dRsiGyWEf0O0V0dEMhkM/LjSVMqxBK0nOoAY01sgJrAH2VTYgB6RnTqAG2gUWuPEfPMZ+5tJMVgr0hRkbrZQoEvBRAv45xfywXI9if0pBtbG710JrEbAryyLfU4tt6gRAPgaAZ5ch9ISnMXden2c+N+KmjC0IXwtN7DteaCbvsL4vQHZ1JyC2OjPbHaH/6gJwE/IRbZSxTUzkH9UL/+v9N/b4yFYFGKP/2yZgHtWQfOsDpClOUiooik0pK/w9oQA+kOcKdjm2oumss4FQwRswDYJhaKI/"
-}
-}
-}
-
-# RT 5274
-class manybubbles inherits baseaccount {
-$username = "manybubbles"
-$realname = "Nik Everett"
-$uid = 644
-
-unixaccount { $realname: username => $username, uid => $uid, gid => 
$gid }
-
-if $manage_home {
-Ssh_authorized_key { require => Unixaccount[$realname] }
-
-ssh_authorized_key {
-"manybubbles@manybubbles-laptop":
-ensure => present,
-user   => $username,
-type   => "ssh-rsa",
-key=> 
"B3NzaC1yc2EDAQABAAABAQCvG6VYTnUwHQyLYFUv0g1EUfp+OByn2agzc6Y3oSj9JhjYT2zbzpfquCB5aL8mLv4A1J8iKVwWHGeib44QY8uggX/66xdRrvEZ6QaM3GkVehDS4MpKl8m61rnVfITSxmPg0n83pBDhKfXPzE6vzchBA7ZhonccObwpcr4jvpUrvFcgWDrhjbC+YeJ1YKz5lm6IPW0yeY6Ni/0LRNbIUkv0Bj1epsFqBPORO9GoWc9ydV3rDLJJGJJ5YhOlbFSjc6nblUDMwBToxov+5icnT22wNdlHizGPUafluw6Wf790Bls3Znoje0qY5KgC7zOoQWWR+3k1kZVpuOIVQU6U3/uP",
 }
 }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/72727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id985fc8cf7d000c9bb884370371427eee26e6105
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fixing copy/paste error in admins.pp - change (operations/puppet)

2013-07-09 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Fixing copy/paste error in admins.pp
..


Fixing copy/paste error in admins.pp

Change-Id: Id985fc8cf7d000c9bb884370371427eee26e6105
---
M manifests/admins.pp
1 file changed, 22 insertions(+), 22 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/admins.pp b/manifests/admins.pp
index 0fdee9b..78aac90 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -2921,11 +2921,32 @@
 }
 }
 
+
+class springle inherits baseaccount {
+$username = "springle"
+$realname = "Sean Pringle"
+$uid = 645
+
+unixaccount { $realname: username => $username, uid => $uid, gid => 
$gid }
+
+if $manage_home {
+Ssh_authorized_key { require => Unixaccount[$realname] }
+
+ssh_authorized_key {
+"sean@mintaka":
+ensure => present,
+user   => $username,
+type   => "ssh-rsa",
+key=> 
"B3NzaC1yc2EDAQABAAABAQDZ632eqrXOJ2vVKmxwode44lGL6UGEXUWG8muUP1ItqSCdYqmG11zaeH3uJNfsbqUu0jJbKpO7uiKSwolaYrHDPLDl5v5jNyRx7aQDzMgCjtVGAZIN3zQGGybl7v8ZQ635L9SAaATuYd7nOdDGa5TZ46YiAv1BA/+RGnUSz5h/ycb09V7o+RlQbHRTsTCIxjIMg45Rqnn3ukBeGNEZAU4IgaTRkg19PfPeSH9q6Ni6Wa1jz32ygmotT38vKuCvOXZxigrHJKwovS6xdfdxC67UBMV5J+KICpRPVAn1iIQMyiatdG4tBlPOUEecZcL6f7QaZufZwI/gU3wkC2zlVchF",
+}
+}
+}
+
 # RT 5403
 class qchris inherits baseaccount {
 $username = "qchris"
 $realname = "Christian Aistleitner"
-$uid = 645
+$uid = 646
 
 unixaccount { $realname: username => $username, uid => $uid, gid => 
$gid }
 
@@ -2938,27 +2959,6 @@
 user   => $username,
 type   => "ssh-rsa",
 key=> 
"B3NzaC1yc2EDAQABAAABAQC/FKzYz14zzwGZBltEn/PKw90dTxGvvmMUK2no5qE9gHd+zGlYNoriQK0dRsiGyWEf0O0V0dEMhkM/LjSVMqxBK0nOoAY01sgJrAH2VTYgB6RnTqAG2gUWuPEfPMZ+5tJMVgr0hRkbrZQoEvBRAv45xfywXI9if0pBtbG710JrEbAryyLfU4tt6gRAPgaAZ5ch9ISnMXden2c+N+KmjC0IXwtN7DteaCbvsL4vQHZ1JyC2OjPbHaH/6gJwE/IRbZSxTUzkH9UL/+v9N/b4yFYFGKP/2yZgHtWQfOsDpClOUiooik0pK/w9oQA+kOcKdjm2oumss4FQwRswDYJhaKI/"
-}
-}
-}
-
-# RT 5274
-class manybubbles inherits baseaccount {
-$username = "manybubbles"
-$realname = "Nik Everett"
-$uid = 644
-
-unixaccount { $realname: username => $username, uid => $uid, gid => 
$gid }
-
-if $manage_home {
-Ssh_authorized_key { require => Unixaccount[$realname] }
-
-ssh_authorized_key {
-"manybubbles@manybubbles-laptop":
-ensure => present,
-user   => $username,
-type   => "ssh-rsa",
-key=> 
"B3NzaC1yc2EDAQABAAABAQCvG6VYTnUwHQyLYFUv0g1EUfp+OByn2agzc6Y3oSj9JhjYT2zbzpfquCB5aL8mLv4A1J8iKVwWHGeib44QY8uggX/66xdRrvEZ6QaM3GkVehDS4MpKl8m61rnVfITSxmPg0n83pBDhKfXPzE6vzchBA7ZhonccObwpcr4jvpUrvFcgWDrhjbC+YeJ1YKz5lm6IPW0yeY6Ni/0LRNbIUkv0Bj1epsFqBPORO9GoWc9ydV3rDLJJGJJ5YhOlbFSjc6nblUDMwBToxov+5icnT22wNdlHizGPUafluw6Wf790Bls3Znoje0qY5KgC7zOoQWWR+3k1kZVpuOIVQU6U3/uP",
 }
 }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/72727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id985fc8cf7d000c9bb884370371427eee26e6105
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove invalid maintenance scripts - change (mediawiki...Echo)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove invalid maintenance scripts
..


Remove invalid maintenance scripts

These maintenance scripts have never run before and will never run in
the future.  We decided that we don't understand user_properties table
enough to mess with it, and we went with another simpler approach instead

Change-Id: Ic33375a579267aca40a54d74f839fee042afc24f
---
D maintenance/copyExistingEmailPreference.php
D maintenance/rebuildUpdatedUserCache.php
D maintenance/setEmailOptionTemp.php
3 files changed, 0 insertions(+), 215 deletions(-)

Approvals:
  Matthias Mullie: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/copyExistingEmailPreference.php 
b/maintenance/copyExistingEmailPreference.php
deleted file mode 100644
index 3939583..000
--- a/maintenance/copyExistingEmailPreference.php
+++ /dev/null
@@ -1,66 +0,0 @@
-mDescription = "Script for install time copying of users 
who have opted out of talk page emails";
-   $this->addOption( 'batch', 'Batch size for SQL partitioning', 
false, true );
-   }
-
-   public function execute() {
-   $dbw = $this->getDB( DB_MASTER );
-
-   if( $this->hasOption( 'batch' ) ) {
-   $batch = $this->getOption( 'batch' );
-   } else {
-   $batch = 100;
-   }
-
-   // count the number of user who have opted out under the old 
system.
-   // DatabaseBase::query does not return rows affected
-   $users = $dbw->selectField( 'user_properties', 'COUNT(*)', 
array( "up_property='enotifusertalkpages'" ), __METHOD__ );
-
-   $total = 0;
-
-   // risks missing people if extra users opt out between script 
starting and finishing
-   for( $i = 0; $i<$users;  $i+=$batch ) {
-   $sql = "INSERT IGNORE INTO user_properties
-SELECT up_user, 'echo-subscriptions-email-edit-user-talk', up_value
-FROM user_properties
-WHERE up_property = 'enotifusertalkpages'
-ORDER BY up_user LIMIT $batch OFFSET $total";
-
-   $res = $dbw->query(
-   $sql,
-   __METHOD__, // caller
-   true // ignore errors
-   );
-
-   $total += $batch;
-
-   if( $total < $users ) {
-   $this->output( "Total Updated: $total\n" );
-   }
-   wfWaitForSlaves();
-   }
-   $this->output( "Done. Final total: $users\n" );
-   }
-}
-
-$maintClass = 'CopyExistingEmailPreference'; // Tells it to run the class
-require_once( RUN_MAINTENANCE_IF_MAIN );
diff --git a/maintenance/rebuildUpdatedUserCache.php 
b/maintenance/rebuildUpdatedUserCache.php
deleted file mode 100755
index dff5d73..000
--- a/maintenance/rebuildUpdatedUserCache.php
+++ /dev/null
@@ -1,67 +0,0 @@
-mDescription = "Script for clearing user cache for 
updated users";
-   $this->addOption( 'batch', 'Batch size', false, true );
-   }
-
-   public function execute() {
-   global $wgMemc;
-
-   if( $this->hasOption( 'batch' ) ) {
-   $batch = $this->getOption( 'batch' );
-   } else {
-   $batch = 100;
-   }
-
-   $begin = time();
-   $dbr = $this->getDB( DB_SLAVE );
-   $updated = 0;
-   $lastUserID = 0;
-
-   while ( true ) {
-   $res = $dbr->select(
-   'user_properties', // table
-   array( 'up_user' ), // fields
-   array(
-   'up_property' => 'enotifusertalkpages',
-   'up_user > ' . $dbr->addQuotes( 
$lastUserID ),
-   ), // conditions
-   __METHOD__, // caller
-   array( 'LIMIT' => $batch, 'ORDER BY' => 
'up_user' ) // options
-   );
-   if ( !$res->numRows() ) {
-   break;
-   }
-   foreach ( $res as $row ) {
-   $lastUserID = $row->up_user;
-   $user = User::newFromId( $row->up_user );
-   $user->invalidateCache();
-   $updated++;
-   }
-   $this->output( "Updated: $updated; Last ID processed: 
$lastUserID\n" );
-   wfWaitForSlaves();
-   }
-
-   $end = time();
-   $duration = $end - $begin;
-   $this->output( "Done.

[MediaWiki-commits] [Gerrit] mw.ViewPageTarget.init: Clarify reason for FF12 / FF14 black... - change (mediawiki...VisualEditor)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: mw.ViewPageTarget.init: Clarify reason for FF12 / FF14 blacklist
..


mw.ViewPageTarget.init: Clarify reason for FF12 / FF14 blacklist

Follows-up I7a9dddb693091f.

Change-Id: I49a952f6b1714808cd4f063c48cf3102997f8746
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 7e40fd5..6d0d0a6 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -89,7 +89,8 @@
'msie': [['<=', 10]],
// Android 2.x and below "support" CE but don't trigger 
keyboard input
'android': [['<', 3]],
-   // Bug 50720 - apparently Firefox is broken in versions 
14 and below
+   // Firefox issues in versions 12 and below (bug 50780)
+   // Wikilink [[./]] bug in Firefox 14 and below (bug 
50720)
'firefox': [['<=', 14]],
// Blacklist all versions:
'opera': null,

-- 
To view, visit https://gerrit.wikimedia.org/r/72712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I49a952f6b1714808cd4f063c48cf3102997f8746
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Puppetizing analytics udp2log instances - change (operations/puppet)

2013-07-09 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Puppetizing analytics udp2log instances
..


Puppetizing analytics udp2log instances

Change-Id: I3fecaa06637bcb4e6ecb8c0d1858da38dc545ddb
---
M manifests/role/analytics.pp
M manifests/site.pp
A templates/udp2log/filters.analytics-mobile.erb
A templates/udp2log/filters.analytics-sampled.erb
A templates/udp2log/filters.analytics-wikipedia-mobile.erb
5 files changed, 131 insertions(+), 23 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved



diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index edd023d..3d62194 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -117,3 +117,79 @@
 class role::analytics::kafka::server inherits role::analytics {
   include misc::analytics::monitoring::kafka::server
 }
+
+
+
+# == role::analytics::udp2log::mobile
+#
+# Geocodes and anonymizes webrequest logs generated on mobile hosts
+# and pipes them into Kafka.
+#
+# NOTE: These instances will be removed once we switch to Kafka 0.8
+# and start producing logs from varnish frontend hosts.
+#
+class role::analytics::udp2log::mobile {
+   include misc::udp2log,
+   misc::udp2log::utilities,
+   role::cache::configuration,
+   passwords::analytics
+
+   $log_directory   = '/var/log/udp2log/webrequest'
+   $packet_loss_log = "${log_directory}/packet-loss.log"
+
+   misc::udp2log::instance { 'analytics-mobile':
+   multicast  => true,
+   log_directory  => $log_directory,
+   packet_loss_log=> $packet_loss_log,
+   monitor_log_age=> false,
+   }
+}
+
+# == role::analytics::udp2log::wikipedia_mobile
+#
+# Pipes webrequest logs generated on mobile hosts into Kafka.
+# This stream is not geocoded or anonymized.
+#
+# NOTE: These instances will be removed once we switch to Kafka 0.8
+# and start producing logs from varnish frontend hosts.
+#
+class role::analytics::udp2log::wikipedia_mobile {
+   include misc::udp2log,
+   misc::udp2log::utilities,
+   role::cache::configuration
+
+   $log_directory   = '/var/log/udp2log/webrequest'
+   $packet_loss_log = "${log_directory}/packet-loss.log"
+
+   misc::udp2log::instance { 'analytics-wikipedia-mobile':
+   multicast  => true,
+   log_directory  => $log_directory,
+   packet_loss_log=> $packet_loss_log,
+   monitor_log_age=> false,
+   }
+}
+
+
+# == role::analytics::udp2log::sampled
+#
+# Geocodes and anonymizses a full sampled 1000 stream
+# and pipes it into Kafka.
+#
+# NOTE: These instances will be removed once we switch to Kafka 0.8
+# and start producing logs from varnish frontend hosts.
+#
+class role::analytics::udp2log::sampled {
+   include misc::udp2log,
+   misc::udp2log::utilities,
+   passwords::analytics
+
+   $log_directory   = '/var/log/udp2log/misc'
+   $packet_loss_log = "${log_directory}/packet-loss.log"
+
+   misc::udp2log::instance { 'analytics-sampled':
+   multicast  => true,
+   log_directory  => $log_directory,
+   packet_loss_log=> $packet_loss_log,
+   monitor_log_age=> false,
+   }
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index b1e845b..2752534 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -148,34 +148,20 @@
 }
 
  analytics udp2log kafka producer instances:
+# NOTE: These instances will be removed once we switch to Kafka 0.8
+# and start producing logs from varnish frontend hosts.
 
-#   analytics1006 - webrequest-wikipedia-mobile (unanonymized)
-#   analytics1009 - webrequest-mobile (geocoded and anonymized)
-node /analytics100[69].eqiad.wmnet/ {
+node "analytics1006.eqiad.wmnet" {
include role::analytics
-
-   # monitor the (currently unpuppetized)
-   # udp2log instances.
-   misc::udp2log::instance::monitoring { 'webrequest':
-   log_directory   => '/var/log/udp2log/webrequest',
-   monitor_packet_loss => true,
-   monitor_processes   => true,
-   monitor_log_age => false,
-   }
+   include role::analytics::udp2log::wikipedia_mobile
 }
-
-#   analytics1008 - webrequest-all-1000 (sampled)
 node "analytics1008.eqiad.wmnet" {
include role::analytics
-
-   # monitor the (currently unpuppetized)
-   # udp2log instance.  (geocoded anonymized sampled-1000)
-   misc::udp2log::instance::monitoring { 'misc':
-   log_directory   => '/var/log/udp2log/misc',
-   monitor_packet_loss => true,
-   monitor_processes   => true,
-   monitor_log_age => false,
-   }
+   include role::analytics::udp2log::mobile
+}
+node "analytics1009

[MediaWiki-commits] [Gerrit] (bug 51040) Fix json decode in PropertyInfoTable. - change (mediawiki...Wikibase)

2013-07-09 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72728


Change subject: (bug 51040) Fix json decode in PropertyInfoTable.
..

(bug 51040) Fix json decode in PropertyInfoTable.

json_decode was missing the second parameter in one instance
in PropertyInfoTable.

Change-Id: I4ab1888956481e44f6f2320532dbfb1ddcb78225
---
M lib/includes/store/sql/PropertyInfoTable.php
1 file changed, 25 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/28/72728/1

diff --git a/lib/includes/store/sql/PropertyInfoTable.php 
b/lib/includes/store/sql/PropertyInfoTable.php
index 8c1c3e0..bd4c476 100644
--- a/lib/includes/store/sql/PropertyInfoTable.php
+++ b/lib/includes/store/sql/PropertyInfoTable.php
@@ -117,14 +117,36 @@
if ( $res === false ) {
$info = null;
} else {
-   $info = json_decode( $res, true );
+   $info = $this->decodeInfo( $res );
 
if ( $info === null ) {
-   wfLogWarning( "failed to decode property info 
blob for " . $propertyId . ": " . $res );
+   wfLogWarning( "failed to decode property info 
blob for " . $propertyId . ": " . substr( $res, 0, 200 ) );
}
}
 
wfProfileOut( __METHOD__ );
+   return $info;
+   }
+
+   /**
+* Decodes an info blob.
+*
+* @param string|null|bool  $blob
+*
+* @return array|null The decoded blob as an associative array, or null 
if the blob
+* could not be decoded.
+*/
+   protected function decodeInfo( $blob ) {
+   if ( $blob === false || $blob === null ) {
+   return null;
+   }
+
+   $info = json_decode( $blob, true );
+
+   if ( !is_array( $info ) ) {
+   $info = null;
+   }
+
return $info;
}
 
@@ -149,7 +171,7 @@
$infos = array();
 
while ( $row = $res->fetchObject() ) {
-   $info = json_decode( $row->pi_info );
+   $info = $this->decodeInfo( $row->pi_info );
 
if ( $info === null ) {
wfLogWarning( "failed to decode property info 
blob for property "

-- 
To view, visit https://gerrit.wikimedia.org/r/72728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ab1888956481e44f6f2320532dbfb1ddcb78225
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] packaging scripts update & init script changes - change (operations...jmxtrans)

2013-07-09 Thread Faidon (Code Review)

Faidon has submitted this change and it was merged.

Change subject: packaging scripts update & init script changes
..


packaging scripts update & init script changes

Restore PS4->PS5 changes from r71079 that were lost in PS6. These merge
preinst and postinst, clean up the init script and fix whitespace and
other similar trivialities all over.

Change-Id: I442788be7fa888430999da0269d9c7c608d9cf8a
---
M debian/control
M debian/copyright
M debian/default
M debian/init
M debian/postinst
M debian/postrm
D debian/preinst
7 files changed, 15 insertions(+), 41 deletions(-)

Approvals:
  Manybubbles: Looks good to me, but someone else must approve
  Faidon: Verified; Looks good to me, approved



diff --git a/debian/control b/debian/control
index a6730fb..a37f256 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@
 
 Package: jmxtrans
 Architecture: all
-Depends: ${misc:Depends}, default-jdk | openjdk-6-jdk | openjdk-7-jdk, adduser
+Depends: ${misc:Depends}, adduser, default-jdk | openjdk-6-jdk | openjdk-7-jdk
 Recommends: python-yaml
 Description: connector between JMX and logging/monitoring/graphing packages
  jmxtrans is a very powerful tool which uses easily generated JSON based
diff --git a/debian/copyright b/debian/copyright
index a66c149..5a2a4f7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,6 @@
 Copyright: 2013 Jon Stevens
 License: MIT
 
-
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),
diff --git a/debian/default b/debian/default
index c1be851..70485a7 100644
--- a/debian/default
+++ b/debian/default
@@ -3,6 +3,6 @@
 JSON_DIR="/etc/jmxtrans"
 HEAP_SIZE=512
 NEW_SIZE=64
-CPU_CORES=$(cat /proc/cpuinfo | grep processor | wc -l)
+CPU_CORES=$(grep -c ^processor /proc/cpuinfo)
 NEW_RATIO=8
 LOG_LEVEL=debug
diff --git a/debian/init b/debian/init
old mode 100755
new mode 100644
index b0f4242..d4f421c
--- a/debian/init
+++ b/debian/init
@@ -1,18 +1,20 @@
 #!/bin/bash
 
 ### BEGIN INIT INFO
-# Provides: jmxtrans
-# Required-Start:  $time $network $remote_fs $syslog
-# Required-Stop:   $time $network $remote_fs $syslog
-# Default-Start:2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description:jmxtrans
+# Provides:  jmxtrans
+# Required-Start:$time $network $syslog $remote_fs
+# Required-Stop: $time $network $syslog $remote_fs
+# Should-Start:  $local_fs
+# Should-Stop:   $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop:  0 1 6
+# Short-Description: jmxtrans
 ### END INIT INFO
 
 . /lib/lsb/init-functions
 
 if [ -f /etc/default/jmxtrans ]; then
-source /etc/default/jmxtrans
+. /etc/default/jmxtrans
 fi
 
 PIDFILE="/var/run/jmxtrans.pid"
diff --git a/debian/postinst b/debian/postinst
index d7974e2..a44982b 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,20 +3,18 @@
 set -e
 
 case "$1" in
-configure)
+configure|reconfigure)
+adduser --system --quiet --home /nonexistent --no-create-home --group 
jmxtrans
 chown jmxtrans:jmxtrans /var/log/jmxtrans
 chown jmxtrans:jmxtrans /etc/jmxtrans
 ;;
-upgrade|abort-upgrade)
+abort-upgrade|abort-remove|abort-deconfigure)
 ;;
 *)
-echo "preinst called with unknown argument \`$1'" >&2
+echo "postinst called with unknown argument \`$1'" >&2
 exit 1
 ;;
 esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
 
 #DEBHELPER#
 
diff --git a/debian/postrm b/debian/postrm
old mode 100755
new mode 100644
index 1bb18d6..42594f8
--- a/debian/postrm
+++ b/debian/postrm
@@ -20,9 +20,6 @@
 ;;
 esac
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
 
 exit 0
diff --git a/debian/preinst b/debian/preinst
deleted file mode 100644
index c5fcc78..000
--- a/debian/preinst
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-case "$1" in
-install)
-adduser --system --quiet --home /nonexistent --no-create-home --group 
jmxtrans
-;;
-upgrade|abort-upgrade)
-;;
-*)
-echo "preinst called with unknown argument \`$1'" >&2
-exit 1
-;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

-- 
To view, visit https://gerrit.wikimedia.org/r/72522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I442788be7fa888430999da0269d9c7c608d9cf8a
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/jmxtrans
Gerrit-Branch: master
Gerrit-Owner: Faidon 
Gerrit-Reviewer: AzaToth 
Gerrit-Reviewer: Faidon 
Gerrit-Reviewer: Manybubbles 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedi

[MediaWiki-commits] [Gerrit] Fixing application of udp2log roles on proper hosts - change (operations/puppet)

2013-07-09 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72729


Change subject: Fixing application of udp2log roles on proper hosts
..

Fixing application of udp2log roles on proper hosts

Change-Id: I5f0d433b6abfff7c6b68dc1999127da5c7f0a112
---
M manifests/site.pp
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/72729/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 2752534..2a920ee 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -157,11 +157,12 @@
 }
 node "analytics1008.eqiad.wmnet" {
include role::analytics
-   include role::analytics::udp2log::mobile
+   include role::analytics::udp2log::sampled
+   
 }
 node "analytics1009.eqiad.wmnet" {
include role::analytics
-   include role::analytics::udp2log::sampled
+   include role::analytics::udp2log::mobile
 }
 
 # analytics1021 and analytics1022 are Kafka Brokers.

-- 
To view, visit https://gerrit.wikimedia.org/r/72729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f0d433b6abfff7c6b68dc1999127da5c7f0a112
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fixing application of udp2log roles on proper hosts - change (operations/puppet)

2013-07-09 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Fixing application of udp2log roles on proper hosts
..


Fixing application of udp2log roles on proper hosts

Change-Id: I5f0d433b6abfff7c6b68dc1999127da5c7f0a112
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 2752534..515010a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -157,11 +157,11 @@
 }
 node "analytics1008.eqiad.wmnet" {
include role::analytics
-   include role::analytics::udp2log::mobile
+   include role::analytics::udp2log::sampled
 }
 node "analytics1009.eqiad.wmnet" {
include role::analytics
-   include role::analytics::udp2log::sampled
+   include role::analytics::udp2log::mobile
 }
 
 # analytics1021 and analytics1022 are Kafka Brokers.

-- 
To view, visit https://gerrit.wikimedia.org/r/72729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f0d433b6abfff7c6b68dc1999127da5c7f0a112
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove the now unused generic::rsyncd - change (operations/puppet)

2013-07-09 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Remove the now unused generic::rsyncd
..


Remove the now unused generic::rsyncd

Change-Id: I851ec5c4315075e7ee7c95298fdd4e4b819027a3
---
D files/rsync/rsync.default
M manifests/generic-definitions.pp
2 files changed, 0 insertions(+), 95 deletions(-)

Approvals:
  Faidon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/rsync/rsync.default b/files/rsync/rsync.default
deleted file mode 100644
index a6f2479..000
--- a/files/rsync/rsync.default
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-### THIS FILE IS MANAGED BY PUPPET 
-### puppet:///files/rsync/rsync.default
-#
-
-# defaults file for rsync daemon mode
-
-# start rsync in daemon mode from init.d script?
-#  only allowed values are "true", "false", and "inetd"
-#  Use "inetd" if you want to start the rsyncd from inetd,
-#  all this does is prevent the init.d script from printing a message
-#  about not starting rsyncd (you still need to modify inetd's config 
yourself).
-RSYNC_ENABLE=true
-
-# which file should be used as the configuration file for rsync.
-# This file is used instead of the default /etc/rsyncd.conf
-# Warning: This option has no effect if the daemon is accessed
-#  using a remote shell. When using a different file for
-#  rsync you might want to symlink /etc/rsyncd.conf to
-#  that file.
-# RSYNC_CONFIG_FILE=
-
-# what extra options to give rsync --daemon?
-#  that excludes the --daemon; that's always done in the init.d script
-#  Possibilities are:
-#   --address=123.45.67.89 (bind to a specific IP address)
-#   --port=8730(bind to specified port; 
default 873)
-RSYNC_OPTS=''
-
-# run rsyncd at a nice level?
-#  the rsync daemon can impact performance due to much I/O and CPU usage,
-#  so you may want to run it at a nicer priority than the default priority.
-#  Allowed values are 0 - 19 inclusive; 10 is a reasonable value.
-RSYNC_NICE='10'
-
-# Don't forget to create an appropriate config file,
-# else the daemon will not start.
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index 702ba99..c10fc31 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -502,64 +502,6 @@
}
 }
 
-
-# Class: generic::rsyncd
-# Starts an rsyncd daemon.  Must specify either $config or $content.
-#
-# Usage:
-#   class { "generic::rsyncd": config => "home" }   # will put 
files/rsync/rsyncd.conf.home at /etc/rsyncd.conf
-#   class { "generic::rsyncd": content => template('udp2log/rsyncd.conf.erb) } 
# will render this .erb file at /etc/rsyncd.conf
-#
-# Parameters:
-#   $config  - name of rsyncd.conf file to use from 
files/rsync/rsyncd.conf.$config
-#   $content - content to render into /etc/rsyncd.conf
-#
-class generic::rsyncd($config = undef, $content = undef) {
-
-   package { "rsync":
-   ensure => latest;
-   }
-
-   # rsync daemon defaults file
-   file { "/etc/default/rsync":
-   require => Package[rsync],
-   mode=> 0644,
-   owner   => root,
-   group   => root,
-   source  => "puppet:///files/rsync/rsync.default",
-   ensure  => present;
-   }
-
-   # rsyncd.conf, content either comes from source file or passed in 
content
-   file { "/etc/rsyncd.conf":
-   require => Package[rsync],
-   mode=> 0644,
-   owner   => root,
-   group   => root,
-   ensure  => present;
-   }
-
-   # if $config name was given, then use the file
-   if $config {
-   File["/etc/rsyncd.conf"] { source  => 
"puppet:///files/rsync/rsyncd.conf.$config" }
-   }
-   # else if using $content, just render the given content
-   elsif $content {
-   File["/etc/rsyncd.conf"] { content  => $content }
-   }
-   # else alert an error
-   else {
-   alert("generic::rsyncd '${title}' must specify one of \$config, 
\$content")
-   }
-
-   # start up the rsync daemon
-   service { rsync:
-   require   => [Package["rsync"], File["/etc/rsyncd.conf"], 
File["/etc/default/rsync"]],
-   ensure=> running,
-   subscribe => [File["/etc/rsyncd.conf"], 
File["/etc/default/rsync"]],
-   }
-}
-
 class generic::gluster-client {
 
package { "glusterfs-client":

-- 
To view, visit https://gerrit.wikimedia.org/r/71127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I851ec5c4315075e7ee7c95298fdd4e4b819027a3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew

[MediaWiki-commits] [Gerrit] Fix wikimediafoundation.org mobile URL template - change (operations/mediawiki-config)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix wikimediafoundation.org mobile URL template
..


Fix wikimediafoundation.org mobile URL template

Change-Id: Idc3b90541c6dfb5cacca24cae0c17d1b0bf75d88
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 43f8eda..8e6b268 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11013,7 +11013,7 @@
 ),
 'wmgMobileUrlTemplate' => array(
'default' => '%h0.m.%h1.%h2',
-   'foundationwiki' => 'm.%h1.%h2',
+   'foundationwiki' => 'm.%h0.%h1',
'mediawikiwiki' => 'm.%h1.%h2',
'test2wiki' => '',
 ),

-- 
To view, visit https://gerrit.wikimedia.org/r/72613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc3b90541c6dfb5cacca24cae0c17d1b0bf75d88
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Removing quotes from libanon salt key in udp2log filter config - change (operations/puppet)

2013-07-09 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72730


Change subject: Removing quotes from libanon salt key in udp2log filter config
..

Removing quotes from libanon salt key in udp2log filter config

Change-Id: I1372bff8477cd5132be22d21aa6585e57928d823
---
M templates/udp2log/filters.analytics-mobile.erb
M templates/udp2log/filters.analytics-sampled.erb
M templates/udp2log/filters.analytics-wikipedia-mobile.erb
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/72730/1

diff --git a/templates/udp2log/filters.analytics-mobile.erb 
b/templates/udp2log/filters.analytics-mobile.erb
index eb4284b..7ec0e2e 100644
--- a/templates/udp2log/filters.analytics-mobile.erb
+++ b/templates/udp2log/filters.analytics-mobile.erb
@@ -14,4 +14,4 @@
 # Produce logs into Kafka:
 
 # pipe all requests from mobile frontend cache servers into kafka
-pipe 1 /bin/grep -P '<%= mobile_hosts_regex %>' | /usr/bin/udp-filter -F '\t' 
--geocode --bird=country --anonymize='<%= 
scope.lookupvar('::passwords::analytics::libanon_salt') %>' | 
/opt/kraken/bin/kafka-produce webrequest-mobile 9951 > /dev/null
\ No newline at end of file
+pipe 1 /bin/grep -P '<%= mobile_hosts_regex %>' | /usr/bin/udp-filter -F '\t' 
--geocode --bird=country --anonymize=<%= 
scope.lookupvar('::passwords::analytics::libanon_salt') %> | 
/opt/kraken/bin/kafka-produce webrequest-mobile 9951 > /dev/null
diff --git a/templates/udp2log/filters.analytics-sampled.erb 
b/templates/udp2log/filters.analytics-sampled.erb
index 343e014..083d9b0 100644
--- a/templates/udp2log/filters.analytics-sampled.erb
+++ b/templates/udp2log/filters.analytics-sampled.erb
@@ -6,4 +6,4 @@
 # Produce logs into Kafka:
 
 # pipe geocoded and anonymized sampled 1000 into kraken.
-pipe 1000 /usr/bin/udp-filter --geocode --bird=country --anonymize='<%= 
scope.lookupvar('::passwords::analytics::libanon_salt') %>' -F '\t' | 
/opt/kraken/bin/kafka-produce webrequest-all-sampled-1000 9954 > /dev/null
\ No newline at end of file
+pipe 1000 /usr/bin/udp-filter --geocode --bird=country --anonymize=<%= 
scope.lookupvar('::passwords::analytics::libanon_salt') %> -F '\t' | 
/opt/kraken/bin/kafka-produce webrequest-all-sampled-1000 9954 > /dev/null
diff --git a/templates/udp2log/filters.analytics-wikipedia-mobile.erb 
b/templates/udp2log/filters.analytics-wikipedia-mobile.erb
index 8910ea9..ca1edf7 100644
--- a/templates/udp2log/filters.analytics-wikipedia-mobile.erb
+++ b/templates/udp2log/filters.analytics-wikipedia-mobile.erb
@@ -17,4 +17,4 @@
 # Produce logs into Kafka:
 
 # pipe all requests from mobile frontend cache servers into kafka
-pipe 1 /bin/grep -P '<%= mobile_hosts_regex %>' | 
/opt/kraken/bin/kafka-produce webrequest-wikipedia-mobile 9951 > /dev/null
\ No newline at end of file
+pipe 1 /bin/grep -P '<%= mobile_hosts_regex %>' | 
/opt/kraken/bin/kafka-produce webrequest-wikipedia-mobile 9951 > /dev/null

-- 
To view, visit https://gerrit.wikimedia.org/r/72730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1372bff8477cd5132be22d21aa6585e57928d823
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Removing quotes from libanon salt key in udp2log filter config - change (operations/puppet)

2013-07-09 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Removing quotes from libanon salt key in udp2log filter config
..


Removing quotes from libanon salt key in udp2log filter config

Change-Id: I1372bff8477cd5132be22d21aa6585e57928d823
---
M templates/udp2log/filters.analytics-mobile.erb
M templates/udp2log/filters.analytics-sampled.erb
M templates/udp2log/filters.analytics-wikipedia-mobile.erb
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/udp2log/filters.analytics-mobile.erb 
b/templates/udp2log/filters.analytics-mobile.erb
index eb4284b..7ec0e2e 100644
--- a/templates/udp2log/filters.analytics-mobile.erb
+++ b/templates/udp2log/filters.analytics-mobile.erb
@@ -14,4 +14,4 @@
 # Produce logs into Kafka:
 
 # pipe all requests from mobile frontend cache servers into kafka
-pipe 1 /bin/grep -P '<%= mobile_hosts_regex %>' | /usr/bin/udp-filter -F '\t' 
--geocode --bird=country --anonymize='<%= 
scope.lookupvar('::passwords::analytics::libanon_salt') %>' | 
/opt/kraken/bin/kafka-produce webrequest-mobile 9951 > /dev/null
\ No newline at end of file
+pipe 1 /bin/grep -P '<%= mobile_hosts_regex %>' | /usr/bin/udp-filter -F '\t' 
--geocode --bird=country --anonymize=<%= 
scope.lookupvar('::passwords::analytics::libanon_salt') %> | 
/opt/kraken/bin/kafka-produce webrequest-mobile 9951 > /dev/null
diff --git a/templates/udp2log/filters.analytics-sampled.erb 
b/templates/udp2log/filters.analytics-sampled.erb
index 343e014..083d9b0 100644
--- a/templates/udp2log/filters.analytics-sampled.erb
+++ b/templates/udp2log/filters.analytics-sampled.erb
@@ -6,4 +6,4 @@
 # Produce logs into Kafka:
 
 # pipe geocoded and anonymized sampled 1000 into kraken.
-pipe 1000 /usr/bin/udp-filter --geocode --bird=country --anonymize='<%= 
scope.lookupvar('::passwords::analytics::libanon_salt') %>' -F '\t' | 
/opt/kraken/bin/kafka-produce webrequest-all-sampled-1000 9954 > /dev/null
\ No newline at end of file
+pipe 1000 /usr/bin/udp-filter --geocode --bird=country --anonymize=<%= 
scope.lookupvar('::passwords::analytics::libanon_salt') %> -F '\t' | 
/opt/kraken/bin/kafka-produce webrequest-all-sampled-1000 9954 > /dev/null
diff --git a/templates/udp2log/filters.analytics-wikipedia-mobile.erb 
b/templates/udp2log/filters.analytics-wikipedia-mobile.erb
index 8910ea9..ca1edf7 100644
--- a/templates/udp2log/filters.analytics-wikipedia-mobile.erb
+++ b/templates/udp2log/filters.analytics-wikipedia-mobile.erb
@@ -17,4 +17,4 @@
 # Produce logs into Kafka:
 
 # pipe all requests from mobile frontend cache servers into kafka
-pipe 1 /bin/grep -P '<%= mobile_hosts_regex %>' | 
/opt/kraken/bin/kafka-produce webrequest-wikipedia-mobile 9951 > /dev/null
\ No newline at end of file
+pipe 1 /bin/grep -P '<%= mobile_hosts_regex %>' | 
/opt/kraken/bin/kafka-produce webrequest-wikipedia-mobile 9951 > /dev/null

-- 
To view, visit https://gerrit.wikimedia.org/r/72730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1372bff8477cd5132be22d21aa6585e57928d823
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 51040) Fix json decode in PropertyInfoTable. - change (mediawiki...Wikibase)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: (bug 51040) Fix json decode in PropertyInfoTable.
..


(bug 51040) Fix json decode in PropertyInfoTable.

json_decode was missing the second parameter in one instance
in PropertyInfoTable.

Change-Id: I4ab1888956481e44f6f2320532dbfb1ddcb78225
---
M lib/includes/store/sql/PropertyInfoTable.php
1 file changed, 25 insertions(+), 3 deletions(-)

Approvals:
  Aude: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/store/sql/PropertyInfoTable.php 
b/lib/includes/store/sql/PropertyInfoTable.php
index 8c1c3e0..bd4c476 100644
--- a/lib/includes/store/sql/PropertyInfoTable.php
+++ b/lib/includes/store/sql/PropertyInfoTable.php
@@ -117,14 +117,36 @@
if ( $res === false ) {
$info = null;
} else {
-   $info = json_decode( $res, true );
+   $info = $this->decodeInfo( $res );
 
if ( $info === null ) {
-   wfLogWarning( "failed to decode property info 
blob for " . $propertyId . ": " . $res );
+   wfLogWarning( "failed to decode property info 
blob for " . $propertyId . ": " . substr( $res, 0, 200 ) );
}
}
 
wfProfileOut( __METHOD__ );
+   return $info;
+   }
+
+   /**
+* Decodes an info blob.
+*
+* @param string|null|bool  $blob
+*
+* @return array|null The decoded blob as an associative array, or null 
if the blob
+* could not be decoded.
+*/
+   protected function decodeInfo( $blob ) {
+   if ( $blob === false || $blob === null ) {
+   return null;
+   }
+
+   $info = json_decode( $blob, true );
+
+   if ( !is_array( $info ) ) {
+   $info = null;
+   }
+
return $info;
}
 
@@ -149,7 +171,7 @@
$infos = array();
 
while ( $row = $res->fetchObject() ) {
-   $info = json_decode( $row->pi_info );
+   $info = $this->decodeInfo( $row->pi_info );
 
if ( $info === null ) {
wfLogWarning( "failed to decode property info 
blob for property "

-- 
To view, visit https://gerrit.wikimedia.org/r/72728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ab1888956481e44f6f2320532dbfb1ddcb78225
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Werner 
Gerrit-Reviewer: Denny Vrandecic 
Gerrit-Reviewer: Jeroen De Dauw 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Optimized imports - change (mediawiki...Ask)

2013-07-09 Thread Denny Vrandecic (Code Review)

Denny Vrandecic has submitted this change and it was merged.

Change subject: Optimized imports
..


Optimized imports

Change-Id: I40d48a0935981e49c8ca97c95b0ad45c05373314
---
M src/Ask/Deserializers/DescriptionDeserializer.php
A src/Ask/Deserializers/QueryOptionsDeserializer.php
M src/Ask/Deserializers/SortExpressionDeserializer.php
M src/Ask/Deserializers/TypedObjectDeserializer.php
M src/Ask/Serializers/QuerySerializer.php
M src/Ask/Serializers/SelectionRequestSerializer.php
6 files changed, 9 insertions(+), 9 deletions(-)

Approvals:
  Denny Vrandecic: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/Ask/Deserializers/DescriptionDeserializer.php 
b/src/Ask/Deserializers/DescriptionDeserializer.php
index 553b25d..a296498 100644
--- a/src/Ask/Deserializers/DescriptionDeserializer.php
+++ b/src/Ask/Deserializers/DescriptionDeserializer.php
@@ -4,15 +4,12 @@
 
 use Ask\Deserializers\Exceptions\DeserializationException;
 use Ask\Deserializers\Exceptions\InvalidAttributeException;
-use Ask\Deserializers\Exceptions\MissingAttributeException;
-use Ask\Deserializers\Exceptions\MissingTypeException;
 use Ask\Language\Description\AnyValue;
 use Ask\Language\Description\Conjunction;
 use Ask\Language\Description\Description;
 use Ask\Language\Description\Disjunction;
 use Ask\Language\Description\SomeProperty;
 use Ask\Language\Description\ValueDescription;
-use Ask\Deserializers\Exceptions\UnsupportedTypeException;
 use DataValues\DataValueFactory;
 
 /**
diff --git a/src/Ask/Deserializers/QueryOptionsDeserializer.php 
b/src/Ask/Deserializers/QueryOptionsDeserializer.php
new file mode 100644
index 000..1388bd5
--- /dev/null
+++ b/src/Ask/Deserializers/QueryOptionsDeserializer.php
@@ -0,0 +1,8 @@
+requireAttribute( $serialization, $this->getSubTypeKey() 
);
-   $this->requireAttribute( $serialization, 'value' );
+   $this->requireAttributes( $serialization, 'value' );
$this->assertAttributeIsArray( $serialization, 'value' );
 
$specificType = $serialization[$this->getSubTypeKey()];
diff --git a/src/Ask/Serializers/QuerySerializer.php 
b/src/Ask/Serializers/QuerySerializer.php
index 93138c6..3073a05 100644
--- a/src/Ask/Serializers/QuerySerializer.php
+++ b/src/Ask/Serializers/QuerySerializer.php
@@ -3,7 +3,6 @@
 namespace Ask\Serializers;
 
 use Ask\Language\Query;
-use Ask\Language\Selection\SelectionRequest;
 use Ask\Serializers\Exceptions\UnsupportedObjectException;
 
 /**
diff --git a/src/Ask/Serializers/SelectionRequestSerializer.php 
b/src/Ask/Serializers/SelectionRequestSerializer.php
index dbbf972..0f86c2c 100644
--- a/src/Ask/Serializers/SelectionRequestSerializer.php
+++ b/src/Ask/Serializers/SelectionRequestSerializer.php
@@ -2,7 +2,6 @@
 
 namespace Ask\Serializers;
 
-use Ask\Language\Option\QueryOptions;
 use Ask\Language\Selection\PropertySelection;
 use Ask\Language\Selection\SelectionRequest;
 use Ask\Language\Selection\SubjectSelection;

-- 
To view, visit https://gerrit.wikimedia.org/r/72714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I40d48a0935981e49c8ca97c95b0ad45c05373314
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Ask
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 
Gerrit-Reviewer: Denny Vrandecic 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added QueryDeserializer - change (mediawiki...Ask)

2013-07-09 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72731


Change subject: Added QueryDeserializer
..

Added QueryDeserializer

* Added QueryDeserializer
* Added QueryDeserializerTest
* Added QueryRountripTest (integration)
* Fixed some misalignments between serialization and deserialization code

Change-Id: I82d6fac3af661c44c1550e949521ea9f61654785
---
R Tests/Integration/Serialization/DescriptionRoundtripTest.php
A Tests/Integration/Serialization/QueryRoundtripTest.php
R Tests/Integration/Serialization/QuerySerialializationTest.php
A Tests/Phpunit/Deserializers/QueryDeserializerTest.php
M Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
M Tests/Phpunit/Serializers/QueryOptionsSerializerTest.php
M Tests/Phpunit/Serializers/QuerySerializerTest.php
M Tests/Phpunit/Serializers/SelectionRequestSerializerTest.php
M src/Ask/Deserializers/DispatchingDeserializer.php
A src/Ask/Deserializers/QueryDeserializer.php
M src/Ask/Deserializers/Strategies/SelectionRequestDeserializationStrategy.php
M src/Ask/Deserializers/Strategies/SortExpressionDeserializationStrategy.php
M src/Ask/Deserializers/TypedObjectDeserializer.php
M src/Ask/Serializers/QueryOptionsSerializer.php
M src/Ask/Serializers/QuerySerializer.php
M src/Ask/Serializers/SelectionRequestSerializer.php
16 files changed, 412 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ask 
refs/changes/31/72731/1

diff --git a/Tests/Integration/Serializers/DescriptionRoundtripTest.php 
b/Tests/Integration/Serialization/DescriptionRoundtripTest.php
similarity index 97%
rename from Tests/Integration/Serializers/DescriptionRoundtripTest.php
rename to Tests/Integration/Serialization/DescriptionRoundtripTest.php
index 8f75421..b0d81f6 100644
--- a/Tests/Integration/Serializers/DescriptionRoundtripTest.php
+++ b/Tests/Integration/Serialization/DescriptionRoundtripTest.php
@@ -1,6 +1,6 @@
 
+ */
+class QueryRoundtripTest extends \PHPUnit_Framework_TestCase {
+
+   protected function newQueryDeserializer() {
+   $componentDeserializer = new DispatchingDeserializer();
+
+   $componentDeserializer->addDeserializer( new 
QueryOptionsDeserializer( $componentDeserializer ) );
+
+   $dvFactory = new DataValueFactory();
+   $dvFactory->registerDataValue( 'string', 
'DataValues\StringValue' );
+
+   $componentDeserializer->addDeserializer( new 
DescriptionDeserializer( $dvFactory ) );
+   $componentDeserializer->addDeserializer( new 
SortExpressionDeserializer( $dvFactory ) );
+   $componentDeserializer->addDeserializer( new 
SelectionRequestDeserializer( $dvFactory ) );
+
+   return new QueryDeserializer( $componentDeserializer );
+   }
+
+   protected function newQuerySerializer() {
+   $dispatchingSerializer = new DispatchingSerializer();
+
+   $dispatchingSerializer->addSerializer( new 
DescriptionSerializer() );
+   $dispatchingSerializer->addSerializer( new 
SelectionRequestSerializer() );
+   $dispatchingSerializer->addSerializer( new 
QueryOptionsSerializer( $dispatchingSerializer ) );
+   $dispatchingSerializer->addSerializer( new 
SortExpressionSerializer() );
+
+   return new QuerySerializer( $dispatchingSerializer );
+   }
+
+   /**
+* @dataProvider queryProvider
+* @param Query $query
+*/
+   public function testCanRoundtripQueryThroughSerialization( Query $query 
) {
+   $serialization = $this->newQuerySerializer()->serialize( $query 
);
+   $deserialization = $this->newQueryDeserializer()->deserialize( 
$serialization );
+
+   $this->assertEquals( $query, $deserialization );
+   }
+
+   public function queryProvider() {
+   $p42 = new StringValue( 'p42' );
+   $p9001 = new StringValue( 'p9001' );
+   $foo = new StringValue( 'foo' );
+
+   $argLists = array();
+
+   $argLists[] = array( new Query(
+   new AnyValue(),
+   array(
+   ),
+   new QueryOptions(
+   10,
+   0
+   )
+   ) );
+
+   $argLists[] = array( new Query(
+   new Conjunction( array(
+   new SomeProperty( $p42, new AnyValue() ),
+   new SomeProperty( $p9001, new ValueDescription( 
$foo ) ),
+   ) ),
+   array(
+   new SubjectSelection(),
+   new PropertySelection( $p42 ),
+   new PropertySelection( $p9001 ),
+   ),
+

[MediaWiki-commits] [Gerrit] Add support for elements - change (mediawiki...VisualEditor)

2013-07-09 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72732


Change subject: Add support for  elements
..

Add support for  elements

Bug: 51009
Change-Id: I7ba1635e4f856a021e1a7a2d26a8714230c9364a
---
M VisualEditor.i18n.php
M VisualEditor.php
M modules/ve-mw/ui/tools/dropdowns/ve.ui.MWFormatDropdownTool.js
A modules/ve/ce/nodes/ve.ce.BlockquoteNode.js
A modules/ve/dm/nodes/ve.dm.BlockquoteNode.js
M modules/ve/ui/styles/ve.ui.Tool.css
M modules/ve/ui/tools/dropdowns/ve.ui.FormatDropdownTool.js
7 files changed, 98 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/32/72732/1

diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php
index f206557..67ecaad 100644
--- a/VisualEditor.i18n.php
+++ b/VisualEditor.i18n.php
@@ -84,6 +84,7 @@
'visualeditor-editsummary' => 'Describe what you changed',
'visualeditor-feedback-link' => 'Project:VisualEditor/Feedback',
'visualeditor-feedback-tool' => 'Leave feedback',
+   'visualeditor-formatdropdown-format-blockquote' => 'Blockquote',
'visualeditor-formatdropdown-format-heading1' => 'Heading 1',
'visualeditor-formatdropdown-format-heading2' => 'Heading 2',
'visualeditor-formatdropdown-format-heading3' => 'Heading 3',
@@ -326,6 +327,7 @@
'visualeditor-editsummary' => 'Label for the edit summary box',
'visualeditor-feedback-link' => 'Link to a page where users can leave 
feedback that is automatically posted using this tool. This should be a 
sub-page of {{msg-mw|visualeditor-descriptionpagelink}}',
'visualeditor-feedback-tool' => 'Text of tool in the toolbar that lets 
users provide feedback',
+   'visualeditor-formatdropdown-format-blockquote' => 'Item in the 
formatting dropdown for blockquoted text.',
'visualeditor-formatdropdown-format-heading1' => 'Item in the generic 
formatting dropdown for a level 1 heading.
 {{Identical|Heading}}',
'visualeditor-formatdropdown-format-heading2' => 'Item in the generic 
formatting dropdown for a level 2 heading.
diff --git a/VisualEditor.php b/VisualEditor.php
index 61086f5..7aad5fa 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -332,6 +332,7 @@
've/dm/nodes/ve.dm.ListNode.js',
've/dm/nodes/ve.dm.ParagraphNode.js',
've/dm/nodes/ve.dm.PreformattedNode.js',
+   've/dm/nodes/ve.dm.BlockquoteNode.js',
've/dm/nodes/ve.dm.TableCaptionNode.js',
've/dm/nodes/ve.dm.TableCellNode.js',
've/dm/nodes/ve.dm.TableNode.js',
@@ -403,6 +404,7 @@
've/ce/nodes/ve.ce.ListNode.js',
've/ce/nodes/ve.ce.ParagraphNode.js',
've/ce/nodes/ve.ce.PreformattedNode.js',
+   've/ce/nodes/ve.ce.BlockquoteNode.js',
've/ce/nodes/ve.ce.TableCaptionNode.js',
've/ce/nodes/ve.ce.TableCellNode.js',
've/ce/nodes/ve.ce.TableNode.js',
@@ -634,6 +636,7 @@
'visualeditor-editsummary',
'visualeditor-feedback-link',
'visualeditor-feedback-tool',
+   'visualeditor-formatdropdown-format-blockquote',
'visualeditor-formatdropdown-format-mw-heading1',
'visualeditor-formatdropdown-format-mw-heading2',
'visualeditor-formatdropdown-format-mw-heading3',
diff --git a/modules/ve-mw/ui/tools/dropdowns/ve.ui.MWFormatDropdownTool.js 
b/modules/ve-mw/ui/tools/dropdowns/ve.ui.MWFormatDropdownTool.js
index 504212e..fb45520 100644
--- a/modules/ve-mw/ui/tools/dropdowns/ve.ui.MWFormatDropdownTool.js
+++ b/modules/ve-mw/ui/tools/dropdowns/ve.ui.MWFormatDropdownTool.js
@@ -42,8 +42,8 @@
 ve.ui.MWFormatDropdownTool.static.items[6].label = 
'visualeditor-formatdropdown-format-mw-heading6';
 ve.ui.MWFormatDropdownTool.static.items[7].data.type = 'mwPreformatted';
 
-// Move the H1 (item 1 in the list) to the end (7) so as to make it less 
prominent and tempting to users
-ve.ui.MWFormatDropdownTool.static.items.splice( 7, 0, 
ve.ui.MWFormatDropdownTool.static.items.splice( 1, 1 )[0] );
+// Move the H1 (item 1 in the list) to the end (8) so as to make it less 
prominent and tempting to users
+ve.ui.MWFormatDropdownTool.static.items.splice( 8, 0, 
ve.ui.MWFormatDropdownTool.static.items.splice( 1, 1 )[0] );
 
 /* Registration */
 
diff --git a/modules/ve/ce/nodes/ve.ce.BlockquoteNode.js 
b/modules/ve/ce/nodes/ve.ce.BlockquoteNode.js
new file mode 100644
index 000..98059f8
--- /dev/null
+++ b/modules/ve/ce/nodes/ve.ce.BlockquoteNode.js
@@ -0,0 +1,36 @@
+/*!
+ * VisualEditor ContentEditable BlockquoteNode class.
+ *
+ * @copyright 2011-2013 VisualE

[MediaWiki-commits] [Gerrit] Adding icinga alerts for per topic kafka producers - change (operations/puppet)

2013-07-09 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72733


Change subject: Adding icinga alerts for per topic kafka producers
..

Adding icinga alerts for per topic kafka producers

Change-Id: Ida23a744266afe880783056b8b630b92a2587944
---
M manifests/misc/analytics.pp
M manifests/role/analytics.pp
M templates/icinga/checkcommands.cfg.erb
3 files changed, 45 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/72733/1

diff --git a/manifests/misc/analytics.pp b/manifests/misc/analytics.pp
index 46fc0c0..a110fd1 100644
--- a/manifests/misc/analytics.pp
+++ b/manifests/misc/analytics.pp
@@ -25,11 +25,33 @@
}
 }
 
+# == Define misc::analytics::monitoring::kafka::producer
+# Sets up Icinga alerts for a Kafka Producer identified by $topic.
+#
+# == Parameters:
+# $warning
+# $critical
+#
+# Usage:
+#   misc::analytics::monitoring::kafka::producer { 'webrequest-mobile':
+#  warning  => 1,
+#  critical => 5,
+#   }
+#
+define misc::analytics::monitoring::kafka::producer($warning, $critical) {
+   # Set up icinga monitoring of Kafka producer async produce events per 
second.
+   # If this drops too low, trigger an alert.
+   monitor_service { "kafka-producer-${title}.AsyncProducerEvents":
+   description   => 
"kafka_producer_${title}.AsyncProducerEvents",
+   check_command => 
"check_kafka_producer_produce_events!${title}!${warning}!${critical}",
+   contact_group => "analytics",
+   }
+}
+
 
 class misc::analytics::monitoring::kafka::server {
# Set up icinga monitoring of Kafka broker server produce requests per 
second.
# If this drops too low, trigger an alert
-   # for this udp2log instance.
monitor_service { "kakfa-broker-ProduceRequestsPerSecond_min":
description   => 
"kafka_network_SocketServerStats.ProduceRequestsPerSecond_min",
check_command => 
"check_kafka_broker_produce_requests_min!5!1",
@@ -38,7 +60,6 @@
 
# Set up icinga monitoring of Kafka broker server produce requests per 
second.
# If this drops too low, trigger an alert
-   # for this udp2log instance.
monitor_service { "kakfa-broker-ProduceRequestsPerSecond_max":
description   => 
"kafka_network_SocketServerStats.ProduceRequestsPerSecond_max",
check_command => 
"check_kafka_broker_produce_requests_max!15!20",
diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index 3d62194..35475ad 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -143,6 +143,11 @@
packet_loss_log=> $packet_loss_log,
monitor_log_age=> false,
}
+
+   misc::analytics::monitoring::kafka::producer { 'webrequest-mobile':
+   warning  => 200,
+   critical => 100,
+   }
 }
 
 # == role::analytics::udp2log::wikipedia_mobile
@@ -166,6 +171,11 @@
log_directory  => $log_directory,
packet_loss_log=> $packet_loss_log,
monitor_log_age=> false,
+   }
+
+   misc::analytics::monitoring::kafka::producer { 
'webrequest-wikipedia-mobile':
+   warning  => 200,
+   critical => 100,
}
 }
 
@@ -192,4 +202,9 @@
packet_loss_log=> $packet_loss_log,
monitor_log_age=> false,
}
+
+   misc::analytics::monitoring::kafka::producer { 
'webrequest-wikipedia-mobile':
+   warning  => 12,
+   critical => 6000,
+   }
 }
diff --git a/templates/icinga/checkcommands.cfg.erb 
b/templates/icinga/checkcommands.cfg.erb
index c569665..49d018a 100644
--- a/templates/icinga/checkcommands.cfg.erb
+++ b/templates/icinga/checkcommands.cfg.erb
@@ -626,6 +626,13 @@
command_line$USER1$/check_ganglios_generic_value -H $HOSTADDRESS$ 
-m kafka_network_SocketServerStats.ProduceRequestsPerSecond -w $ARG1$ -c $ARG2$ 
-o gt
 }
 
+# Check that udp2log Kakfa producers are producing
+define command{
+   command_namecheck_kafka_producer_produce_events
+   command_line$USER1$/check_ganglios_generic_value -H $HOSTADDRESS$ 
-m udp2log_kafka_producer_$ARG1.AsyncProducerEvents -w $ARG2$ -c $ARG3$ -o lt
+}
+
+
 
 # Alerts for data loss in Kraken HDFS.
 define command{

-- 
To view, visit https://gerrit.wikimedia.org/r/72733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida23a744266afe880783056b8b630b92a2587944
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.

[MediaWiki-commits] [Gerrit] Adding icinga alerts for per topic kafka producers - change (operations/puppet)

2013-07-09 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Adding icinga alerts for per topic kafka producers
..


Adding icinga alerts for per topic kafka producers

Change-Id: Ida23a744266afe880783056b8b630b92a2587944
---
M manifests/misc/analytics.pp
M manifests/role/analytics.pp
M templates/icinga/checkcommands.cfg.erb
3 files changed, 45 insertions(+), 2 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved



diff --git a/manifests/misc/analytics.pp b/manifests/misc/analytics.pp
index 46fc0c0..a110fd1 100644
--- a/manifests/misc/analytics.pp
+++ b/manifests/misc/analytics.pp
@@ -25,11 +25,33 @@
}
 }
 
+# == Define misc::analytics::monitoring::kafka::producer
+# Sets up Icinga alerts for a Kafka Producer identified by $topic.
+#
+# == Parameters:
+# $warning
+# $critical
+#
+# Usage:
+#   misc::analytics::monitoring::kafka::producer { 'webrequest-mobile':
+#  warning  => 1,
+#  critical => 5,
+#   }
+#
+define misc::analytics::monitoring::kafka::producer($warning, $critical) {
+   # Set up icinga monitoring of Kafka producer async produce events per 
second.
+   # If this drops too low, trigger an alert.
+   monitor_service { "kafka-producer-${title}.AsyncProducerEvents":
+   description   => 
"kafka_producer_${title}.AsyncProducerEvents",
+   check_command => 
"check_kafka_producer_produce_events!${title}!${warning}!${critical}",
+   contact_group => "analytics",
+   }
+}
+
 
 class misc::analytics::monitoring::kafka::server {
# Set up icinga monitoring of Kafka broker server produce requests per 
second.
# If this drops too low, trigger an alert
-   # for this udp2log instance.
monitor_service { "kakfa-broker-ProduceRequestsPerSecond_min":
description   => 
"kafka_network_SocketServerStats.ProduceRequestsPerSecond_min",
check_command => 
"check_kafka_broker_produce_requests_min!5!1",
@@ -38,7 +60,6 @@
 
# Set up icinga monitoring of Kafka broker server produce requests per 
second.
# If this drops too low, trigger an alert
-   # for this udp2log instance.
monitor_service { "kakfa-broker-ProduceRequestsPerSecond_max":
description   => 
"kafka_network_SocketServerStats.ProduceRequestsPerSecond_max",
check_command => 
"check_kafka_broker_produce_requests_max!15!20",
diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index 3d62194..35475ad 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -143,6 +143,11 @@
packet_loss_log=> $packet_loss_log,
monitor_log_age=> false,
}
+
+   misc::analytics::monitoring::kafka::producer { 'webrequest-mobile':
+   warning  => 200,
+   critical => 100,
+   }
 }
 
 # == role::analytics::udp2log::wikipedia_mobile
@@ -166,6 +171,11 @@
log_directory  => $log_directory,
packet_loss_log=> $packet_loss_log,
monitor_log_age=> false,
+   }
+
+   misc::analytics::monitoring::kafka::producer { 
'webrequest-wikipedia-mobile':
+   warning  => 200,
+   critical => 100,
}
 }
 
@@ -192,4 +202,9 @@
packet_loss_log=> $packet_loss_log,
monitor_log_age=> false,
}
+
+   misc::analytics::monitoring::kafka::producer { 
'webrequest-wikipedia-mobile':
+   warning  => 12,
+   critical => 6000,
+   }
 }
diff --git a/templates/icinga/checkcommands.cfg.erb 
b/templates/icinga/checkcommands.cfg.erb
index c569665..49d018a 100644
--- a/templates/icinga/checkcommands.cfg.erb
+++ b/templates/icinga/checkcommands.cfg.erb
@@ -626,6 +626,13 @@
command_line$USER1$/check_ganglios_generic_value -H $HOSTADDRESS$ 
-m kafka_network_SocketServerStats.ProduceRequestsPerSecond -w $ARG1$ -c $ARG2$ 
-o gt
 }
 
+# Check that udp2log Kakfa producers are producing
+define command{
+   command_namecheck_kafka_producer_produce_events
+   command_line$USER1$/check_ganglios_generic_value -H $HOSTADDRESS$ 
-m udp2log_kafka_producer_$ARG1.AsyncProducerEvents -w $ARG2$ -c $ARG3$ -o lt
+}
+
+
 
 # Alerts for data loss in Kraken HDFS.
 define command{

-- 
To view, visit https://gerrit.wikimedia.org/r/72733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida23a744266afe880783056b8b630b92a2587944
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikime

[MediaWiki-commits] [Gerrit] Don't trigger filter hits for nonexisting filter 0 - change (mediawiki...AbuseFilter)

2013-07-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Don't trigger filter hits for nonexisting filter 0
..


Don't trigger filter hits for nonexisting filter 0

AbuseFilter::getConsequencesForFilters uses filter ids as
array keys, that causes problems if both local and global
filters were hit, because array_merge reindexes arrays.

Example:
https://www.mediawiki.org/wiki/Special:AbuseLog/18687

Change-Id: I81cb110322461e30113199cfa313cd8e8e8b2262
---
M AbuseFilter.class.php
1 file changed, 1 insertion(+), 4 deletions(-)

Approvals:
  Anomie: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 46a41a0..3eaf0bd 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -641,10 +641,7 @@
 
if ( count( $globalFilters ) ) {
$fdb = wfGetDB( DB_SLAVE, array(), 
$wgAbuseFilterCentralDB );
-   $consequences = array_merge(
-   $consequences,
-   self::loadConsequencesFromDB( $fdb, 
$globalFilters, 'global-' )
-   );
+   $consequences = $consequences + 
self::loadConsequencesFromDB( $fdb, $globalFilters, 'global-' );
}
 
return $consequences;

-- 
To view, visit https://gerrit.wikimedia.org/r/72716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I81cb110322461e30113199cfa313cd8e8e8b2262
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: CSteipp 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Don't redirect m.wikimediafoundation.org to the main site - change (operations/apache-config)

2013-07-09 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72734


Change subject: Don't redirect m.wikimediafoundation.org to the main site
..

Don't redirect m.wikimediafoundation.org to the main site

Change-Id: I2b60b8374d6491af01c2c381990b35e751e5ba31
---
M redirects.conf
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/apache-config 
refs/changes/34/72734/1

diff --git a/redirects.conf b/redirects.conf
index 17f197a..b784b66 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -578,7 +578,8 @@
 
 # wikimediafoundation
 RewriteCond %{HTTP_HOST} (^|\.)wikimediafoundation\.(com|net|info)$ [OR]
-RewriteCond %{HTTP_HOST} \.wikimediafoundation\.org$
+RewriteCond %{HTTP_HOST} \.wikimediafoundation\.org$ [AND]
+RewriteCond %{HTTP_HOST} !=m.wikimediafoundation.org
 RewriteRule ^(.*)$ http://wikimediafoundation.org$1 [R=301,L]
 
 # Bookshelf Project

-- 
To view, visit https://gerrit.wikimedia.org/r/72734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b60b8374d6491af01c2c381990b35e751e5ba31
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Enable auto-archive on enwiki - change (operations/mediawiki-config)

2013-07-09 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72735


Change subject: Enable auto-archive on enwiki
..

Enable auto-archive on enwiki

Change-Id: I1b1e2c903a8c9af45a92ca01b4b0b42f07ac8f81
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/35/72735/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 16cd8cf..092f7af 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10779,6 +10779,7 @@
  */
 'wmgArticleFeedbackAutoArchiveEnabled' => array(
'default' => false,
+   'enwiki' => true,
 ),
 /*
  * This is the TTL before an item is archived (if auto-archive is enabled);

-- 
To view, visit https://gerrit.wikimedia.org/r/72735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b1e2c903a8c9af45a92ca01b4b0b42f07ac8f81
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] update build.xml - change (operations...jmxtrans)

2013-07-09 Thread AzaToth (Code Review)

AzaToth has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72736


Change subject: update build.xml
..

update build.xml


Change-Id: I94e2b44c6d279910bde3e61fcb61b454e55960c3
---
M build.xml
1 file changed, 24 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/jmxtrans 
refs/changes/36/72736/1

diff --git a/build.xml b/build.xml
index c491137..fd56ec0 100644
--- a/build.xml
+++ b/build.xml
@@ -91,6 +91,7 @@
 


+   

 

@@ -170,7 +171,7 @@


 
-   
+   



@@ -233,38 +234,38 @@

 

-   
-   
-   
-   
-   
-
-
-   
-   
-   
-   
-   
-   
-   
-   
+   
+   
+   
+   



 
 
-   
+   




+   
+   
+   
 
-   
-   
-
-   
-   
-   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   

 


-- 
To view, visit https://gerrit.wikimedia.org/r/72736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94e2b44c6d279910bde3e61fcb61b454e55960c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/jmxtrans
Gerrit-Branch: master
Gerrit-Owner: AzaToth 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Initialize git-dpm - change (operations...jmxtrans)

2013-07-09 Thread AzaToth (Code Review)

AzaToth has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72737


Change subject: Initialize git-dpm
..

Initialize git-dpm

Change-Id: Ia92208d31d47a982606c007c25db69b63e38aa45
---
A debian/.git-dpm
M debian/patches/0001-update-build.xml.patch
2 files changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/jmxtrans 
refs/changes/37/72737/1

diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 000..5cd756c
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
+# see git-dpm(1) from git-dpm package
+e0b4c13c4072026c46022b9dd708cac52d47aa1c
+e0b4c13c4072026c46022b9dd708cac52d47aa1c
+a527a04956ac58ac6e817bb2857214312dda1b88
+a527a04956ac58ac6e817bb2857214312dda1b88
+jmxtrans_242.orig.tar.gz
+7ec54a9f3f371d46d52b595b6a4ebb2d0a8ef9d6
+7317818
diff --git a/debian/patches/0001-update-build.xml.patch 
b/debian/patches/0001-update-build.xml.patch
index 05cf68b..811edf1 100644
--- a/debian/patches/0001-update-build.xml.patch
+++ b/debian/patches/0001-update-build.xml.patch
@@ -1,3 +1,4 @@
+From e0b4c13c4072026c46022b9dd708cac52d47aa1c Mon Sep 17 00:00:00 2001
 From: Nik Everett 
 Date: Mon, 1 Jul 2013 19:20:16 +0200
 Subject: update build.xml
@@ -8,7 +9,7 @@
  1 file changed, 24 insertions(+), 23 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index c491137..ae7f36b 100644
+index c491137..fd56ec0 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -91,6 +91,7 @@

-- 
To view, visit https://gerrit.wikimedia.org/r/72737
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia92208d31d47a982606c007c25db69b63e38aa45
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/jmxtrans
Gerrit-Branch: master
Gerrit-Owner: AzaToth 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove Serializer from SerializationException - change (mediawiki...Ask)

2013-07-09 Thread Denny Vrandecic (Code Review)

Denny Vrandecic has submitted this change and it was merged.

Change subject: Remove Serializer from SerializationException
..


Remove Serializer from SerializationException

Change-Id: I7e3be7547c14b2c7c4d9d2102a1f0ae8031aaf39
---
M Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
M src/Ask/Serializers/DescriptionSerializer.php
M src/Ask/Serializers/DispatchingSerializer.php
M src/Ask/Serializers/Exceptions/SerializationException.php
M src/Ask/Serializers/Exceptions/UnsupportedObjectException.php
M src/Ask/Serializers/QueryOptionsSerializer.php
M src/Ask/Serializers/QuerySerializer.php
M src/Ask/Serializers/SelectionRequestSerializer.php
M src/Ask/Serializers/SortExpressionSerializer.php
9 files changed, 17 insertions(+), 36 deletions(-)

Approvals:
  Denny Vrandecic: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php 
b/Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
index 5b67a5f..5b4a3f1 100644
--- a/Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
+++ b/Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
@@ -20,29 +20,26 @@
 
public function testConstructorWithOnlyRequiredArguments() {
$object = (object)array( 'the' => 'game' );
-   $serializer = $this->getMock( 'Ask\Serializers\Serializer' );
 
-   $exception = new UnsupportedObjectException( $object, 
$serializer );
+   $exception = new UnsupportedObjectException( $object );
 
-   $this->assertRequiredFieldsAreSet( $exception, $object, 
$serializer );
+   $this->assertRequiredFieldsAreSet( $exception, $object );
}
 
public function testConstructorWithAllArguments() {
$object = (object)array( 'the' => 'game' );
-   $serializer = $this->getMock( 'Ask\Serializers\Serializer' );
$message = 'NyanData all the way across the sky!';
$previous = new \Exception( 'Onoez!' );
 
-   $exception = new UnsupportedObjectException( $object, 
$serializer, $message, $previous );
+   $exception = new UnsupportedObjectException( $object, $message, 
$previous );
 
-   $this->assertRequiredFieldsAreSet( $exception, $object, 
$serializer );
+   $this->assertRequiredFieldsAreSet( $exception, $object );
$this->assertEquals( $message, $exception->getMessage() );
$this->assertEquals( $previous, $exception->getPrevious() );
}
 
-   protected function assertRequiredFieldsAreSet( 
UnsupportedObjectException $exception, $object, $serializer ) {
+   protected function assertRequiredFieldsAreSet( 
UnsupportedObjectException $exception, $object ) {
$this->assertEquals( $object, 
$exception->getUnsupportedObject() );
-   $this->assertEquals( $serializer, $exception->getSerializer() );
}
 
 }
diff --git a/src/Ask/Serializers/DescriptionSerializer.php 
b/src/Ask/Serializers/DescriptionSerializer.php
index 40bf0a6..a998fe3 100644
--- a/src/Ask/Serializers/DescriptionSerializer.php
+++ b/src/Ask/Serializers/DescriptionSerializer.php
@@ -66,12 +66,12 @@
);
}
 
-   throw new UnsupportedObjectException( $description, $this );
+   throw new UnsupportedObjectException( $description );
}
 
protected function assertCanSerialize( $askObject ) {
if ( !$this->canSerialize( $askObject ) ) {
-   throw new UnsupportedObjectException( $askObject, $this 
);
+   throw new UnsupportedObjectException( $askObject );
}
}
 
diff --git a/src/Ask/Serializers/DispatchingSerializer.php 
b/src/Ask/Serializers/DispatchingSerializer.php
index db9a9ac..7f1aab2 100644
--- a/src/Ask/Serializers/DispatchingSerializer.php
+++ b/src/Ask/Serializers/DispatchingSerializer.php
@@ -44,7 +44,7 @@
}
}
 
-   throw new UnsupportedObjectException( $askObject, $this );
+   throw new UnsupportedObjectException( $askObject );
}
 
public function canSerialize( $askObject ) {
diff --git a/src/Ask/Serializers/Exceptions/SerializationException.php 
b/src/Ask/Serializers/Exceptions/SerializationException.php
index d7ac062..6593eb6 100644
--- a/src/Ask/Serializers/Exceptions/SerializationException.php
+++ b/src/Ask/Serializers/Exceptions/SerializationException.php
@@ -2,8 +2,6 @@
 
 namespace Ask\Serializers\Exceptions;
 
-use Ask\Serializers\Serializer;
-
 /**
  * @since 0.1
  *
@@ -15,19 +13,8 @@
  */
 abstract class SerializationException extends \RuntimeException {
 
-   protected $serializer;
-
-   public function __construct( Serializer $deserializer, $message =

1 2 3 >

1 - 100 of 295 matches

Mail list logo