1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-26 08:42:40 +01:00

Remove arcanist projects from working copy code

Summary: Ref T7604. Remove "arcanist projects" from `ArcanistWorkingCopy` and a few other callsites. Depends on D12999.

Test Plan: Can't really think of how to test this.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley

Maniphest Tasks: T7604

Differential Revision: https://secure.phabricator.com/D12945
This commit is contained in:
Joshua Spence 2015-05-26 07:08:56 +10:00
parent 4c208cec16
commit 64d03ff68b
4 changed files with 2 additions and 34 deletions

View file

@ -49,15 +49,6 @@ final class ArcanistSettings {
'Associates this working copy with a specific installation of '. 'Associates this working copy with a specific installation of '.
'Phabricator.'), 'Phabricator.'),
), ),
'project.name' => array(
'type' => 'string',
'legacy' => 'project_id',
'example' => '"arcanist"',
'help' => pht(
'Associates this working copy with a named Arcanist Project. '.
'This is primarily useful if you use SVN and have several different '.
'projects in the same repository.'),
),
'lint.engine' => array( 'lint.engine' => array(
'type' => 'string', 'type' => 'string',
'legacy' => 'lint_engine', 'legacy' => 'lint_engine',

View file

@ -133,7 +133,6 @@ final class ArcanistBundle {
$path); $path);
$meta_info = $future->resolveJSON(); $meta_info = $future->resolveJSON();
$version = idx($meta_info, 'version', 0); $version = idx($meta_info, 'version', 0);
$project_name = idx($meta_info, 'projectName');
$base_revision = idx($meta_info, 'baseRevision'); $base_revision = idx($meta_info, 'baseRevision');
$revision_id = idx($meta_info, 'revisionID'); $revision_id = idx($meta_info, 'revisionID');
$encoding = idx($meta_info, 'encoding'); $encoding = idx($meta_info, 'encoding');
@ -142,7 +141,6 @@ final class ArcanistBundle {
} else { } else {
// this arc bundle was probably made before we started storing meta info // this arc bundle was probably made before we started storing meta info
$version = 0; $version = 0;
$project_name = null;
$base_revision = null; $base_revision = null;
$revision_id = null; $revision_id = null;
$encoding = null; $encoding = null;

View file

@ -648,17 +648,7 @@ EODIFF;
ConduitClient $conduit, ConduitClient $conduit,
array $query) { array $query) {
// We don't have much to go on in SVN, look for revisions that came from $results = $conduit->callMethodSynchronous('differential.query', $query);
// this directory and belong to the same project.
$project = $this->getWorkingCopyIdentity()->getProjectID();
if (!$project) {
return array();
}
$results = $conduit->callMethodSynchronous(
'differential.query',
$query);
foreach ($results as $key => $result) { foreach ($results as $key => $result) {
if ($result['sourcePath'] != $this->getPath()) { if ($result['sourcePath'] != $this->getPath()) {
@ -667,8 +657,7 @@ EODIFF;
} }
foreach ($results as $key => $result) { foreach ($results as $key => $result) {
$results[$key]['why'] = pht( $results[$key]['why'] = pht('Matching working copy directory path.');
'Matching arcanist project name and working copy directory path.');
} }
return $results; return $results;

View file

@ -216,16 +216,6 @@ final class ArcanistWorkingCopyIdentity {
$this->projectConfig = $config; $this->projectConfig = $config;
} }
public function getProjectID() {
$project_id = $this->getProjectConfig('project.name');
if ($project_id) {
return $project_id;
}
// This is an older name for the setting.
return $this->getProjectConfig('project_id');
}
public function getProjectRoot() { public function getProjectRoot() {
return $this->projectRoot; return $this->projectRoot;
} }