[MediaWiki-commits] [Gerrit] translatewiki[master]: Merge repoconfig.yaml and repoconfig.commit.yaml

2017-12-04 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394294 )

Change subject: Merge repoconfig.yaml and repoconfig.commit.yaml
..


Merge repoconfig.yaml and repoconfig.commit.yaml

One config can now have multiple different variants. Variant name
is given after | character. Variant overrides must be set after
the default value (without any variant) is set. Variants can be
set at any point in the structure.

New repoconfig.yaml is generated programmatically by merging the
two files.

Variant can be choosen with the --variant option. If no value is
specified for that variant, it will fallback to the default value
set in REPONG-VARIANT file in the base (where repoconfig.yaml is).

Change-Id: Ia4638c1e2688c4e2af29d45b9f82ec31a20cb26a
---
M bin/repoexport
D repoconfig.commit.yaml
M repoconfig.yaml
M repong/repong.php
4 files changed, 147 insertions(+), 501 deletions(-)

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



diff --git a/bin/repoexport b/bin/repoexport
index 88e4fc6..2d93c65 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -23,7 +23,7 @@
if [ "$i" = "$PROJECT" ]
then
php "$DIRSCRIPT/../repong/repong.php" export "$PROJECT"
-   exit 0;
+   exit 0
fi
 done
 
diff --git a/repoconfig.commit.yaml b/repoconfig.commit.yaml
deleted file mode 100644
index 4f7cb16..000
--- a/repoconfig.commit.yaml
+++ /dev/null
@@ -1,483 +0,0 @@

-'@meta':
-  export: php 
/srv/mediawiki/targets/production/extensions/Translate/scripts/export.php
-  expand: php 
/srv/mediawiki/targets/production/extensions/Translate/scripts/expand-groupspec.php
 --exportable
-
-blockly:
-  group: out-blockly*
-  repos:
-blockly:
-  type: github
-  url: g...@github.com:google/blockly.git
-blockly-games:
-  type: github
-  url: g...@github.com:google/blockly-games.git
-
-citationhunt:
-  group: citationhunt
-  repos:
-citationhunt:
-  type: github
-  url: g...@github.com:eggpi/citationhunt.git
-
-codev:
-  group: codev
-  repos:
-codev:
-  type: github
-  url: g...@github.com:mantisbt-plugins/codev.git
-
-commons-android:
-  group: commons-android-*
-  no-export-languages: ksh,zh,en
-  repos:
-commons-android:
-  type: github
-  url: g...@github.com:commons-app/apps-android-commons.git
-
-copypatrol:
-  group: copypatrol
-  repos:
-copypatrol:
-  type: github
-  url: g...@github.com:wikimedia/CopyPatrol.git
-
-crosswatch:
-  group: crosswatch
-  repos:
-crosswatch:
-  type: wmgerrit
-  url: ssh://l10n-...@gerrit.wikimedia.org:29418/labs/tools/crosswatch
-
-dissemin:
-  group: dissemin-*
-  repos:
-dissemin:
-  type: github
-  url: g...@github.com:dissemin/dissemin.git
-
-eol:
-  group: out-eol-*
-  repos:
-eol:
-  type: github
-  url: g...@github.com:EOL/eol.git
-
-etherpad-lite:
-  group: etherpad-lite
-  repos:
-etherpad-lite:
-  type: github
-  branch: develop
-  url: g...@github.com:ether/etherpad-lite.git
-
-freecol:
-  group: out-freecol
-  repos:
-freecol:
-  type: git
-  url: ssh://usern...@git.code.sf.net/p/freecol/git
-
-fudforum:
-  group: out-fudforum
-  repos:
-fudforum:
-  type: svn
-  url: 
svn+ssh://translatew...@svn.code.sf.net/p/fudforum/code/trunk/install/forum_data/thm/default/i18n
-  svn-add-options: 
config:auto-props:msg=svn:mime-type=text/plain;svn:eol-style=native
-
-gapfinder:
-  group: gapfinder
-  repos:
-recommendation-api:
-  type: wmgerrit
-  url: 
ssh://l10n-...@gerrit.wikimedia.org:29418/research/recommendation-api
-
-hivejs:
-  group: hivejs-*
-  repos:
-hivejs/hive-editor-text-codemirror:
-  type: github
-  url: g...@github.com:hivejs/hive-editor-text-codemirror.git
-hivejs/hive-plugin-chat:
-  type: github
-  url: g...@github.com:hivejs/hive-plugin-chat.git
-hivejs/hive-plugin-export:
-  type: github
-  url: g...@github.com:hivejs/hive-plugin-export.git
-hivejs/hive-plugin-import:
-  type: github
-  url: g...@github.com:hivejs/hive-plugin-import.git
-hivejs/hive-plugin-presence:
-  type: github
-  url: g...@github.com:hivejs/hive-plugin-presence.git
-hivejs/hive-ui:
-  type: github
-  url: g...@github.com:hivejs/hive-ui.git
-
-huggle:
-  group: huggle
-  repos:
-huggle:
-  type: github
-  url: g...@github.com:huggle/huggle3-qt-lx.git
-
-ia-upload:
-  group: ia-upload
-  repos:
-ia-upload:
-  type: github
-  url: g...@github.com:wikisource/ia-upload.git
-
-inaturalist:
-  group: out-inaturalist
-  repos:
-inaturalist:
-  type: github
-  branch: i18n
-  url: g...@github.com:inaturalist/inaturalist.git
-
-internetarchivebot:
-  group: internetarchivebot
-  repos:
-internetarchivebot:
-  type: github
-  url:

[MediaWiki-commits] [Gerrit] translatewiki[master]: Merge repoconfig.yaml and repoconfig.commit.yaml

2017-11-30 Thread Nikerabbit (Code Review) 
Nikerabbit has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394294 )

Change subject: Merge repoconfig.yaml and repoconfig.commit.yaml
..

Merge repoconfig.yaml and repoconfig.commit.yaml

One config can now have multiple different variants. Variant name
is given after | character. Variant overrides must be set after
the default value (without any variant) is set. Variants can be
set at any point in the structure.

New repoconfig.yaml is generated programmatically by merging the
two files.

Variant can be choosen with the --variant option. If no value is
specified for that variant, it will fallback to the default value.

I hacked the repo* scripts to support VARIANT environment variable
so that one now has to do VARIANT=export repoupdate foo (similarly
for repoexport and repocommit) when exporting.

Change-Id: Ia4638c1e2688c4e2af29d45b9f82ec31a20cb26a
---
M bin/nike-export-all
M bin/repo
M bin/repocommit
M bin/repoexport
M bin/repoupdate
M repoconfig.yaml
M repong/repong.php
7 files changed, 146 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/94/394294/1

diff --git a/bin/nike-export-all b/bin/nike-export-all
index e6e65df..0496501 100755
--- a/bin/nike-export-all
+++ b/bin/nike-export-all
@@ -59,6 +59,7 @@
 (
eval `ssh-agent -s`
ssh-add /home/betawiki/id_rsa
+   export VARIANT=export
 
for i in $PROJECTS; do
echo "${_b}$i${b_}"
diff --git a/bin/repo b/bin/repo
index 41705fa..4065e22 100755
--- a/bin/repo
+++ b/bin/repo
@@ -12,4 +12,5 @@
 
 echo "$(date --rfc-3339=seconds --utc) [$(whoami) at $DIR] $0 $@" >> ${DIRLOG}
 
+unset VARIANT
 sudo -u betawiki "${DIRSCRIPT}/repo$COMMAND" "$PROJECT" "$DIR"
diff --git a/bin/repocommit b/bin/repocommit
index ab890b4..21b8547 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -31,7 +31,7 @@
 for i in $REPONG; do
if [ "$i" = "$PROJECT" ]
then
-   php "$DIRSCRIPT/../repong/repong.php" commit "$PROJECT"
+   php "$DIRSCRIPT/../repong/repong.php" commit "$PROJECT" 
--variant "${VARIANT:-default}"
exit 0
fi
 done
diff --git a/bin/repoexport b/bin/repoexport
index 88e4fc6..5752b15 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -22,8 +22,8 @@
 for i in $REPONG; do
if [ "$i" = "$PROJECT" ]
then
-   php "$DIRSCRIPT/../repong/repong.php" export "$PROJECT"
-   exit 0;
+   php "$DIRSCRIPT/../repong/repong.php" export "$PROJECT" 
--variant "${VARIANT:-default}"
+   exit 0
fi
 done
 
diff --git a/bin/repoupdate b/bin/repoupdate
index f4dc17a..38d3a9d 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -48,7 +48,7 @@
 for i in $REPONG; do
if [ "$i" = "$PROJECT" ]
then
-   php "$DIRSCRIPT/../repong/repong.php" update "$PROJECT"
+   php "$DIRSCRIPT/../repong/repong.php" update "$PROJECT" 
--variant "${VARIANT:-default}"
exit 0
fi
 done
diff --git a/repoconfig.yaml b/repoconfig.yaml
index f5f4658..c8618f4 100644
--- a/repoconfig.yaml
+++ b/repoconfig.yaml
@@ -9,9 +9,11 @@
 blockly:
   type: github
   url: https://github.com/google/blockly.git
+  url|export: g...@github.com:google/blockly.git
 blockly-games:
   type: github
   url: https://github.com/google/blockly-games.git
+  url|export: g...@github.com:google/blockly-games.git
 
 citationhunt:
   group: citationhunt
@@ -19,6 +21,7 @@
 citationhunt:
   type: github
   url: https://github.com/eggpi/citationhunt.git
+  url|export: g...@github.com:eggpi/citationhunt.git
 
 codev:
   group: codev
@@ -26,6 +29,7 @@
 codev:
   type: github
   url: https://github.com/mantisbt-plugins/codev.git
+  url|export: g...@github.com:mantisbt-plugins/codev.git
 
 commons-android:
   group: commons-android-*
@@ -34,6 +38,7 @@
 commons-android:
   type: github
   url: https://github.com/commons-app/apps-android-commons.git
+  url|export: g...@github.com:commons-app/apps-android-commons.git
 
 copypatrol:
   group: copypatrol
@@ -41,6 +46,7 @@
 copypatrol:
   type: github
   url: https://github.com/wikimedia/CopyPatrol.git
+  url|export: g...@github.com:wikimedia/CopyPatrol.git
 
 crosswatch:
   group: crosswatch
@@ -48,6 +54,7 @@
 crosswatch:
   type: wmgerrit
   url: https://gerrit.wikimedia.org/r/labs/tools/crosswatch
+  url|export: 
ssh://l10n-...@gerrit.wikimedia.org:29418/labs/tools/crosswatch
 
 dissemin:
   group: dissemin-*
@@ -55,6 +62,7 @@
 dissemin:
   type: github
   url: https://github.com/dissemin/dissemin.git
+  url|export: g...@github.com:dissemin/dissemin.git
 
 eol:
   group: out-eol-*
@@ -62,6 +70,7 @@
 eol:
   type: github
   url: https://github.com/EOL/eol.git
+  url|export: