[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. a1471c9fbec16fb899f2ff210ced5aedaf32ea86

[Michal Čihař]

The branch, master has been updated
       via  a1471c9fbec16fb899f2ff210ced5aedaf32ea86 (commit)
       via  ee712584dc601fc5ac3aa6d4dc6fc6b234ad3a1d (commit)
       via  e05b7c3ad7a0fbcda5f8afbef70d95422b2a20db (commit)
      from  446aa621fb09d34c7484ae1843f3139f7b5b418b (commit)


- Log -----------------------------------------------------------------
commit a1471c9fbec16fb899f2ff210ced5aedaf32ea86
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Mar 11 13:46:03 2010 +0100

    No longer generate SVN stats.

commit ee712584dc601fc5ac3aa6d4dc6fc6b234ad3a1d
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Mar 11 13:44:03 2010 +0100

    Convert to git.

commit e05b7c3ad7a0fbcda5f8afbef70d95422b2a20db
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Mar 11 13:43:48 2010 +0100

    Themes also use branches.

-----------------------------------------------------------------------

Summary of changes:
 git-migration/migrate.sh |    2 +-
 website/pma-copy-docs    |    6 +++---
 website/pma-docs         |    4 ++--
 website/pma-planet       |    2 +-
 website/pma-stats        |    9 ---------
 website/pma-web          |    2 +-
 6 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100755 website/pma-stats

diff --git a/git-migration/migrate.sh b/git-migration/migrate.sh
index 1dca46d..652ef75 100755
--- a/git-migration/migrate.sh
+++ b/git-migration/migrate.sh
@@ -88,7 +88,7 @@ cd repos
 for repo in data  history  localized_docs  phpMyAdmin  planet  scripts  themes  website ; do
     git clone ../pma-svn-git-work $repo
     cd $repo
-    if [ $repo = phpMyAdmin ] ; then
+    if [ $repo = phpMyAdmin -o $repo = themes ] ; then
         for branch in `git branch -r | grep 'QA_[0-9_]*$\|MAINT_[0-9_]*$'` ; do
             git branch `basename $branch` $branch
         done
diff --git a/website/pma-copy-docs b/website/pma-copy-docs
index 67a6fa9..a807be5 100755
--- a/website/pma-copy-docs
+++ b/website/pma-copy-docs
@@ -3,8 +3,8 @@
 # Script to publish documentation on phpmyadmin.net
 
 # Main documentation + required files
-cd /home/pmaweb/pma/phpMyAdmin/
-svn -q up
+cd /home/pmaweb/pma/phpmyadmin/
+git pull -q
 rsync -az favicon.ico CREDITS ChangeLog Documentation.html INSTALL LICENSE README changelog.php docs.css license.php translators.html documentation-gsoc web.sourceforge.net:htdocs/documentation/
 cd themes/original/img/
 rsync -az docs_menu_bg.png logo_right.png web.sourceforge.net:htdocs/documentation/themes/original/img/
@@ -13,7 +13,7 @@ rsync -az vendor_config.php web.sourceforge.net:htdocs/documentation/libraries/
 
 # Localised documentation
 cd /home/pmaweb/pma/localized_docs/
-git pull
+git pull -q
 rsync -az --delete output/ web.sourceforge.net:htdocs/localized_docs/
 
 # Generate pointer to setup
diff --git a/website/pma-docs b/website/pma-docs
index c3090f4..ce9f3e3 100755
--- a/website/pma-docs
+++ b/website/pma-docs
@@ -7,8 +7,8 @@ tmpdir=`mktemp -td pmadocXXXXXXX`
 chmod 755 $tmpdir
 tmpfile=`mktemp -t pmadoclogXXXXXXX`
 chmod 644 $tmpfile
-cd /home/pmaweb/pma/phpMyAdmin/
-svn -q up
+cd /home/pmaweb/pma/phpmyadmin/
+git pull -q
 nice -19 \
     phpdoc \
         -d ./ \
diff --git a/website/pma-planet b/website/pma-planet
index 7a114f6..e21687f 100755
--- a/website/pma-planet
+++ b/website/pma-planet
@@ -5,5 +5,5 @@
 set -e
 
 cd /home/pmaweb/pma/planet/
-svn -q up
+git pull -q
 planet planet.ini
diff --git a/website/pma-stats b/website/pma-stats
deleted file mode 100755
index 9222bb9..0000000
--- a/website/pma-stats
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Script to generate SVN statistics of phpMyAdmin repository
-
-set -e
-
-/usr/bin/mpy-svn-stats -o /home/pmaweb/stats/ \
-     https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin
-rsync -az --delete /home/pmaweb/stats/ web.sourceforge.net:htdocs/svnstats/
diff --git a/website/pma-web b/website/pma-web
index 8d842f7..7bd29e6 100755
--- a/website/pma-web
+++ b/website/pma-web
@@ -9,7 +9,7 @@ error_handler() {
 trap error_handler INT QUIT EXIT
 
 cd /home/pmaweb/pma/website/
-svn -q up
+git pull -q
 ./render.py \
     --quiet \
     --server http://www.phpmyadmin.net \


hooks/post-receive
-- 
phpMyAdmin scripts