mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-26 00:32:41 +01:00
Remove call to "arcanist.projectinfo" from arc export
Summary: Ref T7604. Remove a call to `arcanist.projectinfo` from `arc export`. This Conduit call was only used to detect the repository encoding, which we should be able to do locally anyway. I was considering removing the `$projectName` from `ArcanistBundle` as well, but I'm not convinved that this is a good idea. Specifically, doing so would make it difficult to issue the "This patch is for the 'X' project, but the working copy belongs to the 'Y' project" error. We could potentially use the repository callsign for this purposes, but this isn't portable across installs. Test Plan: I'm not quite sure how to test this. I suspect that this functionality isn't widely used anyway. Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: Korvin, epriestley Maniphest Tasks: T7604 Differential Revision: https://secure.phabricator.com/D12962
This commit is contained in:
parent
9b7c6786cd
commit
be9dd352be
3 changed files with 0 additions and 26 deletions
|
@ -9,7 +9,6 @@ final class ArcanistBundle {
|
||||||
private $conduit;
|
private $conduit;
|
||||||
private $blobs = array();
|
private $blobs = array();
|
||||||
private $diskPath;
|
private $diskPath;
|
||||||
private $projectID;
|
|
||||||
private $baseRevision;
|
private $baseRevision;
|
||||||
private $revisionID;
|
private $revisionID;
|
||||||
private $encoding;
|
private $encoding;
|
||||||
|
@ -63,15 +62,6 @@ final class ArcanistBundle {
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setProjectID($project_id) {
|
|
||||||
$this->projectID = $project_id;
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getProjectID() {
|
|
||||||
return $this->projectID;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function setBaseRevision($base_revision) {
|
public function setBaseRevision($base_revision) {
|
||||||
$this->baseRevision = $base_revision;
|
$this->baseRevision = $base_revision;
|
||||||
return $this;
|
return $this;
|
||||||
|
@ -178,7 +168,6 @@ final class ArcanistBundle {
|
||||||
$obj = new ArcanistBundle();
|
$obj = new ArcanistBundle();
|
||||||
$obj->changes = $changes;
|
$obj->changes = $changes;
|
||||||
$obj->diskPath = $path;
|
$obj->diskPath = $path;
|
||||||
$obj->setProjectID($project_name);
|
|
||||||
$obj->setBaseRevision($base_revision);
|
$obj->setBaseRevision($base_revision);
|
||||||
$obj->setRevisionID($revision_id);
|
$obj->setRevisionID($revision_id);
|
||||||
$obj->setEncoding($encoding);
|
$obj->setEncoding($encoding);
|
||||||
|
@ -228,7 +217,6 @@ final class ArcanistBundle {
|
||||||
|
|
||||||
$meta_info = array(
|
$meta_info = array(
|
||||||
'version' => 5,
|
'version' => 5,
|
||||||
'projectName' => $this->getProjectID(),
|
|
||||||
'baseRevision' => $this->getBaseRevision(),
|
'baseRevision' => $this->getBaseRevision(),
|
||||||
'revisionID' => $this->getRevisionID(),
|
'revisionID' => $this->getRevisionID(),
|
||||||
'encoding' => $this->getEncoding(),
|
'encoding' => $this->getEncoding(),
|
||||||
|
|
|
@ -225,7 +225,6 @@ EOTEXT
|
||||||
}
|
}
|
||||||
|
|
||||||
$bundle = ArcanistBundle::newFromChanges($changes);
|
$bundle = ArcanistBundle::newFromChanges($changes);
|
||||||
$bundle->setProjectID($this->getWorkingCopy()->getProjectID());
|
|
||||||
$bundle->setBaseRevision(
|
$bundle->setBaseRevision(
|
||||||
$repository_api->getSourceControlBaseRevision());
|
$repository_api->getSourceControlBaseRevision());
|
||||||
// NOTE: we can't get a revision ID for SOURCE_LOCAL
|
// NOTE: we can't get a revision ID for SOURCE_LOCAL
|
||||||
|
@ -247,18 +246,6 @@ EOTEXT
|
||||||
}
|
}
|
||||||
|
|
||||||
$try_encoding = nonempty($this->getArgument('encoding'), null);
|
$try_encoding = nonempty($this->getArgument('encoding'), null);
|
||||||
if (!$try_encoding) {
|
|
||||||
try {
|
|
||||||
$project_info = $this->getConduit()->callMethodSynchronous(
|
|
||||||
'arcanist.projectinfo',
|
|
||||||
array(
|
|
||||||
'name' => $bundle->getProjectID(),
|
|
||||||
));
|
|
||||||
$try_encoding = $project_info['encoding'];
|
|
||||||
} catch (ConduitClientException $e) {
|
|
||||||
$try_encoding = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($try_encoding) {
|
if ($try_encoding) {
|
||||||
$bundle->setEncoding($try_encoding);
|
$bundle->setEncoding($try_encoding);
|
||||||
|
|
|
@ -1173,7 +1173,6 @@ abstract class ArcanistWorkflow extends Phobject {
|
||||||
$bundle->setConduit($conduit);
|
$bundle->setConduit($conduit);
|
||||||
// since the conduit method has changes, assume that these fields
|
// since the conduit method has changes, assume that these fields
|
||||||
// could be unset
|
// could be unset
|
||||||
$bundle->setProjectID(idx($diff, 'projectName'));
|
|
||||||
$bundle->setBaseRevision(idx($diff, 'sourceControlBaseRevision'));
|
$bundle->setBaseRevision(idx($diff, 'sourceControlBaseRevision'));
|
||||||
$bundle->setRevisionID(idx($diff, 'revisionID'));
|
$bundle->setRevisionID(idx($diff, 'revisionID'));
|
||||||
$bundle->setAuthorName(idx($diff, 'authorName'));
|
$bundle->setAuthorName(idx($diff, 'authorName'));
|
||||||
|
|
Loading…
Reference in a new issue