cvs: SVNROOT / httpd.conf phpsvn.options.skel run-conversion.php

gwynne Sun Jun 21 16:35:01 2009 UTC Modified files: /SVNROOT httpd.conf phpsvn.options.skel run-conversion.php Log: update options skeleton for cvs2svn 2.2.0 fix several typos in conversion script

http://cvs.php.net/viewvc.cgi/SVNROOT/httpd.conf?r1=1.5&r2=1.6&diff_format=u Index: SVNROOT/httpd.conf diff -u SVNROOT/httpd.conf:1.5 SVNROOT/httpd.conf:1.6 --- SVNROOT/httpd.conf:1.5 Tue Dec 23 17:48:16 2008 +++ SVNROOT/httpd.conf Sun Jun 21 16:35:00 2009 @@ -15,12 +15,16 @@ </Location> </VirtualHost> +#NameVirtualHost *:443 <VirtualHost *:443> SSLEngine On + SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL + SSLCertificateFile /local/this-box/php.net.crt + SSLCertificateKeyFile /local/this-box/php.net.key ServerName svn.php.net - CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-svn_log.%Y%m%d 86400" "%t %u %{SVN-ACTION}e" env=SVN-ACTION - CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-access_log.%Y%m%d 86400" combined - ErrorLog "|/local/bin/rotatelogs /home/svn/logs/svn-error_log.%Y%m%d 86400" + CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-svn_log.%Y%m%d 86400" "%t %u %{SVN-ACTION}e" env=SVN-ACTION + CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-access_log.%Y%m%d 86400" combined + ErrorLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-error_log.%Y%m%d 86400" <Location "/"> DAV svn SVNPath "/home/svn/repository" @@ -32,3 +36,4 @@ AuthDigestDomain "/" </Location> </VirtualHost> + http://cvs.php.net/viewvc.cgi/SVNROOT/phpsvn.options.skel?r1=1.2&r2=1.3&diff_format=u Index: SVNROOT/phpsvn.options.skel diff -u SVNROOT/phpsvn.options.skel:1.2 SVNROOT/phpsvn.options.skel:1.3 --- SVNROOT/phpsvn.options.skel:1.2 Sun Nov 9 06:37:09 2008 +++ SVNROOT/phpsvn.options.skel Sun Jun 21 16:35:00 2009 @@ -2,7 +2,6 @@ import re import os -from cvs2svn_lib.boolean import * from cvs2svn_lib import config from cvs2svn_lib import changeset_database from cvs2svn_lib.common import CVSTextDecoder @@ -56,7 +55,6 @@ UnambiguousUsageRule(), BranchIfCommitsRule(), HeuristicStrategyRule(), - DefaultBasePathRule(), HeuristicPreferredParentRule(), ] ctx.username = 'cvs2svn' @@ -73,6 +71,7 @@ ctx.tmpdir = r'@@@TEMPDIR@@@' ctx.cross_project_commits = False ctx.cross_branch_commits = False +ctx.keep_cvsignore = False ctx.retain_conflicting_attic_files = True run_options.profiling = False changeset_database.use_mmap_for_cvs_item_to_changeset_table = False http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.61&r2=1.62&diff_format=u Index: SVNROOT/run-conversion.php diff -u SVNROOT/run-conversion.php:1.61 SVNROOT/run-conversion.php:1.62 --- SVNROOT/run-conversion.php:1.61 Sat Jun 20 09:50:55 2009 +++ SVNROOT/run-conversion.php Sun Jun 21 16:35:00 2009 @@ -7,7 +7,7 @@ // ----------------------------------------------------------------------------------------------------------------------------- // Constants -$version = substr('$Revision: 1.61 $', strlen('$Revision: '), -2); +$version = substr('$Revision: 1.62 $', strlen('$Revision: '), -2); $passes = array( 'processcvs', // Process CVS modules @@ -45,7 +45,7 @@ // Returns true if either 1) We're running all passes, or 2) running the specific pass given function is_running_pass($pass) { - return $GLOBALS['options']['pass'] === NULL || $GLOBALS['options']['pass'] == $pass; + return $GLOBALS['options']['pass'] === NULL || $GLOBALS['options']['pass'] == $pass || ($pass == 'processcvs' && $GLOBALS['options']['pass'] == 'cvs2svn'); } function scandir_is_meta($value) @@ -72,7 +72,7 @@ v(2, "Running '{$command}'..."); exec($command, $output, $lExitStatus); if ($lExitStatus != 0 && !$ignoreErrors) { - error("\nAn error occurred. Exit status was {$exitstatus}. Output:\n" . implode("\n", $output) . "\n"); + error("\nAn error occurred. Exit status was {$lExitStatus}. Output:\n" . implode("\n", $output) . "\n"); } else if ($lExitStatus != 0) { v(2, " warning: an error occurred.\n"); } else { @@ -157,7 +157,7 @@ $result = $cmdline_parser->parse(); $options = $result->options; } catch (Exception $ex) { - $parser->displayError($ex->getMessage()); + $cmdline_parser->displayError($ex->getMessage()); exit(1); } @@ -222,7 +222,7 @@ // Special case for problematic modules if (!is_dir($cvspath . $module) || count(scandir($cvspath . $module)) == 2 || $module == 'Attic' || - ($moduleName == 'php/pecl' && $module == 'libextractor') || + ($moduleName == 'php/pecl' && in_array($module, array('libextractor', 'cudpp'))) || ($moduleName == 'pear/modules' && in_array($module, array('HTML_QuickForm_ComboBox', 'Services_Compete', 'XML_HTMLSax3')))) { continue; // empty dir } @@ -487,11 +487,11 @@ { // Re-link the PECL extensions to php-src using svn:externals. // XXX THERE IS A BUG HERE WHICH IS CAUSING EXTENSIONS TO BE LINKED INTO BRANCHES THEY SHOULDN'T BE - $svnPath = "{$GLOBALS['options']['svnroot']}/repository/php/php-src"; + $svnPath = "{$GLOBALS['options']['svnroot']}/repository/php"; // Get a complete list of tags and branches in the converted SVN repository - $rawTagList = run_command('exec svn ls file:///' . escapeshellarg("{$svnPath}/tags")); - $rawBranchList = run_command('exec svn ls file:///' . escapeshellarg("{$svnPath}/branches")); + $rawTagList = run_command('exec svn ls file:///' . escapeshellarg("{$svnPath}/php-src/tags")); + $rawBranchList = run_command('exec svn ls file:///' . escapeshellarg("{$svnPath}/php-src/branches")); $oldcwd = getcwd(); @@ -500,7 +500,7 @@ $tmpfilePath = "{$GLOBALS['temp_path']}/sparse-co-output"; if (!file_exists($sparseCoPath)) { // Checkout branches, tags, trunk - run_command('exec svn checkout --depth immediates file:///' . escapeshellarg($svnPath) . ' ' . + run_command('exec svn checkout --depth immediates file:///' . escapeshellarg("{$svnPath}/php-src") . ' ' . escapeshellarg($sparseCoPath) . ' > ' . escapeshellarg($tmpfilePath)); // Checkout trunk run_command('cd ' . escapeshellarg("{$sparseCoPath}/trunk") . ' && exec svn update --set-depth immediates >> ' . escapeshellarg($tmpfilePath)); @@ -528,33 +528,34 @@ // For each link, get its creation date from the ORIGINAL CVS root. // Then, for each tag and branch, see whether the given link has a same-named directory. If so, make a link. Always make a link for trunk. $props = array(); + $status = -1; foreach ($links as $link) { foreach ($rawTagList as $tag) { $tag = substr($tag, 0, -1); - $externalPath = $svnPath . "/php/pecl/{$link}/tags/{$tag}"; + $externalPath = $svnPath . "/pecl/{$link}/tags/{$tag}"; run_command("exec svn ls file:///" . escapeshellarg($externalPath) . " 2>/dev/null", TRUE, $status); if ($status === 0) { v(2, "Tag {$tag} exists in ^/php/pecl/{$link}/tags. Adding external.\n"); $path = 'tags' . DIR_SEP . $tag . DIR_SEP . 'ext'; - $props[$path] = (isset($props[$path]) ? $props[$path] : '') . "^/php/pecl/{$link}/tags/{$tag} {$link}"; + $props[$path] = (isset($props[$path]) ? $props[$path] : '') . "^/php/pecl/{$link}/tags/{$tag} {$link}\n"; } else { - v(2, "Tag {$tag} does NOT exist in ^/php/pecl/{$link}/tags. NOT adding external.\n"); + v(2, "Tag {$tag} does NOT exist in ^/php/pecl/{$link}/tags. NOT adding external {$status}.\n"); } } foreach ($rawBranchList as $branch) { $branch = substr($branch, 0, -1); - $externalPath = $svnPath . "/php/pecl/{$link}/branches/{$branch}"; + $externalPath = $svnPath . "/pecl/{$link}/branches/{$branch}"; run_command("exec svn ls file:///" . escapeshellarg($externalPath) . " 2>/dev/null", TRUE, $status); if ($status === 0) { v(2, "Branch {$branch} exists in ^/php/pecl/{$link}/branches. Adding external.\n"); $path = 'branches' . DIR_SEP . $branch . DIR_SEP . 'ext'; - $props[$path] = (isset($props[$path]) ? $props[$path] : '') . "^/php/pecl/{$link}/branches/{$branch} {$link}"; + $props[$path] = (isset($props[$path]) ? $props[$path] : '') . "^/php/pecl/{$link}/branches/{$branch} {$link}\n"; } else { v(2, "Branch {$branch} does NOT exist in ^/php/pecl/{$link}/branches. NOT adding external.\n"); } } $path = 'trunk' . DIR_SEP . 'ext'; - $props[$path] = (isset($props[$path]) ? $props[$path] : '') . "^/php/pecl/{$link}/trunk {$link}"; + $props[$path] = (isset($props[$path]) ? $props[$path] : '') . "^/php/pecl/{$link}/trunk {$link}\n"; } foreach ($props as $path => $value) {