Page MenuHomePhabricator
Files F15451271

D8578.id20355.diff
No OneTemporary
Actions

D8578.id20355.diff
View Options

diff --git a/scripts/arcanist.php b/scripts/arcanist.php
--- a/scripts/arcanist.php
+++ b/scripts/arcanist.php
@@ -193,7 +193,7 @@
$need_repository_api;
if ($need_working_copy || $want_working_copy) {
- if ($need_working_copy && !$working_copy->getProjectRoot()) {
+ if ($need_working_copy && !$working_copy->getVCSType()) {
throw new ArcanistUsageException(
"This command must be run in a Git, Mercurial or Subversion working ".
"copy.");
@@ -286,7 +286,8 @@
$workflow->authenticateConduit();
}
- if ($need_repository_api || ($want_repository_api && $working_copy)) {
+ if ($need_repository_api ||
+ ($want_repository_api && $working_copy->getVCSType())) {
$repository_api = ArcanistRepositoryAPI::newAPIFromConfigurationManager(
$configuration_manager);
$workflow->setRepositoryAPI($repository_api);
diff --git a/src/workflow/ArcanistShellCompleteWorkflow.php b/src/workflow/ArcanistShellCompleteWorkflow.php
--- a/src/workflow/ArcanistShellCompleteWorkflow.php
+++ b/src/workflow/ArcanistShellCompleteWorkflow.php
@@ -58,9 +58,9 @@
// We have to build our own because if we requiresWorkingCopy() we'll throw
// if we aren't in a .arcconfig directory. We probably still can't do much,
// but commands can raise more detailed errors.
- $working_copy = ArcanistWorkingCopyIdentity::newFromPath(getcwd());
$configuration_manager = $this->getConfigurationManager();
- if ($working_copy->getProjectRoot()) {
+ $working_copy = ArcanistWorkingCopyIdentity::newFromPath(getcwd());
+ if ($working_copy->getVCSType()) {
$configuration_manager->setWorkingCopyIdentity($working_copy);
$repository_api = ArcanistRepositoryAPI::newAPIFromConfigurationManager(
$configuration_manager);

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 29, 9:09 PM (4 w, 11 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7723155
Default Alt Text
D8578.id20355.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility