- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-243-g3c75387
by Dieter Adriaenssens 17 Mar '10

17 Mar '10

The branch, master has been updated via 3c7538701d361dea1c8ac4c0450bf477e74f3e1f (commit) via c7c77f9744e8bcd5eb27a4df86b2375dff2881ad (commit) from 767d16a8fa52a2d9ee30e3ed15b2f83c398bc027 (commit) - Log ----------------------------------------------------------------- commit 3c7538701d361dea1c8ac4c0450bf477e74f3e1f Merge: c7c77f9744e8bcd5eb27a4df86b2375dff2881ad 767d16a8fa52a2d9ee30e3ed15b2f83c398bc027 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Wed Mar 17 23:05:13 2010 +0100 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit c7c77f9744e8bcd5eb27a4df86b2375dff2881ad Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Wed Mar 17 22:50:27 2010 +0100 fix mistake in merge ----------------------------------------------------------------------- Summary of changes: tbl_change.php | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/tbl_change.php b/tbl_change.php index fae0455..0c89a17 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -462,11 +462,7 @@ foreach ($rows as $row_id => $vrow) { . htmlspecialchars($vrow[$field['Field']]) . '" />'; } else { // (we are inserting) -<<<<<<< HEAD // display default values -======= - // loic1: display default values ->>>>>>> QA_3_3 if (!isset($field['Default'])) { $field['Default'] = ''; $real_null_value = TRUE; @@ -482,11 +478,7 @@ foreach ($rows as $row_id => $vrow) { $backup_field = ''; $special_chars_encoded = PMA_duplicateFirstNewline($special_chars); // this will select the UNHEX function while inserting -<<<<<<< HEAD if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields'] && ! $cfg['ProtectBinary']) { -======= - if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { ->>>>>>> QA_3_3 $field['display_binary_as_hex'] = true; } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-241-g767d16a
by Marc Delisle 17 Mar '10

17 Mar '10

The branch, master has been updated via 767d16a8fa52a2d9ee30e3ed15b2f83c398bc027 (commit) from 27a56224ff4a059593fb3c50a8385a7ee4027179 (commit) - Log ----------------------------------------------------------------- commit 767d16a8fa52a2d9ee30e3ed15b2f83c398bc027 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Mar 17 17:50:23 2010 -0400 bug #2972232 Import menu tab not present on main page ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/server_links.inc.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b20e630..ab7277c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA shown in hex - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY - [navi] Changed link to git repository on main page +- bug #2972232 [menu] Import menu tab not present on main page 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 1366baa..40479d2 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -87,9 +87,9 @@ $tabs['import']['icon'] = 'b_import.png'; $tabs['import']['link'] = 'server_import.php'; $tabs['import']['text'] = $strImport; -$tabs['import']['icon'] = 's_sync.png'; -$tabs['import']['link'] = 'server_synchronize.php'; -$tabs['import']['text'] = $strSynchronize; +$tabs['synchronize']['icon'] = 's_sync.png'; +$tabs['synchronize']['link'] = 'server_synchronize.php'; +$tabs['synchronize']['text'] = $strSynchronize; echo PMA_generate_html_tabs($tabs, array()); unset($tabs); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-65-gcdfc277
by Marc Delisle 17 Mar '10

17 Mar '10

The branch, QA_3_3 has been updated via cdfc277bb7bd3b8fad0e45d9317fdd4578282206 (commit) from 142b1e2183660d25cb4827c56f8760f4cb66e714 (commit) - Log ----------------------------------------------------------------- commit cdfc277bb7bd3b8fad0e45d9317fdd4578282206 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Mar 17 17:48:29 2010 -0400 bug #2972232 Import menu tab not present on main page ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/server_links.inc.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfa265d..2cc1650 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA shown in hex - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY - [navi] Changed link to git repository on main page +- bug #2972232 [menu] Import menu tab not present on main page 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 1366baa..40479d2 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -87,9 +87,9 @@ $tabs['import']['icon'] = 'b_import.png'; $tabs['import']['link'] = 'server_import.php'; $tabs['import']['text'] = $strImport; -$tabs['import']['icon'] = 's_sync.png'; -$tabs['import']['link'] = 'server_synchronize.php'; -$tabs['import']['text'] = $strSynchronize; +$tabs['synchronize']['icon'] = 's_sync.png'; +$tabs['synchronize']['link'] = 'server_synchronize.php'; +$tabs['synchronize']['text'] = $strSynchronize; echo PMA_generate_html_tabs($tabs, array()); unset($tabs); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-240-g27a5622
by Dieter Adriaenssens 17 Mar '10

17 Mar '10

The branch, master has been updated via 27a56224ff4a059593fb3c50a8385a7ee4027179 (commit) via 142b1e2183660d25cb4827c56f8760f4cb66e714 (commit) via e2aaeaf1d621f5dd0ae4d97af383f8afe5b1ba73 (commit) via 13cb9e7e3e18208962f50e751891af3bcde3ec00 (commit) via b90805f7eb266967480295c02c9eb94680c4f7fb (commit) via 7b831bc8777c3f8195d33f3e7720d8123f3d9ce2 (commit) via e5ab5e637e6e09dec98a4ec7656818b2c71b022c (commit) via f0672d82c38af1593523e2271f4cadcd27e64e39 (commit) via 3e5c8f9f01042c42f6a656e06fd2bc61fe5786a5 (commit) from 8b221f354b54b0c282b96128acc6da5862b02668 (commit) - Log ----------------------------------------------------------------- commit 27a56224ff4a059593fb3c50a8385a7ee4027179 Merge: 8b221f354b54b0c282b96128acc6da5862b02668 142b1e2183660d25cb4827c56f8760f4cb66e714 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Wed Mar 17 22:14:47 2010 +0100 Merge branch 'QA_3_3' Conflicts: ChangeLog tbl_change.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ main.php | 4 ++-- tbl_addfield.php | 2 +- tbl_change.php | 8 ++++++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd423eb..b20e630 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2967366 [Structure] Some results of Propose table structure are shown in hex - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY +- [navi] Changed link to git repository on main page 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly @@ -69,6 +70,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Dieter Adriaenssens - ruleant - bug #2961198 [parser] Querying a table named "data" - bug #2931429 [structure] Editing long triggers +- bug #2970769 [structure] Incorrect reference to mootools-more.js 3.3.0.0 (2010-03-07) + rfe #2308632 [edit] Use hex for (var)binary fields, diff --git a/main.php b/main.php index 7f6ba61..ef9c6b5 100644 --- a/main.php +++ b/main.php @@ -239,8 +239,8 @@ PMA_printListItem($strHomepageOfficial, 'li_pma_homepage', 'http://www.phpMyAdmi ?> <li><bdo xml:lang="en" dir="ltr"> [<a href="changelog.php" target="_blank">ChangeLog</a>] - [<a href="http://phpmyadmin.svn.sourceforge.net/viewvc/phpmyadmin/" - target="_blank">Subversion</a>] + [<a href="http://phpmyadmin.git.sourceforge.net/git/gitweb-index.cgi" + target="_blank">Git</a>] [<a href="http://sourceforge.net/mail/?group_id=23067" target="_blank">Lists</a>] </bdo> diff --git a/tbl_addfield.php b/tbl_addfield.php index 886b939..cfa25f5 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -13,7 +13,7 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php'; $GLOBALS['js_include'][] = 'functions.js'; -$GLOBALS['js_include'][] = 'mootools-more.js'; +$GLOBALS['js_include'][] = 'mootools.js'; require_once './libraries/header.inc.php'; // Check parameters diff --git a/tbl_change.php b/tbl_change.php index 0c89a17..fae0455 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -462,7 +462,11 @@ foreach ($rows as $row_id => $vrow) { . htmlspecialchars($vrow[$field['Field']]) . '" />'; } else { // (we are inserting) +<<<<<<< HEAD // display default values +======= + // loic1: display default values +>>>>>>> QA_3_3 if (!isset($field['Default'])) { $field['Default'] = ''; $real_null_value = TRUE; @@ -478,7 +482,11 @@ foreach ($rows as $row_id => $vrow) { $backup_field = ''; $special_chars_encoded = PMA_duplicateFirstNewline($special_chars); // this will select the UNHEX function while inserting +<<<<<<< HEAD if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields'] && ! $cfg['ProtectBinary']) { +======= + if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { +>>>>>>> QA_3_3 $field['display_binary_as_hex'] = true; } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-64-g142b1e2
by Dieter Adriaenssens 17 Mar '10

17 Mar '10

The branch, QA_3_3 has been updated via 142b1e2183660d25cb4827c56f8760f4cb66e714 (commit) from e2aaeaf1d621f5dd0ae4d97af383f8afe5b1ba73 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + main.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01c6985..cfa265d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2967366 [Structure] Some results of Propose table structure are shown in hex - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY +- [navi] Changed link to git repository on main page 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/main.php b/main.php index bad9b9e..4bb6a75 100644 --- a/main.php +++ b/main.php @@ -239,8 +239,8 @@ PMA_printListItem($strHomepageOfficial, 'li_pma_homepage', 'http://www.phpMyAdmi ?> <li><bdo xml:lang="en" dir="ltr"> [<a href="changelog.php" target="_blank">ChangeLog</a>] - [<a href="http://phpmyadmin.svn.sourceforge.net/viewvc/phpmyadmin/" - target="_blank">Subversion</a>] + [<a href="http://phpmyadmin.git.sourceforge.net/git/gitweb-index.cgi" + target="_blank">Git</a>] [<a href="http://sourceforge.net/mail/?group_id=23067" target="_blank">Lists</a>] </bdo> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-231-g8b221f3
by Marc Delisle 16 Mar '10

16 Mar '10

The branch, master has been updated via 8b221f354b54b0c282b96128acc6da5862b02668 (commit) from 8bf35a0e146d249192b87691d883ab8912f3276e (commit) - Log ----------------------------------------------------------------- commit 8b221f354b54b0c282b96128acc6da5862b02668 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Mar 16 12:49:07 2010 -0400 typos ----------------------------------------------------------------------- Summary of changes: libraries/config.default.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index 3f56bd1..653fc53 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -446,7 +446,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D 'CREATE DATABASE,ALTER DATABASE,DROP DATABASE'; /** - * Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view. + * Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_view'] */ @@ -454,7 +454,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D $cfg['Servers'][$i]['tracking_add_drop_view'] = true; /** - * Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table. + * Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_table'] */ @@ -462,7 +462,7 @@ $cfg['Servers'][$i]['tracking_add_drop_view'] = true; $cfg['Servers'][$i]['tracking_add_drop_table'] = true; /** - * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. + * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_database'] */ @@ -470,7 +470,7 @@ $cfg['Servers'][$i]['tracking_add_drop_table'] = true; $cfg['Servers'][$i]['tracking_add_drop_database'] = true; /** - * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. + * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. * * @global bool $cfg['Servers'][$i]['tracking_version_drop_database'] */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-63-ge2aaeaf
by Marc Delisle 16 Mar '10

16 Mar '10

The branch, QA_3_3 has been updated via e2aaeaf1d621f5dd0ae4d97af383f8afe5b1ba73 (commit) from 13cb9e7e3e18208962f50e751891af3bcde3ec00 (commit) - Log ----------------------------------------------------------------- commit e2aaeaf1d621f5dd0ae4d97af383f8afe5b1ba73 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Mar 16 12:47:42 2010 -0400 typos ----------------------------------------------------------------------- Summary of changes: libraries/config.default.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index 3450739..b1fef17 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -439,7 +439,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D 'CREATE DATABASE,ALTER DATABASE,DROP DATABASE'; /** - * Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view. + * Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_view'] */ @@ -447,7 +447,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D $cfg['Servers'][$i]['tracking_add_drop_view'] = true; /** - * Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table. + * Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_table'] */ @@ -455,7 +455,7 @@ $cfg['Servers'][$i]['tracking_add_drop_view'] = true; $cfg['Servers'][$i]['tracking_add_drop_table'] = true; /** - * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. + * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_database'] */ @@ -463,7 +463,7 @@ $cfg['Servers'][$i]['tracking_add_drop_table'] = true; $cfg['Servers'][$i]['tracking_add_drop_database'] = true; /** - * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. + * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. * * @global bool $cfg['Servers'][$i]['tracking_version_drop_database'] */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-230-g8bf35a0
by Marc Delisle 16 Mar '10

16 Mar '10

The branch, master has been updated via 8bf35a0e146d249192b87691d883ab8912f3276e (commit) from b7bbb967baa622cc2a586609b56aaba356898a19 (commit) - Log ----------------------------------------------------------------- commit 8bf35a0e146d249192b87691d883ab8912f3276e Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Mar 16 12:42:56 2010 -0400 typos ----------------------------------------------------------------------- Summary of changes: Documentation.html | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation.html b/Documentation.html index bb1c27d..4c5157d 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1115,7 +1115,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> $cfg['Servers'][$i]['tracking_version_drop_view'] boolean </dt> <dd> - Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view. Default value is true. + Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view. Default value is true. </dd> @@ -1124,7 +1124,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> $cfg['Servers'][$i]['tracking_version_drop_table'] boolean </dt> <dd> - Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table. Default value is true. + Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table. Default value is true. </dd> @@ -1132,7 +1132,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> $cfg['Servers'][$i]['tracking_version_drop_database'] boolean </dt> <dd> - Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. Default value is true. + Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. Default value is true. </dd> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-62-g13cb9e7
by Marc Delisle 16 Mar '10

16 Mar '10

The branch, QA_3_3 has been updated via 13cb9e7e3e18208962f50e751891af3bcde3ec00 (commit) from b90805f7eb266967480295c02c9eb94680c4f7fb (commit) - Log ----------------------------------------------------------------- commit 13cb9e7e3e18208962f50e751891af3bcde3ec00 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Mar 16 12:38:56 2010 -0400 typos ----------------------------------------------------------------------- Summary of changes: Documentation.html | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation.html b/Documentation.html index 30537f0..6656c0e 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1103,7 +1103,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> $cfg['Servers'][$i]['tracking_version_drop_view'] boolean </dt> <dd> - Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view. Default value is true. + Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view. Default value is true. </dd> @@ -1112,7 +1112,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> $cfg['Servers'][$i]['tracking_version_drop_table'] boolean </dt> <dd> - Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table. Default value is true. + Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table. Default value is true. </dd> @@ -1120,7 +1120,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> $cfg['Servers'][$i]['tracking_version_drop_database'] boolean </dt> <dd> - Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. Default value is true. + Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. Default value is true. </dd> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-229-gb7bbb96
by Marc Delisle 16 Mar '10

16 Mar '10

The branch, master has been updated via b7bbb967baa622cc2a586609b56aaba356898a19 (commit) from e338388cce3e489f61bc04f3eeda29933753140c (commit) - Log ----------------------------------------------------------------- commit b7bbb967baa622cc2a586609b56aaba356898a19 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Mar 16 08:10:49 2010 -0400 no branch exist in the cloned directory; advice for changes before validation ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 61 ++++++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 31 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 269ef44..9e5b0a1 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -35,15 +35,27 @@ shift branch=$1 shift -# Create working copy -mkdir -p release -workdir=release/phpMyAdmin-$version -if [ -d $workdir ] ; then - echo "Working directory '$workdir' already exists, please move it out of way" - exit 1 +cat <<END + +Please ensure you have: + 1. incremented rc count or version in the repository : + - in libraries/Config.class.php PMA_Config::__constructor() the line + " \$this->set( 'PMA_VERSION', '$version' ); " + - in Documentation.html the 2 lines + " <title>phpMyAdmin $version - Documentation</title> " + " <h1>phpMyAdmin $version Documentation</h1> " + - in translators.html + - in README + 2. checked that all language files are valid (use + the "./scripts/check_lang.php" script to do it). + +Continue (y/n)? +END +read do_release + +if [ "$do_release" != 'y' ]; then + exit 100 fi -git clone --local . $workdir -cd $workdir # Checkout branch git checkout $branch @@ -66,28 +78,15 @@ if ! grep -q "Version $version\$" README ; then exit 2 fi -cat <<END - -Please ensure you have: - 1. incremented rc count or version in the repository : - - in libraries/Config.class.php PMA_Config::__constructor() the line - " \$this->set( 'PMA_VERSION', '$version' ); " - - in Documentation.html the 2 lines - " <title>phpMyAdmin $version - Documentation</title> " - " <h1>phpMyAdmin $version Documentation</h1> " - - in translators.html - - in README - 2. checked that all language files are valid (use - the "./scripts/check_lang.php" script to do it). - -Continue (y/n)? -END -read do_release - -if [ "$do_release" != 'y' ]; then - exit 100 +# Create working copy +mkdir -p release +workdir=release/phpMyAdmin-$version +if [ -d $workdir ] ; then + echo "Working directory '$workdir' already exists, please move it out of way" + exit 1 fi - +git clone --local . $workdir +cd $workdir # Cleanup release dir LC_ALL=C date -u > RELEASE-DATE-${version} @@ -203,8 +202,8 @@ cat <<END Todo now: --------- - 1. tag the repository with the new revision number for a plain release - or a release candidate: +1. If not already done, tag the repository with the new revision number + for a plain release or a release candidate: version 2.7.0 gets two tags: RELEASE_2_7_0 and STABLE version 2.7.1-rc1 gets RELEASE_2_7_1RC1 and TESTING hooks/post-receive -- phpMyAdmin

1 0