Page MenuHomePhabricator
Files F15397080

D12999.diff
No OneTemporary
Actions

D12999.diff
View Options

diff --git a/scripts/arcanist.php b/scripts/arcanist.php
--- a/scripts/arcanist.php
+++ b/scripts/arcanist.php
@@ -114,11 +114,6 @@
}
$configuration_manager->setWorkingCopyIdentity($working_copy);
- reenter_if_this_is_arcanist_or_libphutil(
- $console,
- $working_copy,
- $original_argv);
-
// Load additional libraries, which can provide new classes like configuration
// overrides, linters and lint engines, unit test engines, etc.
@@ -646,75 +641,3 @@
}
}
}
-
-
-/**
- * NOTE: SPOOKY BLACK MAGIC
- *
- * When arc is run in a copy of arcanist other than itself, or a copy of
- * libphutil other than the one we loaded, reenter the script and force it
- * to use the current working directory instead of the default.
- *
- * In the case of execution inside arcanist/, we force execution of the local
- * arc binary.
- *
- * In the case of execution inside libphutil/, we force the local copy to load
- * instead of the one selected by default rules.
- *
- * @param PhutilConsole Console.
- * @param ArcanistWorkingCopyIdentity The current working copy.
- * @param array Original arc arguments.
- * @return void
- */
-function reenter_if_this_is_arcanist_or_libphutil(
- PhutilConsole $console,
- ArcanistWorkingCopyIdentity $working_copy,
- array $original_argv) {
-
- $project_id = $working_copy->getProjectID();
- if ($project_id != 'arcanist' && $project_id != 'libphutil') {
- // We're not in a copy of arcanist or libphutil.
- return;
- }
-
- $library_names = array(
- 'arcanist' => 'arcanist',
- 'libphutil' => 'phutil',
- );
-
- $library_root = phutil_get_library_root($library_names[$project_id]);
- $project_root = $working_copy->getProjectRoot();
- if (Filesystem::isDescendant($library_root, $project_root)) {
- // We're in a copy of arcanist or libphutil, but already loaded the correct
- // copy. Continue execution normally.
- return;
- }
-
- if ($project_id == 'libphutil') {
- $console->writeLog(
- "%s\n",
- pht('This is libphutil! Forcing this copy to load...'));
- $original_argv[0] = dirname(phutil_get_library_root('arcanist')).'/bin/arc';
- $libphutil_path = $project_root;
- } else {
- $console->writeLog(
- "%s\n",
- pht('This is arcanist! Forcing this copy to run...'));
- $original_argv[0] = $project_root.'/bin/arc';
- $libphutil_path = dirname(phutil_get_library_root('phutil'));
- }
-
- if (phutil_is_windows()) {
- $err = phutil_passthru(
- 'set ARC_PHUTIL_PATH=%s & %Ls',
- $libphutil_path,
- $original_argv);
- } else {
- $err = phutil_passthru(
- 'ARC_PHUTIL_PATH=%s %Ls',
- $libphutil_path,
- $original_argv);
- }
-
- exit($err);
-}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 17, 6:01 PM (1 d, 13 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7705825
Default Alt Text
D12999.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility