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']);
 }

resources/sql/autopatches/20150504.symbolsproject.1.php

@@ -11,6 +11,10 @@
 $raw_projects_data = ipull($raw_projects_data, null, 'id');
 
 $repository_ids = ipull($raw_projects_data, 'repositoryID');
+if (!$repository_ids) {
+  return;
+}
+
 $repositories = id(new PhabricatorRepositoryQuery())
   ->setViewer(PhabricatorUser::getOmnipotentUser())
   ->withIDs($repository_ids)

resources/sql/autopatches/20150527.calendar.recurringevents.sql

@@ -0,0 +1,17 @@
+ALTER TABLE {$NAMESPACE}_calendar.calendar_event
+    ADD isRecurring BOOL NOT NULL;
+
+ALTER TABLE {$NAMESPACE}_calendar.calendar_event
+    ADD recurrenceFrequency LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL;
+
+ALTER TABLE {$NAMESPACE}_calendar.calendar_event
+    ADD recurrenceEndDate INT UNSIGNED;
+
+ALTER TABLE {$NAMESPACE}_calendar.calendar_event
+    ADD instanceOfEventPHID varbinary(64);
+
+ALTER TABLE {$NAMESPACE}_calendar.calendar_event
+    ADD sequenceIndex INT UNSIGNED;
+
+UPDATE {$NAMESPACE}_calendar.calendar_event
+    SET recurrenceFrequency = '[]' WHERE recurrenceFrequency = '';

resources/sql/autopatches/20150601.spaces.1.namespace.sql

@@ -0,0 +1,12 @@
+CREATE TABLE {$NAMESPACE}_spaces.spaces_namespace (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  phid VARBINARY(64) NOT NULL,
+  namespaceName VARCHAR(255) NOT NULL COLLATE {$COLLATE_TEXT},
+  viewPolicy VARBINARY(64) NOT NULL,
+  editPolicy VARBINARY(64) NOT NULL,
+  isDefaultNamespace BOOL,
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL,
+  UNIQUE KEY `key_phid` (phid),
+  UNIQUE KEY `key_default` (isDefaultNamespace)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20150601.spaces.2.xaction.sql

@@ -0,0 +1,19 @@
+CREATE TABLE {$NAMESPACE}_spaces.spaces_namespacetransaction (
+  id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  phid VARBINARY(64) NOT NULL,
+  authorPHID VARBINARY(64) NOT NULL,
+  objectPHID VARBINARY(64) NOT NULL,
+  viewPolicy VARBINARY(64) NOT NULL,
+  editPolicy VARBINARY(64) NOT NULL,
+  commentPHID VARBINARY(64),
+  commentVersion INT UNSIGNED NOT NULL,
+  transactionType VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT},
+  oldValue LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  newValue LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  contentSource LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  metadata LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL,
+  UNIQUE KEY `key_phid` (phid),
+  KEY `key_object` (objectPHID)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

resources/sql/autopatches/20150602.mlist.1.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_user.user
+  ADD isMailingList BOOL NOT NULL;

resources/sql/autopatches/20150602.mlist.2.php

@@ -0,0 +1,145 @@
+<?php
+
+$conn_w = id(new PhabricatorMetaMTAMail())->establishConnection('w');
+$lists = new LiskRawMigrationIterator($conn_w, 'metamta_mailinglist');
+
+echo pht('Migrating mailing lists...')."\n";
+
+foreach ($lists as $list) {
+  $name = $list['name'];
+  $email = $list['email'];
+  $uri = $list['uri'];
+  $old_phid = $list['phid'];
+
+  $username = preg_replace('/[^a-zA-Z0-9_-]+/', '-', $name);
+  $username = preg_replace('/-{2,}/', '-', $username);
+  $username = trim($username, '-');
+  if (!strlen($username)) {
+    $username = 'mailinglist';
+  }
+  $username .= '-list';
+
+  $username_okay = false;
+  for ($suffix = 1; $suffix <= 9; $suffix++) {
+    if ($suffix == 1) {
+      $effective_username = $username;
+    } else {
+      $effective_username = $username.$suffix;
+    }
+
+    $collision = id(new PhabricatorPeopleQuery())
+      ->setViewer(PhabricatorUser::getOmnipotentUser())
+      ->withUsernames(array($effective_username))
+      ->executeOne();
+    if (!$collision) {
+      $username_okay = true;
+      break;
+    }
+  }
+
+  if (!$username_okay) {
+    echo pht(
+      'Failed to migrate mailing list "%s": unable to generate a unique '.
+      'username for it.')."\n";
+    continue;
+  }
+
+  $username = $effective_username;
+  if (!PhabricatorUser::validateUsername($username)) {
+    echo pht(
+      'Failed to migrate mailing list "%s": unable to generate a valid '.
+      'username for it.',
+      $name)."\n";
+    continue;
+  }
+
+  $address = id(new PhabricatorUserEmail())->loadOneWhere(
+    'address = %s',
+    $email);
+  if ($address) {
+    echo pht(
+      'Failed to migrate mailing list "%s": an existing user already '.
+      'has the email address "%s".',
+      $name,
+      $email)."\n";
+    continue;
+  }
+
+  $user = id(new PhabricatorUser())
+    ->setUsername($username)
+    ->setRealName(pht('Mailing List "%s"', $name))
+    ->setIsApproved(1)
+    ->setIsMailingList(1);
+
+  $email_object = id(new PhabricatorUserEmail())
+    ->setAddress($email)
+    ->setIsVerified(1);
+
+  try {
+    id(new PhabricatorUserEditor())
+      ->setActor($user)
+      ->createNewUser($user, $email_object);
+  } catch (Exception $ex) {
+    echo pht(
+      'Failed to migrate mailing list "%s": %s.',
+      $name,
+      $ex->getMessage())."\n";
+    continue;
+  }
+
+  $new_phid = $user->getPHID();
+
+  // NOTE: After the PHID type is removed we can't use any Edge code to
+  // modify edges.
+
+  $edge_type = PhabricatorSubscribedToObjectEdgeType::EDGECONST;
+  $edge_inverse = PhabricatorObjectHasSubscriberEdgeType::EDGECONST;
+
+  $map = PhabricatorPHIDType::getAllTypes();
+  foreach ($map as $type => $spec) {
+    try {
+      $object = $spec->newObject();
+      if (!$object) {
+        continue;
+      }
+      $object_conn_w = $object->establishConnection('w');
+      queryfx(
+        $object_conn_w,
+        'UPDATE %T SET dst = %s WHERE dst = %s AND type = %s',
+        PhabricatorEdgeConfig::TABLE_NAME_EDGE,
+        $new_phid,
+        $old_phid,
+        $edge_inverse);
+    } catch (Exception $ex) {
+      // Just ignore these; they're mostly tables not existing.
+      continue;
+    }
+  }
+
+  try {
+    $dst_phids = queryfx_all(
+      $conn_w,
+      'SELECT dst FROM %T WHERE src = %s AND type = %s',
+      PhabricatorEdgeConfig::TABLE_NAME_EDGE,
+      $old_phid,
+      $edge_type);
+    if ($dst_phids) {
+      $editor = new PhabricatorEdgeEditor();
+      foreach ($dst_phids as $dst_phid) {
+        $editor->addEdge($new_phid, $edge_type, $dst_phid['dst']);
+      }
+      $editor->save();
+    }
+  } catch (Exception $ex) {
+    echo pht(
+      'Unable to migrate some inverse edges for mailing list "%s": %s.',
+      $name,
+      $ex->getMessage())."\n";
+    continue;
+  }
+
+  echo pht(
+    'Migrated mailing list "%s" to mailing list user "%s".',
+    $name,
+    $user->getUsername())."\n";
+}

resources/sql/autopatches/20150604.spaces.1.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_pastebin.pastebin_paste
+  ADD spacePHID VARBINARY(64);