Merge branch 'master' into redesign-2015

Author: epriestley

conf/__init_conf__.php

@@ -1,15 +1,13 @@
 <?php
 
 function phabricator_read_config_file($original_config) {
-
   $root = dirname(dirname(__FILE__));
 
   // Accept either "myconfig" (preferred) or "myconfig.conf.php".
   $config = preg_replace('/\.conf\.php$/', '', $original_config);
   $full_config_path = $root.'/conf/'.$config.'.conf.php';
 
   if (!Filesystem::pathExists($full_config_path)) {
-
     // These are very old configuration files which we used to ship with
     // by default. File based configuration was de-emphasized once web-based
     // configuration was built. The actual files were removed to reduce
@@ -37,12 +35,14 @@ function phabricator_read_config_file($original_config) {
       $file = trim($file, './');
       $files[$key] = preg_replace('/\.conf\.php$/', '', $file);
     }
-    $files = "    ".implode("\n    ", $files);
+    $files = '    '.implode("\n    ", $files);
 
     throw new Exception(
-      "CONFIGURATION ERROR\n".
-      "Config file '{$original_config}' does not exist. Valid config files ".
-      "are:\n\n".$files);
+      pht(
+        "CONFIGURATION ERROR\n".
+        "Config file '%s' does not exist. Valid config files are:\n\n%s",
+        $original_config,
+        $files));
   }
 
   // Make sure config file errors are reported.
@@ -58,7 +58,11 @@ function phabricator_read_config_file($original_config) {
   ini_set('display_errors', $old_display_errors);
 
   if ($conf === false) {
-    throw new Exception("Failed to read config file '{$config}': {$errors}");
+    throw new Exception(
+      pht(
+        "Failed to read config file '%s': %s",
+        $config,
+        $errors));
   }
 
   return $conf;

resources/sql/autopatches/20150503.repositorysymbols.2.php

@@ -1,26 +1,29 @@
 <?php
 
-$projects = id(new PhabricatorRepositoryArcanistProjectQuery())
-  ->setViewer(PhabricatorUser::getOmnipotentUser())
-  ->needRepositories(true)
-  ->execute();
-
 $table = new PhabricatorRepositorySymbol();
 $conn_w = $table->establishConnection('w');
 
+$projects = queryfx_all(
+  $conn_w,
+  'SELECT * FROM %T',
+  'repository_arcanistproject');
+
 foreach ($projects as $project) {
-  $repo = $project->getRepository();
+  $repo = id(new PhabricatorRepositoryQuery())
+    ->setViewer(PhabricatorUser::getOmnipotentUser())
+    ->withIDs(array($project['repositoryID']))
+    ->executeOne();
 
   if (!$repo) {
     continue;
   }
 
-  echo pht("Migrating symbols for '%s' project...\n", $project->getName());
+  echo pht("Migrating symbols for '%s' project...\n", $project['name']);
 
   queryfx(
     $conn_w,
     'UPDATE %T SET repositoryPHID = %s WHERE arcanistProjectID = %d',
     $table->getTableName(),
     $repo->getPHID(),
-    $project->getID());
+    $project['id']);
 }