No OneTemporary
Actions

Size

71 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/diffusion/controller/DiffusionExternalController.php b/src/applications/diffusion/controller/DiffusionExternalController.php
	index 50a8e2aff1..cc322a3034 100644
	--- a/src/applications/diffusion/controller/DiffusionExternalController.php
	+++ b/src/applications/diffusion/controller/DiffusionExternalController.php
	@@ -1,143 +1,143 @@
	<?php

	final class DiffusionExternalController extends DiffusionController {

	public function willProcessRequest(array $data) {
	// Don't build a DiffusionRequest.
	}

	public function shouldAllowPublic() {
	return true;
	}

	public function processRequest() {
	$request = $this->getRequest();

	$uri = $request->getStr('uri');
	$id = $request->getStr('id');

	$repositories = id(new PhabricatorRepositoryQuery())
	->setViewer($request->getUser())
	->execute();

	if ($uri) {
	$uri_path = id(new PhutilURI($uri))->getPath();
	$matches = array();

	// Try to figure out which tracked repository this external lives in by
	// comparing repository metadata. We look for an exact match, but accept
	// a partial match.

	foreach ($repositories as $key => $repository) {
	$remote_uri = new PhutilURI($repository->getRemoteURI());
	if ($remote_uri->getPath() == $uri_path) {
	$matches[$key] = 1;
	}
	- if ($repository->getPublicRemoteURI() == $uri) {
	+ if ($repository->getPublicCloneURI() == $uri) {
	$matches[$key] = 2;
	}
	if ($repository->getRemoteURI() == $uri) {
	$matches[$key] = 3;
	}
	}

	arsort($matches);
	$best_match = head_key($matches);

	if ($best_match) {
	$repository = $repositories[$best_match];
	$redirect = DiffusionRequest::generateDiffusionURI(
	array(
	'action' => 'browse',
	'callsign' => $repository->getCallsign(),
	'branch' => $repository->getDefaultBranch(),
	'commit' => $id,
	));
	return id(new AphrontRedirectResponse())->setURI($redirect);
	}
	}

	// TODO: This is a rare query but does a table scan, add a key?

	$commits = id(new PhabricatorRepositoryCommit())->loadAllWhere(
	'commitIdentifier = %s',
	$id);

	if (empty($commits)) {
	$desc = null;
	if ($uri) {
	$desc = $uri.', at ';
	}
	$desc .= $id;

	$content = id(new AphrontErrorView())
	->setTitle(pht('Unknown External'))
	->setSeverity(AphrontErrorView::SEVERITY_WARNING)
	->appendChild(phutil_tag(
	'p',
	array(),
	pht("This external (%s) does not appear in any tracked ".
	"repository. It may exist in an untracked repository that ".
	"Diffusion does not know about.", $desc)));
	} else if (count($commits) == 1) {
	$commit = head($commits);
	$repo = $repositories[$commit->getRepositoryID()];
	$redirect = DiffusionRequest::generateDiffusionURI(
	array(
	'action' => 'browse',
	'callsign' => $repo->getCallsign(),
	'branch' => $repo->getDefaultBranch(),
	'commit' => $commit->getCommitIdentifier(),
	));
	return id(new AphrontRedirectResponse())->setURI($redirect);
	} else {

	$rows = array();
	foreach ($commits as $commit) {
	$repo = $repositories[$commit->getRepositoryID()];
	$href = DiffusionRequest::generateDiffusionURI(
	array(
	'action' => 'browse',
	'callsign' => $repo->getCallsign(),
	'branch' => $repo->getDefaultBranch(),
	'commit' => $commit->getCommitIdentifier(),
	));
	$rows[] = array(
	phutil_tag(
	'a',
	array(
	'href' => $href,
	),
	'r'.$repo->getCallsign().$commit->getCommitIdentifier()),
	$commit->loadCommitData()->getSummary(),
	);
	}

	$table = new AphrontTableView($rows);
	$table->setHeaders(
	array(
	pht('Commit'),
	pht('Description'),
	));
	$table->setColumnClasses(
	array(
	'pri',
	'wide',
	));

	$content = new AphrontPanelView();
	$content->setHeader(pht('Multiple Matching Commits'));
	$content->setCaption(
	pht('This external reference matches multiple known commits.'));
	$content->appendChild($table);
	}

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => pht('Unresolvable External'),
	'device' => true,
	));
	}

	}
	diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
	index d1ff6caf70..37a98a0c79 100644
	--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
	@@ -1,600 +1,579 @@
	<?php

	final class DiffusionRepositoryController extends DiffusionController {

	public function shouldAllowPublic() {
	return true;
	}

	public function processRequest() {
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	$content = array();

	$crumbs = $this->buildCrumbs();
	$content[] = $crumbs;

	$content[] = $this->buildPropertiesTable($drequest->getRepository());
	$phids = array();

	try {
	$history_results = $this->callConduitWithDiffusionRequest(
	'diffusion.historyquery',
	array(
	'commit' => $drequest->getCommit(),
	'path' => $drequest->getPath(),
	'offset' => 0,
	'limit' => 15));
	$history = DiffusionPathChange::newFromConduit(
	$history_results['pathChanges']);

	foreach ($history as $item) {
	$data = $item->getCommitData();
	if ($data) {
	if ($data->getCommitDetail('authorPHID')) {
	$phids[$data->getCommitDetail('authorPHID')] = true;
	}
	if ($data->getCommitDetail('committerPHID')) {
	$phids[$data->getCommitDetail('committerPHID')] = true;
	}
	}
	}
	$history_exception = null;
	} catch (Exception $ex) {
	$history_results = null;
	$history = null;
	$history_exception = $ex;
	}

	try {
	$browse_results = DiffusionBrowseResultSet::newFromConduit(
	$this->callConduitWithDiffusionRequest(
	'diffusion.browsequery',
	array(
	'path' => $drequest->getPath(),
	'commit' => $drequest->getCommit(),
	)));
	$browse_paths = $browse_results->getPaths();

	foreach ($browse_paths as $item) {
	$data = $item->getLastCommitData();
	if ($data) {
	if ($data->getCommitDetail('authorPHID')) {
	$phids[$data->getCommitDetail('authorPHID')] = true;
	}
	if ($data->getCommitDetail('committerPHID')) {
	$phids[$data->getCommitDetail('committerPHID')] = true;
	}
	}
	}

	$browse_exception = null;
	} catch (Exception $ex) {
	$browse_results = null;
	$browse_paths = null;
	$browse_exception = $ex;
	}

	$phids = array_keys($phids);
	$handles = $this->loadViewerHandles($phids);

	if ($browse_results) {
	$readme = $this->callConduitWithDiffusionRequest(
	'diffusion.readmequery',
	array(
	'paths' => $browse_results->getPathDicts()
	));
	} else {
	$readme = null;
	}

	$content[] = $this->buildHistoryTable(
	$history_results,
	$history,
	$history_exception,
	$handles);

	$content[] = $this->buildBrowseTable(
	$browse_results,
	$browse_paths,
	$browse_exception,
	$handles);

	try {
	$content[] = $this->buildTagListTable($drequest);
	} catch (Exception $ex) {
	if (!$repository->isImporting()) {
	$content[] = $this->renderStatusMessage(
	pht('Unable to Load Tags'),
	$ex->getMessage());
	}
	}

	try {
	$content[] = $this->buildBranchListTable($drequest);
	} catch (Exception $ex) {
	if (!$repository->isImporting()) {
	$content[] = $this->renderStatusMessage(
	pht('Unable to Load Branches'),
	$ex->getMessage());
	}
	}

	if ($readme) {
	$box = new PHUIBoxView();
	$box->appendChild($readme);
	$box->addPadding(PHUI::PADDING_LARGE);

	$panel = new PHUIObjectBoxView();
	$panel->setHeaderText(pht('README'));
	$panel->appendChild($box);
	$content[] = $panel;
	}

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => $drequest->getRepository()->getName(),
	'device' => true,
	));
	}

	private function buildPropertiesTable(PhabricatorRepository $repository) {
	$user = $this->getRequest()->getUser();

	$header = id(new PHUIHeaderView())
	->setHeader($repository->getName())
	->setUser($user)
	->setPolicyObject($repository);

	if (!$repository->isTracked()) {
	$header->setStatus('policy-noone', '', pht('Inactive'));
	} else if ($repository->isImporting()) {
	$header->setStatus('time', 'red', pht('Importing...'));
	} else {
	$header->setStatus('oh-ok', '', pht('Active'));
	}


	$actions = $this->buildActionList($repository);

	$view = id(new PHUIPropertyListView())
	->setUser($user);
	$view->addProperty(pht('Callsign'), $repository->getCallsign());

	$project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$repository->getPHID(),
	PhabricatorEdgeConfig::TYPE_OBJECT_HAS_PROJECT);
	if ($project_phids) {
	$this->loadHandles($project_phids);
	$view->addProperty(
	pht('Projects'),
	$this->renderHandlesForPHIDs($project_phids));
	}

	if ($repository->isHosted()) {
	- $serve_off = PhabricatorRepository::SERVE_OFF;
	- $callsign = $repository->getCallsign();
	- $repo_path = '/diffusion/'.$callsign.'/';
	-
	- $serve_ssh = $repository->getServeOverSSH();
	- if ($serve_ssh !== $serve_off) {
	- $uri = new PhutilURI(PhabricatorEnv::getProductionURI($repo_path));
	-
	- if ($repository->isSVN()) {
	- $uri->setProtocol('svn+ssh');
	- } else {
	- $uri->setProtocol('ssh');
	- }
	-
	- $ssh_user = PhabricatorEnv::getEnvConfig('diffusion.ssh-user');
	- if ($ssh_user) {
	- $uri->setUser($ssh_user);
	- }
	-
	- $uri->setPort(PhabricatorEnv::getEnvConfig('diffusion.ssh-port'));
	-
	+ $ssh_uri = $repository->getSSHCloneURIObject();
	+ if ($ssh_uri) {
	$clone_uri = $this->renderCloneURI(
	- $uri,
	- $serve_ssh,
	+ $ssh_uri,
	+ $repository->getServeOverSSH(),
	'/settings/panel/ssh/');

	$view->addProperty(pht('Clone URI (SSH)'), $clone_uri);
	}

	- $serve_http = $repository->getServeOverHTTP();
	- if ($serve_http !== $serve_off) {
	- $http_uri = PhabricatorEnv::getProductionURI($repo_path);
	-
	+ $http_uri = $repository->getHTTPCloneURIObject();
	+ if ($http_uri) {
	$clone_uri = $this->renderCloneURI(
	$http_uri,
	- $serve_http,
	+ $repository->getServeOverHTTP(),
	PhabricatorEnv::getEnvConfig('diffusion.allow-http-auth')
	? '/settings/panel/vcspassword/'
	: null);

	$view->addProperty(pht('Clone URI (HTTP)'), $clone_uri);
	}
	} else {
	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$view->addProperty(
	pht('Clone URI'),
	$this->renderCloneURI(
	- $repository->getPublicRemoteURI()));
	+ $repository->getPublicCloneURI()));
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$view->addProperty(
	pht('Repository Root'),
	$this->renderCloneURI(
	- $repository->getPublicRemoteURI()));
	+ $repository->getPublicCloneURI()));
	break;
	}
	}

	$description = $repository->getDetail('description');
	if (strlen($description)) {
	$description = PhabricatorMarkupEngine::renderOneObject(
	$repository,
	'description',
	$user);
	$view->addSectionHeader(pht('Description'));
	$view->addTextContent($description);
	}

	$view->setActionList($actions);

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($view);

	}

	private function buildBranchListTable(DiffusionRequest $drequest) {
	$viewer = $this->getRequest()->getUser();

	if ($drequest->getBranch() === null) {
	return null;
	}

	$limit = 15;

	$branches = $this->callConduitWithDiffusionRequest(
	'diffusion.branchquery',
	array(
	'limit' => $limit + 1,
	));
	if (!$branches) {
	return null;
	}

	$more_branches = (count($branches) > $limit);
	$branches = array_slice($branches, 0, $limit);

	$branches = DiffusionRepositoryRef::loadAllFromDictionaries($branches);

	$commits = id(new DiffusionCommitQuery())
	->setViewer($viewer)
	->withIdentifiers(mpull($branches, 'getCommitIdentifier'))
	->withRepository($drequest->getRepository())
	->execute();

	$table = id(new DiffusionBranchTableView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setBranches($branches)
	->setCommits($commits);

	$panel = new PHUIObjectBoxView();
	$header = new PHUIHeaderView();
	$header->setHeader(pht('Branches'));

	if ($more_branches) {
	$header->setSubHeader(pht('Showing %d branches.', $limit));
	}

	$icon = id(new PHUIIconView())
	->setSpriteSheet(PHUIIconView::SPRITE_ICONS)
	->setSpriteIcon('fork');

	$button = new PHUIButtonView();
	$button->setText(pht("Show All Branches"));
	$button->setTag('a');
	$button->setIcon($icon);
	$button->setHref($drequest->generateURI(
	array(
	'action' => 'branches',
	)));

	$header->addActionLink($button);
	$panel->setHeader($header);
	$panel->appendChild($table);

	return $panel;
	}

	private function buildTagListTable(DiffusionRequest $drequest) {
	$viewer = $this->getRequest()->getUser();

	$tag_limit = 15;
	$tags = array();
	try {
	$tags = DiffusionRepositoryTag::newFromConduit(
	$this->callConduitWithDiffusionRequest(
	'diffusion.tagsquery',
	array(
	// On the home page, we want to find tags on any branch.
	'commit' => null,
	'limit' => $tag_limit + 1,
	)));
	} catch (ConduitException $e) {
	if ($e->getMessage() != 'ERR-UNSUPPORTED-VCS') {
	throw $e;
	}
	}

	if (!$tags) {
	return null;
	}

	$more_tags = (count($tags) > $tag_limit);
	$tags = array_slice($tags, 0, $tag_limit);

	$commits = id(new DiffusionCommitQuery())
	->setViewer($viewer)
	->withIdentifiers(mpull($tags, 'getCommitIdentifier'))
	->withRepository($drequest->getRepository())
	->needCommitData(true)
	->execute();

	$view = id(new DiffusionTagListView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setTags($tags)
	->setCommits($commits);

	$phids = $view->getRequiredHandlePHIDs();
	$handles = $this->loadViewerHandles($phids);
	$view->setHandles($handles);

	$panel = new PHUIObjectBoxView();
	$header = new PHUIHeaderView();
	$header->setHeader(pht('Tags'));

	if ($more_tags) {
	$header->setSubHeader(
	pht('Showing the %d most recent tags.', $tag_limit));
	}

	$icon = id(new PHUIIconView())
	->setSpriteSheet(PHUIIconView::SPRITE_ICONS)
	->setSpriteIcon('tag');

	$button = new PHUIButtonView();
	$button->setText(pht("Show All Tags"));
	$button->setTag('a');
	$button->setIcon($icon);
	$button->setHref($drequest->generateURI(
	array(
	'action' => 'tags',
	)));

	$header->addActionLink($button);

	$panel->setHeader($header);
	$panel->appendChild($view);

	return $panel;
	}

	private function buildActionList(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view_uri = $this->getApplicationURI($repository->getCallsign().'/');
	$edit_uri = $this->getApplicationURI($repository->getCallsign().'/edit/');

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	->setObject($repository)
	->setObjectURI($view_uri);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$repository,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Repository'))
	->setIcon('edit')
	->setHref($edit_uri)
	->setWorkflow(!$can_edit)
	->setDisabled(!$can_edit));

	if ($repository->isHosted()) {
	$callsign = $repository->getCallsign();
	$push_uri = $this->getApplicationURI(
	'pushlog/?repositories=r'.$callsign);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View Push Logs'))
	->setIcon('transcript')
	->setHref($push_uri));
	}

	return $view;
	}

	private function buildHistoryTable(
	$history_results,
	$history,
	$history_exception,
	array $handles) {

	$request = $this->getRequest();
	$viewer = $request->getUser();
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	if ($history_exception) {
	if ($repository->isImporting()) {
	return $this->renderStatusMessage(
	pht('Still Importing...'),
	pht(
	'This repository is still importing. History is not yet '.
	'available.'));
	} else {
	return $this->renderStatusMessage(
	pht('Unable to Retrieve History'),
	$history_exception->getMessage());
	}
	}

	$history_table = id(new DiffusionHistoryTableView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setHandles($handles)
	->setHistory($history);

	// TODO: Super sketchy.
	$history_table->loadRevisions();

	if ($history_results) {
	$history_table->setParents($history_results['parents']);
	}

	$history_table->setIsHead(true);
	$callsign = $drequest->getRepository()->getCallsign();

	$icon = id(new PHUIIconView())
	->setSpriteSheet(PHUIIconView::SPRITE_ICONS)
	->setSpriteIcon('transcript');

	$button = id(new PHUIButtonView())
	->setText(pht('View Full History'))
	->setHref($drequest->generateURI(
	array(
	'action' => 'history',
	)))
	->setTag('a')
	->setIcon($icon);

	$panel = new PHUIObjectBoxView();
	$header = id(new PHUIHeaderView())
	->setHeader(pht('Recent Commits'))
	->addActionLink($button);
	$panel->setHeader($header);
	$panel->appendChild($history_table);

	return $panel;
	}

	private function buildBrowseTable(
	$browse_results,
	$browse_paths,
	$browse_exception,
	array $handles) {

	$request = $this->getRequest();
	$viewer = $request->getUser();
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	if ($browse_exception) {
	if ($repository->isImporting()) {
	// The history table renders a useful message.
	return null;
	} else {
	return $this->renderStatusMessage(
	pht('Unable to Retrieve Paths'),
	$browse_exception->getMessage());
	}
	}

	$browse_table = id(new DiffusionBrowseTableView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setHandles($handles);
	if ($browse_paths) {
	$browse_table->setPaths($browse_paths);
	} else {
	$browse_table->setPaths(array());
	}

	$browse_uri = $drequest->generateURI(array('action' => 'browse'));

	$browse_panel = new PHUIObjectBoxView();
	$header = id(new PHUIHeaderView())
	->setHeader(pht('Repository'));

	$icon = id(new PHUIIconView())
	->setSpriteSheet(PHUIIconView::SPRITE_ICONS)
	->setSpriteIcon('data');

	$button = new PHUIButtonView();
	$button->setText(pht('Browse Repository'));
	$button->setTag('a');
	$button->setIcon($icon);
	$button->setHref($browse_uri);

	$header->addActionLink($button);
	$browse_panel->setHeader($header);
	$browse_panel->appendChild($browse_table);

	return $browse_panel;
	}

	private function renderCloneURI(
	$uri,
	$serve_mode = null,
	$manage_uri = null) {

	require_celerity_resource('diffusion-icons-css');

	Javelin::initBehavior('select-on-click');

	$input = javelin_tag(
	'input',
	array(
	'type' => 'text',
	'value' => (string)$uri,
	'class' => 'diffusion-clone-uri',
	'sigil' => 'select-on-click',
	'readonly' => 'true',
	));

	$extras = array();
	if ($serve_mode) {
	if ($serve_mode === PhabricatorRepository::SERVE_READONLY) {
	$extras[] = pht('(Read Only)');
	}
	}

	if ($manage_uri) {
	if ($this->getRequest()->getUser()->isLoggedIn()) {
	$extras[] = phutil_tag(
	'a',
	array(
	'href' => $manage_uri,
	),
	pht('Manage Credentials'));
	}
	}

	if ($extras) {
	$extras = phutil_implode_html(' ', $extras);
	$extras = phutil_tag(
	'div',
	array(
	'class' => 'diffusion-clone-extras',
	),
	$extras);
	}

	return array($input, $extras);
	}

	}
	diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuild.php b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
	index 31d8374de9..569ddef191 100644
	--- a/src/applications/harbormaster/storage/build/HarbormasterBuild.php
	+++ b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
	@@ -1,332 +1,332 @@
	<?php

	final class HarbormasterBuild extends HarbormasterDAO
	implements PhabricatorPolicyInterface {

	protected $buildablePHID;
	protected $buildPlanPHID;
	protected $buildStatus;

	private $buildable = self::ATTACHABLE;
	private $buildPlan = self::ATTACHABLE;
	private $unprocessedCommands = self::ATTACHABLE;

	/**
	* Not currently being built.
	*/
	const STATUS_INACTIVE = 'inactive';

	/**
	* Pending pick up by the Harbormaster daemon.
	*/
	const STATUS_PENDING = 'pending';

	/**
	* Waiting for a resource to be allocated (not yet relevant).
	*/
	const STATUS_WAITING = 'waiting';

	/**
	* Current building the buildable.
	*/
	const STATUS_BUILDING = 'building';

	/**
	* The build has passed.
	*/
	const STATUS_PASSED = 'passed';

	/**
	* The build has failed.
	*/
	const STATUS_FAILED = 'failed';

	/**
	* The build encountered an unexpected error.
	*/
	const STATUS_ERROR = 'error';

	/**
	* The build has been stopped.
	*/
	const STATUS_STOPPED = 'stopped';

	public static function initializeNewBuild(PhabricatorUser $actor) {
	return id(new HarbormasterBuild())
	->setBuildStatus(self::STATUS_INACTIVE);
	}

	public function delete() {
	$this->openTransaction();
	$this->deleteUnprocessedCommands();
	$result = parent::delete();
	$this->saveTransaction();

	return $result;
	}

	public function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	HarbormasterPHIDTypeBuild::TYPECONST);
	}

	public function attachBuildable(HarbormasterBuildable $buildable) {
	$this->buildable = $buildable;
	return $this;
	}

	public function getBuildable() {
	return $this->assertAttached($this->buildable);
	}

	public function getName() {
	if ($this->getBuildPlan()) {
	return $this->getBuildPlan()->getName();
	}
	return pht('Build');
	}

	public function attachBuildPlan(
	HarbormasterBuildPlan $build_plan = null) {
	$this->buildPlan = $build_plan;
	return $this;
	}

	public function getBuildPlan() {
	return $this->assertAttached($this->buildPlan);
	}

	public function isBuilding() {
	return $this->getBuildStatus() === self::STATUS_PENDING \|\|
	$this->getBuildStatus() === self::STATUS_WAITING \|\|
	$this->getBuildStatus() === self::STATUS_BUILDING;
	}

	public function createLog(
	HarbormasterBuildTarget $build_target,
	$log_source,
	$log_type) {

	$log = HarbormasterBuildLog::initializeNewBuildLog($build_target)
	->setLogSource($log_source)
	->setLogType($log_type)
	->save();

	return $log;
	}

	public function createArtifact(
	HarbormasterBuildTarget $build_target,
	$artifact_key,
	$artifact_type) {

	$artifact =
	HarbormasterBuildArtifact::initializeNewBuildArtifact($build_target);
	$artifact->setArtifactKey($this->getPHID(), $artifact_key);
	$artifact->setArtifactType($artifact_type);
	$artifact->save();
	return $artifact;
	}

	public function loadArtifact($name) {
	$artifact = id(new HarbormasterBuildArtifactQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withArtifactKeys(
	$this->getPHID(),
	array($name))
	->executeOne();
	if ($artifact === null) {
	throw new Exception("Artifact not found!");
	}
	return $artifact;
	}

	public function retrieveVariablesFromBuild() {
	$results = array(
	'buildable.diff' => null,
	'buildable.revision' => null,
	'buildable.commit' => null,
	'repository.callsign' => null,
	'repository.vcs' => null,
	'repository.uri' => null,
	'step.timestamp' => null,
	'build.id' => null);

	$buildable = $this->getBuildable();
	$object = $buildable->getBuildableObject();

	$repo = null;
	if ($object instanceof DifferentialDiff) {
	$results['buildable.diff'] = $object->getID();
	$revision = $object->getRevision();
	$results['buildable.revision'] = $revision->getID();
	$repo = $revision->getRepository();
	} else if ($object instanceof PhabricatorRepositoryCommit) {
	$results['buildable.commit'] = $object->getCommitIdentifier();
	$repo = $object->getRepository();
	}

	if ($repo) {
	$results['repository.callsign'] = $repo->getCallsign();
	$results['repository.vcs'] = $repo->getVersionControlSystem();
	- $results['repository.uri'] = $repo->getPublicRemoteURI();
	+ $results['repository.uri'] = $repo->getPublicCloneURI();
	}

	$results['step.timestamp'] = time();
	$results['build.id'] = $this->getID();

	return $results;
	}

	public static function getAvailableBuildVariables() {
	return array(
	'buildable.diff' =>
	pht('The differential diff ID, if applicable.'),
	'buildable.revision' =>
	pht('The differential revision ID, if applicable.'),
	'buildable.commit' => pht('The commit identifier, if applicable.'),
	'repository.callsign' =>
	pht('The callsign of the repository in Phabricator.'),
	'repository.vcs' =>
	pht('The version control system, either "svn", "hg" or "git".'),
	'repository.uri' =>
	pht('The URI to clone or checkout the repository from.'),
	'step.timestamp' => pht('The current UNIX timestamp.'),
	'build.id' => pht('The ID of the current build.'));
	}

	public function isComplete() {
	switch ($this->getBuildStatus()) {
	case self::STATUS_PASSED:
	case self::STATUS_FAILED:
	case self::STATUS_ERROR:
	case self::STATUS_STOPPED:
	return true;
	}

	return false;
	}

	public function isStopped() {
	return ($this->getBuildStatus() == self::STATUS_STOPPED);
	}


	/* -( Build Commands )----------------------------------------------------- */


	private function getUnprocessedCommands() {
	return $this->assertAttached($this->unprocessedCommands);
	}

	public function attachUnprocessedCommands(array $commands) {
	$this->unprocessedCommands = $commands;
	return $this;
	}

	public function canRestartBuild() {
	return !$this->isRestarting();
	}

	public function canStopBuild() {
	return !$this->isComplete() &&
	!$this->isStopped() &&
	!$this->isStopping();
	}

	public function canResumeBuild() {
	return $this->isStopped() &&
	!$this->isResuming();
	}

	public function isStopping() {
	$is_stopping = false;
	foreach ($this->getUnprocessedCommands() as $command_object) {
	$command = $command_object->getCommand();
	switch ($command) {
	case HarbormasterBuildCommand::COMMAND_STOP:
	$is_stopping = true;
	break;
	case HarbormasterBuildCommand::COMMAND_RESUME:
	case HarbormasterBuildCommand::COMMAND_RESTART:
	$is_stopping = false;
	break;
	}
	}

	return $is_stopping;
	}

	public function isResuming() {
	$is_resuming = false;
	foreach ($this->getUnprocessedCommands() as $command_object) {
	$command = $command_object->getCommand();
	switch ($command) {
	case HarbormasterBuildCommand::COMMAND_RESTART:
	case HarbormasterBuildCommand::COMMAND_RESUME:
	$is_resuming = true;
	break;
	case HarbormasterBuildCommand::COMMAND_STOP:
	$is_resuming = false;
	break;
	}
	}

	return $is_resuming;
	}

	public function isRestarting() {
	$is_restarting = false;
	foreach ($this->getUnprocessedCommands() as $command_object) {
	$command = $command_object->getCommand();
	switch ($command) {
	case HarbormasterBuildCommand::COMMAND_RESTART:
	$is_restarting = true;
	break;
	}
	}

	return $is_restarting;
	}

	public function deleteUnprocessedCommands() {
	foreach ($this->getUnprocessedCommands() as $key => $command_object) {
	$command_object->delete();
	unset($this->unprocessedCommands[$key]);
	}

	return $this;
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	return $this->getBuildable()->getPolicy($capability);
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return $this->getBuildable()->hasAutomaticCapability(
	$capability,
	$viewer);
	}

	public function describeAutomaticCapability($capability) {
	return pht('A build inherits policies from its buildable.');
	}

	}
	diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
	index 47873dcdf3..1dd390b8b1 100644
	--- a/src/applications/repository/storage/PhabricatorRepository.php
	+++ b/src/applications/repository/storage/PhabricatorRepository.php
	@@ -1,1167 +1,1255 @@
	<?php

	/**
	* @task uri Repository URI Management
	*/
	final class PhabricatorRepository extends PhabricatorRepositoryDAO
	implements
	PhabricatorPolicyInterface,
	PhabricatorFlaggableInterface,
	PhabricatorMarkupInterface {

	/**
	* Shortest hash we'll recognize in raw "a829f32" form.
	*/
	const MINIMUM_UNQUALIFIED_HASH = 7;

	/**
	* Shortest hash we'll recognize in qualified "rXab7ef2f8" form.
	*/
	const MINIMUM_QUALIFIED_HASH = 5;

	const TABLE_PATH = 'repository_path';
	const TABLE_PATHCHANGE = 'repository_pathchange';
	const TABLE_FILESYSTEM = 'repository_filesystem';
	const TABLE_SUMMARY = 'repository_summary';
	const TABLE_BADCOMMIT = 'repository_badcommit';
	const TABLE_LINTMESSAGE = 'repository_lintmessage';

	const SERVE_OFF = 'off';
	const SERVE_READONLY = 'readonly';
	const SERVE_READWRITE = 'readwrite';

	protected $name;
	protected $callsign;
	protected $uuid;
	protected $viewPolicy;
	protected $editPolicy;
	protected $pushPolicy;

	protected $versionControlSystem;
	protected $details = array();
	protected $credentialPHID;

	private $commitCount = self::ATTACHABLE;
	private $mostRecentCommit = self::ATTACHABLE;
	private $projectPHIDs = self::ATTACHABLE;

	public static function initializeNewRepository(PhabricatorUser $actor) {
	$app = id(new PhabricatorApplicationQuery())
	->setViewer($actor)
	->withClasses(array('PhabricatorApplicationDiffusion'))
	->executeOne();

	$view_policy = $app->getPolicy(DiffusionCapabilityDefaultView::CAPABILITY);
	$edit_policy = $app->getPolicy(DiffusionCapabilityDefaultEdit::CAPABILITY);
	$push_policy = $app->getPolicy(DiffusionCapabilityDefaultPush::CAPABILITY);

	return id(new PhabricatorRepository())
	->setViewPolicy($view_policy)
	->setEditPolicy($edit_policy)
	->setPushPolicy($push_policy);
	}

	public function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_SERIALIZATION => array(
	'details' => self::SERIALIZATION_JSON,
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorRepositoryPHIDTypeRepository::TYPECONST);
	}

	public function toDictionary() {
	return array(
	'id' => $this->getID(),
	'name' => $this->getName(),
	'phid' => $this->getPHID(),
	'callsign' => $this->getCallsign(),
	'monogram' => $this->getMonogram(),
	'vcs' => $this->getVersionControlSystem(),
	'uri' => PhabricatorEnv::getProductionURI($this->getURI()),
	'remoteURI' => (string)$this->getRemoteURI(),
	'description' => $this->getDetail('description'),
	'isActive' => $this->isTracked(),
	'isHosted' => $this->isHosted(),
	'isImporting' => $this->isImporting(),
	);
	}

	public function getMonogram() {
	return 'r'.$this->getCallsign();
	}

	public function getDetail($key, $default = null) {
	return idx($this->details, $key, $default);
	}

	public function getHumanReadableDetail($key, $default = null) {
	$value = $this->getDetail($key, $default);

	switch ($key) {
	case 'branch-filter':
	case 'close-commits-filter':
	$value = array_keys($value);
	$value = implode(', ', $value);
	break;
	}

	return $value;
	}

	public function setDetail($key, $value) {
	$this->details[$key] = $value;
	return $this;
	}

	public function attachCommitCount($count) {
	$this->commitCount = $count;
	return $this;
	}

	public function getCommitCount() {
	return $this->assertAttached($this->commitCount);
	}

	public function attachMostRecentCommit(
	PhabricatorRepositoryCommit $commit = null) {
	$this->mostRecentCommit = $commit;
	return $this;
	}

	public function getMostRecentCommit() {
	return $this->assertAttached($this->mostRecentCommit);
	}

	public function getDiffusionBrowseURIForPath(
	PhabricatorUser $user,
	$path,
	$line = null,
	$branch = null) {

	$drequest = DiffusionRequest::newFromDictionary(
	array(
	'user' => $user,
	'repository' => $this,
	'path' => $path,
	'branch' => $branch,
	));

	return $drequest->generateURI(
	array(
	'action' => 'browse',
	'line' => $line,
	));
	}

	public function getLocalPath() {
	return $this->getDetail('local-path');
	}

	public function getSubversionBaseURI($commit = null) {
	$subpath = $this->getDetail('svn-subpath');
	if (!strlen($subpath)) {
	$subpath = null;
	}
	return $this->getSubversionPathURI($subpath, $commit);
	}

	public function getSubversionPathURI($path = null, $commit = null) {
	$vcs = $this->getVersionControlSystem();
	if ($vcs != PhabricatorRepositoryType::REPOSITORY_TYPE_SVN) {
	throw new Exception("Not a subversion repository!");
	}

	if ($this->isHosted()) {
	$uri = 'file://'.$this->getLocalPath();
	} else {
	$uri = $this->getDetail('remote-uri');
	}

	$uri = rtrim($uri, '/');

	if (strlen($path)) {
	$path = rawurlencode($path);
	$path = str_replace('%2F', '/', $path);
	$uri = $uri.'/'.ltrim($path, '/');
	}

	if ($path !== null \|\| $commit !== null) {
	$uri .= '@';
	}

	if ($commit !== null) {
	$uri .= $commit;
	}

	return $uri;
	}

	public function attachProjectPHIDs(array $project_phids) {
	$this->projectPHIDs = $project_phids;
	return $this;
	}

	public function getProjectPHIDs() {
	return $this->assertAttached($this->projectPHIDs);
	}


	/* -( Remote Command Execution )------------------------------------------- */


	public function execRemoteCommand($pattern /* , $arg, ... */) {
	$args = func_get_args();
	return $this->newRemoteCommandFuture($args)->resolve();
	}

	public function execxRemoteCommand($pattern /* , $arg, ... */) {
	$args = func_get_args();
	return $this->newRemoteCommandFuture($args)->resolvex();
	}

	public function getRemoteCommandFuture($pattern /* , $arg, ... */) {
	$args = func_get_args();
	return $this->newRemoteCommandFuture($args);
	}

	public function passthruRemoteCommand($pattern /* , $arg, ... */) {
	$args = func_get_args();
	return $this->newRemoteCommandPassthru($args)->execute();
	}

	private function newRemoteCommandFuture(array $argv) {
	$argv = $this->formatRemoteCommand($argv);
	$future = newv('ExecFuture', $argv);
	$future->setEnv($this->getRemoteCommandEnvironment());
	return $future;
	}

	private function newRemoteCommandPassthru(array $argv) {
	$argv = $this->formatRemoteCommand($argv);
	$passthru = newv('PhutilExecPassthru', $argv);
	$passthru->setEnv($this->getRemoteCommandEnvironment());
	return $passthru;
	}


	/* -( Local Command Execution )-------------------------------------------- */


	public function execLocalCommand($pattern /* , $arg, ... */) {
	$args = func_get_args();
	return $this->newLocalCommandFuture($args)->resolve();
	}

	public function execxLocalCommand($pattern /* , $arg, ... */) {
	$args = func_get_args();
	return $this->newLocalCommandFuture($args)->resolvex();
	}

	public function getLocalCommandFuture($pattern /* , $arg, ... */) {
	$args = func_get_args();
	return $this->newLocalCommandFuture($args);
	}

	public function passthruLocalCommand($pattern /* , $arg, ... */) {
	$args = func_get_args();
	return $this->newLocalCommandPassthru($args)->execute();
	}

	private function newLocalCommandFuture(array $argv) {
	$this->assertLocalExists();

	$argv = $this->formatLocalCommand($argv);
	$future = newv('ExecFuture', $argv);
	$future->setEnv($this->getLocalCommandEnvironment());

	if ($this->usesLocalWorkingCopy()) {
	$future->setCWD($this->getLocalPath());
	}

	return $future;
	}

	private function newLocalCommandPassthru(array $argv) {
	$this->assertLocalExists();

	$argv = $this->formatLocalCommand($argv);
	$future = newv('PhutilExecPassthru', $argv);
	$future->setEnv($this->getLocalCommandEnvironment());

	if ($this->usesLocalWorkingCopy()) {
	$future->setCWD($this->getLocalPath());
	}

	return $future;
	}


	/* -( Command Infrastructure )--------------------------------------------- */


	private function getSSHWrapper() {
	$root = dirname(phutil_get_library_root('phabricator'));
	return $root.'/bin/ssh-connect';
	}

	private function getCommonCommandEnvironment() {
	$env = array(
	// NOTE: Force the language to "en_US.UTF-8", which overrides locale
	// settings. This makes stuff print in English instead of, e.g., French,
	// so we can parse the output of some commands, error messages, etc.
	'LANG' => 'en_US.UTF-8',

	// Propagate PHABRICATOR_ENV explicitly. For discussion, see T4155.
	'PHABRICATOR_ENV' => PhabricatorEnv::getSelectedEnvironmentName(),
	);

	switch ($this->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	// NOTE: See T2965. Some time after Git 1.7.5.4, Git started fataling if
	// it can not read $HOME. For many users, $HOME points at /root (this
	// seems to be a default result of Apache setup). Instead, explicitly
	// point $HOME at a readable, empty directory so that Git looks for the
	// config file it's after, fails to locate it, and moves on. This is
	// really silly, but seems like the least damaging approach to
	// mitigating the issue.

	$root = dirname(phutil_get_library_root('phabricator'));
	$env['HOME'] = $root.'/support/empty/';
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	// NOTE: This overrides certain configuration, extensions, and settings
	// which make Mercurial commands do random unusual things.
	$env['HGPLAIN'] = 1;
	break;
	default:
	throw new Exception("Unrecognized version control system.");
	}

	return $env;
	}

	private function getLocalCommandEnvironment() {
	return $this->getCommonCommandEnvironment();
	}

	private function getRemoteCommandEnvironment() {
	$env = $this->getCommonCommandEnvironment();

	if ($this->shouldUseSSH()) {
	// NOTE: This is read by `bin/ssh-connect`, and tells it which credentials
	// to use.
	$env['PHABRICATOR_CREDENTIAL'] = $this->getCredentialPHID();
	switch ($this->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	// Force SVN to use `bin/ssh-connect`.
	$env['SVN_SSH'] = $this->getSSHWrapper();
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	// Force Git to use `bin/ssh-connect`.
	$env['GIT_SSH'] = $this->getSSHWrapper();
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	// We force Mercurial through `bin/ssh-connect` too, but it uses a
	// command-line flag instead of an environmental variable.
	break;
	default:
	throw new Exception("Unrecognized version control system.");
	}
	}

	return $env;
	}

	private function formatRemoteCommand(array $args) {
	$pattern = $args[0];
	$args = array_slice($args, 1);

	switch ($this->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	if ($this->shouldUseHTTP() \|\| $this->shouldUseSVNProtocol()) {
	$flags = array();
	$flag_args = array();
	$flags[] = '--non-interactive';
	$flags[] = '--no-auth-cache';
	if ($this->shouldUseHTTP()) {
	$flags[] = '--trust-server-cert';
	}

	$credential_phid = $this->getCredentialPHID();
	if ($credential_phid) {
	$key = PassphrasePasswordKey::loadFromPHID(
	$credential_phid,
	PhabricatorUser::getOmnipotentUser());
	$flags[] = '--username %P';
	$flags[] = '--password %P';
	$flag_args[] = $key->getUsernameEnvelope();
	$flag_args[] = $key->getPasswordEnvelope();
	}

	$flags = implode(' ', $flags);
	$pattern = "svn {$flags} {$pattern}";
	$args = array_mergev(array($flag_args, $args));
	} else {
	$pattern = "svn --non-interactive {$pattern}";
	}
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$pattern = "git {$pattern}";
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	if ($this->shouldUseSSH()) {
	$pattern = "hg --config ui.ssh=%s {$pattern}";
	array_unshift(
	$args,
	$this->getSSHWrapper());
	} else {
	$pattern = "hg {$pattern}";
	}
	break;
	default:
	throw new Exception("Unrecognized version control system.");
	}

	array_unshift($args, $pattern);

	return $args;
	}

	private function formatLocalCommand(array $args) {
	$pattern = $args[0];
	$args = array_slice($args, 1);

	switch ($this->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$pattern = "svn --non-interactive {$pattern}";
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$pattern = "git {$pattern}";
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$pattern = "hg {$pattern}";
	break;
	default:
	throw new Exception("Unrecognized version control system.");
	}

	array_unshift($args, $pattern);

	return $args;
	}

	/**
	* Sanitize output of an `hg` command invoked with the `--debug` flag to make
	* it usable.
	*
	* @param string Output from `hg --debug ...`
	* @return string Usable output.
	*/
	public static function filterMercurialDebugOutput($stdout) {
	// When hg commands are run with `--debug` and some config file isn't
	// trusted, Mercurial prints out a warning to stdout, twice, after Feb 2011.
	//
	// http://selenic.com/pipermail/mercurial-devel/2011-February/028541.html

	$lines = preg_split('/(?<=\n)/', $stdout);
	$regex = '/ignoring untrusted configuration option .*\n$/';

	foreach ($lines as $key => $line) {
	$lines[$key] = preg_replace($regex, '', $line);
	}

	return implode('', $lines);
	}

	public function getURI() {
	return '/diffusion/'.$this->getCallsign().'/';
	}

	public function getNormalizedPath() {
	- if ($this->isHosted()) {
	- $uri = PhabricatorEnv::getProductionURI($this->getURI());
	- } else {
	- $uri = $this->getRemoteURI();
	- }
	+ $uri = (string)$this->getCloneURIObject();

	switch ($this->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$normalized_uri = new PhabricatorRepositoryURINormalizer(
	PhabricatorRepositoryURINormalizer::TYPE_GIT,
	$uri);
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$normalized_uri = new PhabricatorRepositoryURINormalizer(
	PhabricatorRepositoryURINormalizer::TYPE_SVN,
	$uri);
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$normalized_uri = new PhabricatorRepositoryURINormalizer(
	PhabricatorRepositoryURINormalizer::TYPE_MERCURIAL,
	$uri);
	break;
	default:
	throw new Exception("Unrecognized version control system.");
	}

	return $normalized_uri->getNormalizedPath();
	}

	public function isTracked() {
	return $this->getDetail('tracking-enabled', false);
	}

	public function getDefaultBranch() {
	$default = $this->getDetail('default-branch');
	if (strlen($default)) {
	return $default;
	}

	$default_branches = array(
	PhabricatorRepositoryType::REPOSITORY_TYPE_GIT => 'master',
	PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL => 'default',
	);

	return idx($default_branches, $this->getVersionControlSystem());
	}

	public function getDefaultArcanistBranch() {
	return coalesce($this->getDefaultBranch(), 'svn');
	}

	private function isBranchInFilter($branch, $filter_key) {
	$vcs = $this->getVersionControlSystem();

	$is_git = ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_GIT);

	$use_filter = ($is_git);

	if ($use_filter) {
	$filter = $this->getDetail($filter_key, array());
	if ($filter && empty($filter[$branch])) {
	return false;
	}
	}

	// By default, all branches pass.
	return true;
	}

	public function shouldTrackBranch($branch) {
	return $this->isBranchInFilter($branch, 'branch-filter');
	}

	public function shouldAutocloseBranch($branch) {
	if ($this->isImporting()) {
	return false;
	}

	if ($this->getDetail('disable-autoclose', false)) {
	return false;
	}

	return $this->isBranchInFilter($branch, 'close-commits-filter');
	}

	public function shouldAutocloseCommit(
	PhabricatorRepositoryCommit $commit,
	PhabricatorRepositoryCommitData $data) {

	if ($this->getDetail('disable-autoclose', false)) {
	return false;
	}

	switch ($this->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	return true;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	return true;
	default:
	throw new Exception("Unrecognized version control system.");
	}

	$closeable_flag = PhabricatorRepositoryCommit::IMPORTED_CLOSEABLE;
	if ($commit->isPartiallyImported($closeable_flag)) {
	return true;
	}

	// TODO: Remove this eventually, it's no longer written to by the import
	// pipeline (however, old tasks may still be queued which don't reflect
	// the new data format).
	$branches = $data->getCommitDetail('seenOnBranches', array());
	foreach ($branches as $branch) {
	if ($this->shouldAutocloseBranch($branch)) {
	return true;
	}
	}

	return false;
	}

	public function formatCommitName($commit_identifier) {
	$vcs = $this->getVersionControlSystem();

	$type_git = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
	$type_hg = PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL;

	$is_git = ($vcs == $type_git);
	$is_hg = ($vcs == $type_hg);
	if ($is_git \|\| $is_hg) {
	$short_identifier = substr($commit_identifier, 0, 12);
	} else {
	$short_identifier = $commit_identifier;
	}

	return 'r'.$this->getCallsign().$short_identifier;
	}

	public function isImporting() {
	return (bool)$this->getDetail('importing', false);
	}

	+
	/* -( Repository URI Management )------------------------------------------ */


	/**
	* Get the remote URI for this repository.
	*
	* @return string
	* @task uri
	*/
	public function getRemoteURI() {
	return (string)$this->getRemoteURIObject();
	}


	/**
	* Get the remote URI for this repository, including credentials if they're
	* used by this repository.
	*
	* @return PhutilOpaqueEnvelope URI, possibly including credentials.
	* @task uri
	*/
	public function getRemoteURIEnvelope() {
	$uri = $this->getRemoteURIObject();

	$remote_protocol = $this->getRemoteProtocol();
	if ($remote_protocol == 'http' \|\| $remote_protocol == 'https') {
	// For SVN, we use `--username` and `--password` flags separately, so
	// don't add any credentials here.
	if (!$this->isSVN()) {
	$credential_phid = $this->getCredentialPHID();
	if ($credential_phid) {
	$key = PassphrasePasswordKey::loadFromPHID(
	$credential_phid,
	PhabricatorUser::getOmnipotentUser());

	$uri->setUser($key->getUsernameEnvelope()->openEnvelope());
	$uri->setPass($key->getPasswordEnvelope()->openEnvelope());
	}
	}
	}

	return new PhutilOpaqueEnvelope((string)$uri);
	}


	/**
	- * Get the remote URI for this repository, without authentication information.
	+ * Get the clone (or checkout) URI for this repository, without authentication
	+ * information.
	*
	* @return string Repository URI.
	* @task uri
	*/
	- public function getPublicRemoteURI() {
	- $uri = $this->getRemoteURIObject();
	+ public function getPublicCloneURI() {
	+ $uri = $this->getCloneURIObject();

	// Make sure we don't leak anything if this repo is using HTTP Basic Auth
	// with the credentials in the URI or something zany like that.

	// If repository is not accessed over SSH we remove both username and
	// password.
	- if (!$this->shouldUseSSH()) {
	- $uri->setUser(null);
	+ if (!$this->isHosted()) {
	+ if (!$this->shouldUseSSH()) {
	+ $uri->setUser(null);

	- // This might be a Git URI or a normal URI. If it's Git, there's no
	- // password support.
	- if ($uri instanceof PhutilURI) {
	- $uri->setPass(null);
	+ // This might be a Git URI or a normal URI. If it's Git, there's no
	+ // password support.
	+ if ($uri instanceof PhutilURI) {
	+ $uri->setPass(null);
	+ }
	}
	}

	return (string)$uri;
	}


	/**
	* Get the protocol for the repository's remote.
	*
	* @return string Protocol, like "ssh" or "git".
	* @task uri
	*/
	public function getRemoteProtocol() {
	$uri = $this->getRemoteURIObject();

	if ($uri instanceof PhutilGitURI) {
	return 'ssh';
	} else {
	return $uri->getProtocol();
	}
	}


	/**
	* Get a parsed object representation of the repository's remote URI. This
	* may be a normal URI (returned as a @{class@libphutil:PhutilURI}) or a git
	* URI (returned as a @{class@libphutil:PhutilGitURI}).
	*
	* @return wild A @{class@libphutil:PhutilURI} or
	* @{class@libphutil:PhutilGitURI}.
	* @task uri
	*/
	public function getRemoteURIObject() {
	$raw_uri = $this->getDetail('remote-uri');
	if (!$raw_uri) {
	return new PhutilURI('');
	}

	if (!strncmp($raw_uri, '/', 1)) {
	return new PhutilURI('file://'.$raw_uri);
	}

	$uri = new PhutilURI($raw_uri);
	if ($uri->getProtocol()) {
	return $uri;
	}

	$uri = new PhutilGitURI($raw_uri);
	if ($uri->getDomain()) {
	return $uri;
	}

	throw new Exception("Remote URI '{$raw_uri}' could not be parsed!");
	}


	+ /**
	+ * Get the "best" clone/checkout URI for this repository, on any protocol.
	+ */
	+ public function getCloneURIObject() {
	+ if (!$this->isHosted()) {
	+ return $this->getRemoteURIObject();
	+ }
	+
	+ // Choose the best URI: pick a read/write URI over a URI which is not
	+ // read/write, and SSH over HTTP.
	+
	+ $serve_ssh = $this->getServeOverSSH();
	+ $serve_http = $this->getServeOverHTTP();
	+
	+ if ($serve_ssh === self::SERVE_READWRITE) {
	+ return $this->getSSHCloneURIObject();
	+ } else if ($serve_http === self::SERVE_READWRITE) {
	+ return $this->getHTTPCloneURIObject();
	+ } else if ($serve_ssh !== self::SERVE_OFF) {
	+ return $this->getSSHCloneURIObject();
	+ } else if ($serve_http !== self::SERVE_OFF) {
	+ return $this->getHTTPCloneURIObject();
	+ } else {
	+ return null;
	+ }
	+ }
	+
	+
	+ /**
	+ * Get the repository's SSH clone/checkout URI, if one exists.
	+ */
	+ public function getSSHCloneURIObject() {
	+ if (!$this->isHosted()) {
	+ if ($this->shouldUseSSH()) {
	+ return $this->getRemoteURIObject();
	+ } else {
	+ return null;
	+ }
	+ }
	+
	+ $serve_ssh = $this->getServeOverSSH();
	+ if ($serve_ssh === self::SERVE_OFF) {
	+ return null;
	+ }
	+
	+ $uri = new PhutilURI(PhabricatorEnv::getProductionURI($this->getURI()));
	+
	+ if ($this->isSVN()) {
	+ $uri->setProtocol('svn+ssh');
	+ } else {
	+ $uri->setProtocol('ssh');
	+ }
	+
	+ $ssh_user = PhabricatorEnv::getEnvConfig('diffusion.ssh-user');
	+ if ($ssh_user) {
	+ $uri->setUser($ssh_user);
	+ }
	+
	+ $uri->setPort(PhabricatorEnv::getEnvConfig('diffusion.ssh-port'));
	+
	+ return $uri;
	+ }
	+
	+
	+ /**
	+ * Get the repository's HTTP clone/checkout URI, if one exists.
	+ */
	+ public function getHTTPCloneURIObject() {
	+ if (!$this->isHosted()) {
	+ if ($this->shouldUseHTTP()) {
	+ return $this->getRemoteURIObject();
	+ } else {
	+ return null;
	+ }
	+ }
	+
	+ $serve_http = $this->getServeOverHTTP();
	+ if ($serve_http === self::SERVE_OFF) {
	+ return null;
	+ }
	+
	+
	+ $uri = PhabricatorEnv::getProductionURI($this->getURI());
	+
	+ return $uri;
	+ }
	+
	+
	/**
	* Determine if we should connect to the remote using SSH flags and
	* credentials.
	*
	* @return bool True to use the SSH protocol.
	* @task uri
	*/
	private function shouldUseSSH() {
	if ($this->isHosted()) {
	return false;
	}

	$protocol = $this->getRemoteProtocol();
	if ($this->isSSHProtocol($protocol)) {
	return true;
	}

	return false;
	}


	/**
	* Determine if we should connect to the remote using HTTP flags and
	* credentials.
	*
	* @return bool True to use the HTTP protocol.
	* @task uri
	*/
	private function shouldUseHTTP() {
	if ($this->isHosted()) {
	return false;
	}

	$protocol = $this->getRemoteProtocol();
	return ($protocol == 'http' \|\| $protocol == 'https');
	}


	/**
	* Determine if we should connect to the remote using SVN flags and
	* credentials.
	*
	* @return bool True to use the SVN protocol.
	* @task uri
	*/
	private function shouldUseSVNProtocol() {
	if ($this->isHosted()) {
	return false;
	}

	$protocol = $this->getRemoteProtocol();
	return ($protocol == 'svn');
	}


	/**
	* Determine if a protocol is SSH or SSH-like.
	*
	* @param string A protocol string, like "http" or "ssh".
	* @return bool True if the protocol is SSH-like.
	* @task uri
	*/
	private function isSSHProtocol($protocol) {
	return ($protocol == 'ssh' \|\| $protocol == 'svn+ssh');
	}

	public function delete() {
	$this->openTransaction();

	$paths = id(new PhabricatorOwnersPath())
	->loadAllWhere('repositoryPHID = %s', $this->getPHID());
	foreach ($paths as $path) {
	$path->delete();
	}

	$projects = id(new PhabricatorRepositoryArcanistProject())
	->loadAllWhere('repositoryID = %d', $this->getID());
	foreach ($projects as $project) {
	// note each project deletes its PhabricatorRepositorySymbols
	$project->delete();
	}

	$commits = id(new PhabricatorRepositoryCommit())
	->loadAllWhere('repositoryID = %d', $this->getID());
	foreach ($commits as $commit) {
	// note PhabricatorRepositoryAuditRequests and
	// PhabricatorRepositoryCommitData are deleted here too.
	$commit->delete();
	}

	$mirrors = id(new PhabricatorRepositoryMirror())
	->loadAllWhere('repositoryPHID = %s', $this->getPHID());
	foreach ($mirrors as $mirror) {
	$mirror->delete();
	}

	$ref_cursors = id(new PhabricatorRepositoryRefCursor())
	->loadAllWhere('repositoryPHID = %s', $this->getPHID());
	foreach ($ref_cursors as $cursor) {
	$cursor->delete();
	}

	$conn_w = $this->establishConnection('w');

	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE repositoryID = %d',
	self::TABLE_FILESYSTEM,
	$this->getID());

	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE repositoryID = %d',
	self::TABLE_PATHCHANGE,
	$this->getID());

	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE repositoryID = %d',
	self::TABLE_SUMMARY,
	$this->getID());

	$result = parent::delete();

	$this->saveTransaction();
	return $result;
	}

	public function isGit() {
	$vcs = $this->getVersionControlSystem();
	return ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_GIT);
	}

	public function isSVN() {
	$vcs = $this->getVersionControlSystem();
	return ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_SVN);
	}

	public function isHg() {
	$vcs = $this->getVersionControlSystem();
	return ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL);
	}

	public function isHosted() {
	return (bool)$this->getDetail('hosting-enabled', false);
	}

	public function setHosted($enabled) {
	return $this->setDetail('hosting-enabled', $enabled);
	}

	public function getServeOverHTTP() {
	if ($this->isSVN()) {
	return self::SERVE_OFF;
	}
	$serve = $this->getDetail('serve-over-http', self::SERVE_OFF);
	return $this->normalizeServeConfigSetting($serve);
	}

	public function setServeOverHTTP($mode) {
	return $this->setDetail('serve-over-http', $mode);
	}

	public function getServeOverSSH() {
	$serve = $this->getDetail('serve-over-ssh', self::SERVE_OFF);
	return $this->normalizeServeConfigSetting($serve);
	}

	public function setServeOverSSH($mode) {
	return $this->setDetail('serve-over-ssh', $mode);
	}

	public static function getProtocolAvailabilityName($constant) {
	switch ($constant) {
	case self::SERVE_OFF:
	return pht('Off');
	case self::SERVE_READONLY:
	return pht('Read Only');
	case self::SERVE_READWRITE:
	return pht('Read/Write');
	default:
	return pht('Unknown');
	}
	}

	private function normalizeServeConfigSetting($value) {
	switch ($value) {
	case self::SERVE_OFF:
	case self::SERVE_READONLY:
	return $value;
	case self::SERVE_READWRITE:
	if ($this->isHosted()) {
	return self::SERVE_READWRITE;
	} else {
	return self::SERVE_READONLY;
	}
	default:
	return self::SERVE_OFF;
	}
	}


	/**
	* Raise more useful errors when there are basic filesystem problems.
	*/
	private function assertLocalExists() {
	if (!$this->usesLocalWorkingCopy()) {
	return;
	}

	$local = $this->getLocalPath();
	Filesystem::assertExists($local);
	Filesystem::assertIsDirectory($local);
	Filesystem::assertReadable($local);
	}

	/**
	* Determine if the working copy is bare or not. In Git, this corresponds
	* to `--bare`. In Mercurial, `--noupdate`.
	*/
	public function isWorkingCopyBare() {
	switch ($this->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	return false;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$local = $this->getLocalPath();
	if (Filesystem::pathExists($local.'/.git')) {
	return false;
	} else {
	return true;
	}
	}
	}

	public function usesLocalWorkingCopy() {
	switch ($this->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	return $this->isHosted();
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	return true;
	}
	}

	public function getHookDirectories() {
	$directories = array();
	if (!$this->isHosted()) {
	return $directories;
	}

	$root = $this->getLocalPath();

	switch ($this->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	if ($this->isWorkingCopyBare()) {
	$directories[] = $root.'/hooks/pre-receive-phabricator.d/';
	} else {
	$directories[] = $root.'/.git/hooks/pre-receive-phabricator.d/';
	}
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$directories[] = $root.'/hooks/pre-commit-phabricator.d/';
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	// NOTE: We don't support custom Mercurial hooks for now because they're
	// messy and we can't easily just drop a `hooks.d/` directory next to
	// the hooks.
	break;
	}

	return $directories;
	}

	public function canDestroyWorkingCopy() {
	if ($this->isHosted()) {
	// Never destroy hosted working copies.
	return false;
	}

	$default_path = PhabricatorEnv::getEnvConfig(
	'repository.default-local-path');
	return Filesystem::isDescendant($this->getLocalPath(), $default_path);
	}

	public function canMirror() {
	if ($this->isGit() \|\| $this->isHg()) {
	return true;
	}

	return false;
	}

	public function canAllowDangerousChanges() {
	if (!$this->isHosted()) {
	return false;
	}

	if ($this->isGit() \|\| $this->isHg()) {
	return true;
	}

	return false;
	}

	public function shouldAllowDangerousChanges() {
	return (bool)$this->getDetail('allow-dangerous-changes');
	}

	public function writeStatusMessage(
	$status_type,
	$status_code,
	array $parameters = array()) {

	$table = new PhabricatorRepositoryStatusMessage();
	$conn_w = $table->establishConnection('w');
	$table_name = $table->getTableName();

	if ($status_code === null) {
	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE repositoryID = %d AND statusType = %s',
	$table_name,
	$this->getID(),
	$status_type);
	} else {
	queryfx(
	$conn_w,
	'INSERT INTO %T
	(repositoryID, statusType, statusCode, parameters, epoch)
	VALUES (%d, %s, %s, %s, %d)
	ON DUPLICATE KEY UPDATE
	statusCode = VALUES(statusCode),
	parameters = VALUES(parameters),
	epoch = VALUES(epoch)',
	$table_name,
	$this->getID(),
	$status_type,
	$status_code,
	json_encode($parameters),
	time());
	}

	return $this;
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	DiffusionCapabilityPush::CAPABILITY,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	case DiffusionCapabilityPush::CAPABILITY:
	return $this->getPushPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $user) {
	return false;
	}

	public function describeAutomaticCapability($capability) {
	return null;
	}



	/* -( PhabricatorMarkupInterface )----------------------------------------- */


	public function getMarkupFieldKey($field) {
	$hash = PhabricatorHash::digestForIndex($this->getMarkupText($field));
	return "repo:{$hash}";
	}

	public function newMarkupEngine($field) {
	return PhabricatorMarkupEngine::newMarkupEngine(array());
	}

	public function getMarkupText($field) {
	return $this->getDetail('description');
	}

	public function didMarkupText(
	$field,
	$output,
	PhutilMarkupEngine $engine) {
	require_celerity_resource('phabricator-remarkup-css');
	return phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup',
	),
	$output);
	}

	public function shouldUseMarkupCache($field) {
	return true;
	}

	}
	diff --git a/src/applications/repository/storage/__tests__/PhabricatorRepositoryURITestCase.php b/src/applications/repository/storage/__tests__/PhabricatorRepositoryURITestCase.php
	index a910d9fa23..5c5d0f87c5 100644
	--- a/src/applications/repository/storage/__tests__/PhabricatorRepositoryURITestCase.php
	+++ b/src/applications/repository/storage/__tests__/PhabricatorRepositoryURITestCase.php
	@@ -1,95 +1,95 @@
	<?php

	final class PhabricatorRepositoryURITestCase
	extends PhabricatorTestCase {

	protected function getPhabricatorTestCaseConfiguration() {
	return array(
	self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
	);
	}

	public function testURIGeneration() {
	$svn = PhabricatorRepositoryType::REPOSITORY_TYPE_SVN;
	$git = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
	$hg = PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL;

	$user = $this->generateNewTestUser();

	$http_secret = id(new PassphraseSecret())->setSecretData('quack')->save();

	$http_credential = PassphraseCredential::initializeNewCredential($user)
	->setCredentialType(PassphraseCredentialTypePassword::CREDENTIAL_TYPE)
	->setProvidesType(PassphraseCredentialTypePassword::PROVIDES_TYPE)
	->setUsername('duck')
	->setSecretID($http_secret->getID())
	->save();

	$repo = PhabricatorRepository::initializeNewRepository($user)
	->setVersionControlSystem($svn)
	->setName('Test Repo')
	->setCallsign('TESTREPO')
	->setCredentialPHID($http_credential->getPHID())
	->save();

	// Test HTTP URIs.

	$repo->setDetail('remote-uri', 'http://example.com/');
	$repo->setVersionControlSystem($svn);

	$this->assertEqual('http://example.com/', $repo->getRemoteURI());
	- $this->assertEqual('http://example.com/', $repo->getPublicRemoteURI());
	+ $this->assertEqual('http://example.com/', $repo->getPublicCloneURI());
	$this->assertEqual('http://example.com/',
	$repo->getRemoteURIEnvelope()->openEnvelope());

	$repo->setVersionControlSystem($git);

	$this->assertEqual('http://example.com/', $repo->getRemoteURI());
	- $this->assertEqual('http://example.com/', $repo->getPublicRemoteURI());
	+ $this->assertEqual('http://example.com/', $repo->getPublicCloneURI());
	$this->assertEqual('http://duck:quack@example.com/',
	$repo->getRemoteURIEnvelope()->openEnvelope());

	$repo->setVersionControlSystem($hg);

	$this->assertEqual('http://example.com/', $repo->getRemoteURI());
	- $this->assertEqual('http://example.com/', $repo->getPublicRemoteURI());
	+ $this->assertEqual('http://example.com/', $repo->getPublicCloneURI());
	$this->assertEqual('http://duck:quack@example.com/',
	$repo->getRemoteURIEnvelope()->openEnvelope());

	// Test SSH URIs.

	$repo->setDetail('remote-uri', 'ssh://example.com/');
	$repo->setVersionControlSystem($svn);

	$this->assertEqual('ssh://example.com/', $repo->getRemoteURI());
	- $this->assertEqual('ssh://example.com/', $repo->getPublicRemoteURI());
	+ $this->assertEqual('ssh://example.com/', $repo->getPublicCloneURI());
	$this->assertEqual('ssh://example.com/',
	$repo->getRemoteURIEnvelope()->openEnvelope());

	$repo->setVersionControlSystem($git);

	$this->assertEqual('ssh://example.com/', $repo->getRemoteURI());
	- $this->assertEqual('ssh://example.com/', $repo->getPublicRemoteURI());
	+ $this->assertEqual('ssh://example.com/', $repo->getPublicCloneURI());
	$this->assertEqual('ssh://example.com/',
	$repo->getRemoteURIEnvelope()->openEnvelope());

	$repo->setVersionControlSystem($hg);

	$this->assertEqual('ssh://example.com/', $repo->getRemoteURI());
	- $this->assertEqual('ssh://example.com/', $repo->getPublicRemoteURI());
	+ $this->assertEqual('ssh://example.com/', $repo->getPublicCloneURI());
	$this->assertEqual('ssh://example.com/',
	$repo->getRemoteURIEnvelope()->openEnvelope());

	// Test Git URIs.

	$repo->setDetail('remote-uri', 'git@example.com:path.git');
	$repo->setVersionControlSystem($git);

	$this->assertEqual('git@example.com:path.git', $repo->getRemoteURI());
	- $this->assertEqual('git@example.com:path.git', $repo->getPublicRemoteURI());
	+ $this->assertEqual('git@example.com:path.git', $repo->getPublicCloneURI());
	$this->assertEqual('git@example.com:path.git',
	$repo->getRemoteURIEnvelope()->openEnvelope());

	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Dec 1, 4:17 PM (1 d, 13 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 430710
Default Alt Text: (71 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions