Page MenuHomePhabricator
Files F15316587

D12945.id31374.diff
No OneTemporary
Actions

D12945.id31374.diff
View Options

diff --git a/src/configuration/ArcanistSettings.php b/src/configuration/ArcanistSettings.php
--- a/src/configuration/ArcanistSettings.php
+++ b/src/configuration/ArcanistSettings.php
@@ -49,15 +49,6 @@
'Associates this working copy with a specific installation of '.
'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(
'type' => 'string',
'legacy' => 'lint_engine',
diff --git a/src/parser/ArcanistBundle.php b/src/parser/ArcanistBundle.php
--- a/src/parser/ArcanistBundle.php
+++ b/src/parser/ArcanistBundle.php
@@ -133,7 +133,6 @@
$path);
$meta_info = $future->resolveJSON();
$version = idx($meta_info, 'version', 0);
- $project_name = idx($meta_info, 'projectName');
$base_revision = idx($meta_info, 'baseRevision');
$revision_id = idx($meta_info, 'revisionID');
$encoding = idx($meta_info, 'encoding');
@@ -142,7 +141,6 @@
} else {
// this arc bundle was probably made before we started storing meta info
$version = 0;
- $project_name = null;
$base_revision = null;
$revision_id = null;
$encoding = null;
diff --git a/src/repository/api/ArcanistSubversionAPI.php b/src/repository/api/ArcanistSubversionAPI.php
--- a/src/repository/api/ArcanistSubversionAPI.php
+++ b/src/repository/api/ArcanistSubversionAPI.php
@@ -648,17 +648,7 @@
ConduitClient $conduit,
array $query) {
- // We don't have much to go on in SVN, look for revisions that came from
- // this directory and belong to the same project.
-
- $project = $this->getWorkingCopyIdentity()->getProjectID();
- if (!$project) {
- return array();
- }
-
- $results = $conduit->callMethodSynchronous(
- 'differential.query',
- $query);
+ $results = $conduit->callMethodSynchronous('differential.query', $query);
foreach ($results as $key => $result) {
if ($result['sourcePath'] != $this->getPath()) {
@@ -667,8 +657,7 @@
}
foreach ($results as $key => $result) {
- $results[$key]['why'] = pht(
- 'Matching arcanist project name and working copy directory path.');
+ $results[$key]['why'] = pht('Matching working copy directory path.');
}
return $results;
diff --git a/src/workingcopyidentity/ArcanistWorkingCopyIdentity.php b/src/workingcopyidentity/ArcanistWorkingCopyIdentity.php
--- a/src/workingcopyidentity/ArcanistWorkingCopyIdentity.php
+++ b/src/workingcopyidentity/ArcanistWorkingCopyIdentity.php
@@ -216,16 +216,6 @@
$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() {
return $this->projectRoot;
}

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 7, 6:49 PM (2 w, 51 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7343698
Default Alt Text
D12945.id31374.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility