Merge remote-tracking branch 'upstream/master'

Conflicts:
	.arcconfig

Author: Luke Shepard

.arclint

@@ -1,8 +1,7 @@
 {
   "exclude": [
     "(^externals/)",
-    "(^webroot/rsrc/externals/(?!javelin/))",
-    "(/__tests__/data/)"
+    "(^webroot/rsrc/externals/(?!javelin/))"
   ],
   "linters": {
     "chmod": {
@@ -69,21 +68,7 @@
       "type": "spelling"
     },
     "text": {
-      "type": "text",
-      "exclude": [
-        "(^\\.arclint)",
-        "(^resources/sql/quickstart.sql)"
-      ]
-    },
-    "text-without-length": {
-      "type": "text",
-      "severity": {
-        "3": "disabled"
-      },
-      "include": [
-        "(^\\.arclint)",
-        "(^resources/sql/quickstart.sql)"
-      ]
+      "type": "text"
     },
     "xhpast": {
       "type": "xhpast",

.arcunit

@@ -0,0 +1,8 @@
+{
+  "engines": {
+    "phutil": {
+      "type": "phutil",
+      "include": "(\\.php$)"
+    }
+  }
+}

.editorconfig

@@ -3,12 +3,31 @@
 [*]
 indent_style = space
 indent_size = 2
+end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+max_line_length = 80
+
+[.arclint]
+max_line_length =
+
+[resources/sql/**.sql]
+max_line_length =
+
+[scripts/install/install_*.sh]
+max_line_length =
+
+[src/applications/differential/parser/__tests__/data/*.diff]
+trim_trailing_whitespace = false
+
+[src/applications/differential/parser/__tests__/messages/long-title.txt]
+max_line_length =
+
+[src/applications/diffusion/ssh/__tests__/hgwiredata/*.txt]
+max_line_length =
 
 [externals/**]
-; Use editor default (possible autodetection).
 indent_style =
 indent_size =
 trim_trailing_whitespace = false

LICENSE

@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/

README.md

@@ -4,16 +4,17 @@ Phabricator includes applications for:
 
   - reviewing and auditing source code;
   - hosting and browsing repositories;
-  - assembling a party to venture forth;
   - tracking bugs;
   - managing projects;
+  - conversing with team members;
+  - assembling a party to venture forth;
   - writing stuff down and reading it later;
   - hiding stuff from coworkers; and
   - also some other things.
 
 You can learn more about the project (and find links to documentation and resources) at [Phabricator.org](http://phabricator.org)
 
-Phabricator is developed and maintained by [Phacility](http://phacility.com). The first version of Phabricator was originally built at Facebook.
+Phabricator is developed and maintained by [Phacility](http://phacility.com).
 
 ----------
 

bin/garbage

@@ -0,0 +1 @@
+../scripts/setup/manage_garbage.php

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;