No OneTemporary
Actions

Size

52 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php
	index 2398863a5c..6172c36f13 100644
	--- a/src/applications/differential/view/DifferentialChangesetListView.php
	+++ b/src/applications/differential/view/DifferentialChangesetListView.php
	@@ -1,328 +1,332 @@
	<?php

	final class DifferentialChangesetListView extends AphrontView {

	private $changesets = array();
	private $visibleChangesets = array();
	private $references = array();
	private $inlineURI;
	private $renderURI = '/differential/changeset/';
	private $whitespace;

	private $standaloneURI;
	private $leftRawFileURI;
	private $rightRawFileURI;

	private $symbolIndexes = array();
	private $repository;
	private $branch;
	private $diff;
	private $vsMap = array();

	private $title;

	public function setTitle($title) {
	$this->title = $title;
	return $this;
	}
	private function getTitle() {
	return $this->title;
	}

	public function setBranch($branch) {
	$this->branch = $branch;
	return $this;
	}
	private function getBranch() {
	return $this->branch;
	}

	public function setChangesets($changesets) {
	$this->changesets = $changesets;
	return $this;
	}

	public function setVisibleChangesets($visible_changesets) {
	$this->visibleChangesets = $visible_changesets;
	return $this;
	}

	public function setInlineCommentControllerURI($uri) {
	$this->inlineURI = $uri;
	return $this;
	}

	public function setRepository(PhabricatorRepository $repository) {
	$this->repository = $repository;
	return $this;
	}

	public function setDiff(DifferentialDiff $diff) {
	$this->diff = $diff;
	return $this;
	}

	public function setRenderingReferences(array $references) {
	$this->references = $references;
	return $this;
	}

	public function setSymbolIndexes(array $indexes) {
	$this->symbolIndexes = $indexes;
	return $this;
	}

	public function setRenderURI($render_uri) {
	$this->renderURI = $render_uri;
	return $this;
	}

	public function setWhitespace($whitespace) {
	$this->whitespace = $whitespace;
	return $this;
	}

	public function setVsMap(array $vs_map) {
	$this->vsMap = $vs_map;
	return $this;
	}

	public function getVsMap() {
	return $this->vsMap;
	}

	public function setStandaloneURI($uri) {
	$this->standaloneURI = $uri;
	return $this;
	}

	public function setRawFileURIs($l, $r) {
	$this->leftRawFileURI = $l;
	$this->rightRawFileURI = $r;
	return $this;
	}

	public function render() {
	require_celerity_resource('differential-changeset-view-css');

	$changesets = $this->changesets;

	Javelin::initBehavior('differential-toggle-files', array(
	'pht' => array(
	'undo' => pht('Undo'),
	'collapsed' => pht('This file content has been collapsed.'))
	));
	Javelin::initBehavior(
	'differential-dropdown-menus',
	array());

	$output = array();
	$mapping = array();
	foreach ($changesets as $key => $changeset) {
	$file = $changeset->getFilename();
	$class = 'differential-changeset';
	if (!$this->inlineURI) {
	$class .= ' differential-changeset-noneditable';
	}

	$ref = $this->references[$key];

	$detail = new DifferentialChangesetDetailView();

	$view_options = $this->renderViewOptionsDropdown(
	$detail,
	$ref,
	$changeset);

	$detail->setChangeset($changeset);
	$detail->addButton($view_options);
	$detail->setSymbolIndex(idx($this->symbolIndexes, $key));
	$detail->setVsChangesetID(idx($this->vsMap, $changeset->getID()));
	$detail->setEditable(true);

	$uniq_id = 'diff-'.$changeset->getAnchorName();
	if (isset($this->visibleChangesets[$key])) {
	$load = 'Loading...';
	$mapping[$uniq_id] = $ref;
	} else {
	$load = javelin_tag(
	'a',
	array(
	'href' => '#'.$uniq_id,
	'meta' => array(
	'id' => $uniq_id,
	'ref' => $ref,
	'kill' => true,
	),
	'sigil' => 'differential-load',
	'mustcapture' => true,
	),
	pht('Load'));
	}
	$detail->appendChild(
	phutil_tag(
	'div',
	array(
	'id' => $uniq_id,
	),
	phutil_tag('div', array('class' => 'differential-loading'), $load)));
	$output[] = $detail->render();
	}

	require_celerity_resource('aphront-tooltip-css');

	Javelin::initBehavior('differential-populate', array(
	'registry' => $mapping,
	'whitespace' => $this->whitespace,
	'uri' => $this->renderURI,
	));

	Javelin::initBehavior('differential-show-more', array(
	'uri' => $this->renderURI,
	'whitespace' => $this->whitespace,
	));

	Javelin::initBehavior('differential-comment-jump', array());

	if ($this->inlineURI) {
	$undo_templates = $this->renderUndoTemplates();

	Javelin::initBehavior('differential-edit-inline-comments', array(
	'uri' => $this->inlineURI,
	'undo_templates' => $undo_templates,
	'stage' => 'differential-review-stage',
	));
	}

	+ $header = null;
	+ if ($this->getTitle() !== null) {
	+ $header = id(new PHUIHeaderView())
	+ ->setHeader($this->getTitle());
	+ }
	+
	return array(
	- id(new PHUIHeaderView())
	- ->setHeader($this->getTitle())
	- ->render(),
	+ $header,
	phutil_tag(
	'div',
	array(
	'class' => 'differential-review-stage',
	'id' => 'differential-review-stage',
	),
	$output),
	);
	}

	/**
	* Render the "Undo" markup for the inline comment undo feature.
	*/
	private function renderUndoTemplates() {
	$link = javelin_tag(
	'a',
	array(
	'href' => '#',
	'sigil' => 'differential-inline-comment-undo',
	),
	pht('Undo'));

	$div = phutil_tag(
	'div',
	array(
	'class' => 'differential-inline-undo',
	),
	array('Changes discarded. ', $link));

	return array(
	'l' => hsprintf(
	'<table><tr>'.
	'<th></th><td>%s</td>'.
	'<th></th><td colspan="3"></td>'.
	'</tr></table>',
	$div),

	'r' => hsprintf(
	'<table><tr>'.
	'<th></th><td></td>'.
	'<th></th><td colspan="3">%s</td>'.
	'</tr></table>',
	$div),
	);
	}

	private function renderViewOptionsDropdown(
	DifferentialChangesetDetailView $detail,
	$ref,
	DifferentialChangeset $changeset) {

	$meta = array();

	$qparams = array(
	'ref' => $ref,
	'whitespace' => $this->whitespace,
	);

	if ($this->standaloneURI) {
	$uri = new PhutilURI($this->standaloneURI);
	$uri->setQueryParams($uri->getQueryParams() + $qparams);
	$meta['standaloneURI'] = (string)$uri;
	}

	$repository = $this->repository;
	if ($repository) {
	try {
	$meta['diffusionURI'] =
	(string)$repository->getDiffusionBrowseURIForPath(
	$this->user,
	$changeset->getAbsoluteRepositoryPath($repository, $this->diff),
	idx($changeset->getMetadata(), 'line:first'),
	$this->getBranch());
	} catch (DiffusionSetupException $e) {
	// Ignore
	}
	}

	$change = $changeset->getChangeType();

	if ($this->leftRawFileURI) {
	if ($change != DifferentialChangeType::TYPE_ADD) {
	$uri = new PhutilURI($this->leftRawFileURI);
	$uri->setQueryParams($uri->getQueryParams() + $qparams);
	$meta['leftURI'] = (string)$uri;
	}
	}

	if ($this->rightRawFileURI) {
	if ($change != DifferentialChangeType::TYPE_DELETE &&
	$change != DifferentialChangeType::TYPE_MULTICOPY) {
	$uri = new PhutilURI($this->rightRawFileURI);
	$uri->setQueryParams($uri->getQueryParams() + $qparams);
	$meta['rightURI'] = (string)$uri;
	}
	}

	$user = $this->user;
	if ($user && $repository) {
	$path = ltrim(
	$changeset->getAbsoluteRepositoryPath($repository, $this->diff),
	'/');
	$line = idx($changeset->getMetadata(), 'line:first', 1);
	$callsign = $repository->getCallsign();
	$editor_link = $user->loadEditorLink($path, $line, $callsign);
	if ($editor_link) {
	$meta['editor'] = $editor_link;
	} else {
	$meta['editorConfigure'] = '/settings/panel/display/';
	}
	}

	$meta['containerID'] = $detail->getID();
	$caret = phutil_tag('span', array('class' => 'caret'), '');

	return javelin_tag(
	'a',
	array(
	'class' => 'button grey small dropdown',
	'meta' => $meta,
	'href' => idx($meta, 'detailURI', '#'),
	'target' => '_blank',
	'sigil' => 'differential-view-options',
	),
	array(pht('View Options'), $caret));
	}

	}
	diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
	index 92ad12efad..48313014c0 100644
	--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
	+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
	@@ -1,202 +1,202 @@
	<?php

	abstract class DiffusionBrowseController extends DiffusionController {

	public function shouldAllowPublic() {
	return true;
	}

	protected function renderSearchForm($collapsed) {
	$drequest = $this->getDiffusionRequest();
	$form = id(new AphrontFormView())
	->setUser($this->getRequest()->getUser())
	->setMethod('GET');

	switch ($drequest->getRepository()->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$form->appendChild(pht('Search is not available in Subversion.'));
	break;

	default:
	$form
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Search Here'))
	->setName('grep')
	->setValue($this->getRequest()->getStr('grep'))
	->setCaption(pht('Enter a regular expression.')))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Search File Content')));
	break;
	}

	$filter = new AphrontListFilterView();
	$filter->appendChild($form);

	if ($collapsed) {
	$filter->setCollapsed(
	pht('Show Search'),
	pht('Hide Search'),
	pht('Search for file content in this directory.'),
	'#');
	}

	return $filter;
	}

	protected function markupText($text) {
	$engine = PhabricatorMarkupEngine::newDiffusionMarkupEngine();
	$engine->setConfig('viewer', $this->getRequest()->getUser());
	$text = $engine->markupText($text);

	$text = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup',
	),
	$text);

	return $text;
	}

	protected function buildHeaderView(DiffusionRequest $drequest) {
	$viewer = $this->getRequest()->getUser();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	- ->setHeader($this->renderPathLinks($drequest))
	+ ->setHeader($this->renderPathLinks($drequest, 'browse'))
	->setPolicyObject($drequest->getRepository());

	return $header;
	}

	protected function buildActionView(DiffusionRequest $drequest) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer);

	$history_uri = $drequest->generateURI(
	array(
	'action' => 'history',
	));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View History'))
	->setHref($history_uri)
	->setIcon('history'));

	$behind_head = $drequest->getRawCommit();
	$head_uri = $drequest->generateURI(
	array(
	'commit' => '',
	'action' => 'browse',
	));
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Jump to HEAD'))
	->setHref($head_uri)
	->setIcon('home')
	->setDisabled(!$behind_head));

	// TODO: Ideally, this should live in Owners and be event-triggered, but
	// there's no reasonable object for it to react to right now.

	$owners_uri = id(new PhutilURI('/owners/view/search/'))
	->setQueryParams(
	array(
	'repository' => $drequest->getCallsign(),
	'path' => '/'.$drequest->getPath(),
	));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Find Owners'))
	->setHref((string)$owners_uri)
	->setIcon('preview'));

	return $view;
	}

	protected function buildPropertyView(DiffusionRequest $drequest) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorPropertyListView())
	->setUser($viewer);

	$stable_commit = $drequest->getStableCommitName();
	$callsign = $drequest->getRepository()->getCallsign();

	$view->addProperty(
	pht('Commit'),
	phutil_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'action' => 'commit',
	'commit' => $stable_commit,
	)),
	),
	$drequest->getRepository()->formatCommitName($stable_commit)));

	if ($drequest->getTagContent()) {
	$view->addProperty(
	pht('Tag'),
	$drequest->getSymbolicCommit());

	$view->addSectionHeader(pht('Tag Content'));
	$view->addTextContent($this->markupText($drequest->getTagContent()));
	}

	return $view;
	}

	protected function buildOpenRevisions() {
	$user = $this->getRequest()->getUser();

	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();
	$path = $drequest->getPath();

	$path_map = id(new DiffusionPathIDQuery(array($path)))->loadPathIDs();
	$path_id = idx($path_map, $path);
	if (!$path_id) {
	return null;
	}

	$revisions = id(new DifferentialRevisionQuery())
	->setViewer($user)
	->withPath($repository->getID(), $path_id)
	->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
	->setOrder(DifferentialRevisionQuery::ORDER_PATH_MODIFIED)
	->setLimit(10)
	->needRelationships(true)
	->execute();

	if (!$revisions) {
	return null;
	}

	$view = id(new DifferentialRevisionListView())
	->setRevisions($revisions)
	->setFields(DifferentialRevisionListView::getDefaultFields($user))
	->setUser($user)
	->loadAssets();

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

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Pending Differential Revisions'));

	return array(
	$header,
	$view,
	);
	}

	}
	diff --git a/src/applications/diffusion/controller/DiffusionChangeController.php b/src/applications/diffusion/controller/DiffusionChangeController.php
	index e6def447b0..ee803f1da2 100644
	--- a/src/applications/diffusion/controller/DiffusionChangeController.php
	+++ b/src/applications/diffusion/controller/DiffusionChangeController.php
	@@ -1,82 +1,159 @@
	<?php

	final class DiffusionChangeController extends DiffusionController {

	+ public function shouldAllowPublic() {
	+ return true;
	+ }
	+
	public function processRequest() {
	$drequest = $this->diffusionRequest;
	+ $viewer = $this->getRequest()->getUser();

	$content = array();

	$data = $this->callConduitWithDiffusionRequest(
	'diffusion.diffquery',
	array(
	'commit' => $drequest->getCommit(),
	- 'path' => $drequest->getPath()));
	+ 'path' => $drequest->getPath(),
	+ ));
	$drequest->setCommit($data['effectiveCommit']);
	$raw_changes = ArcanistDiffChange::newFromConduit($data['changes']);
	$diff = DifferentialDiff::newFromRawChanges($raw_changes);
	$changesets = $diff->getChangesets();
	$changeset = reset($changesets);

	if (!$changeset) {
	// TODO: Refine this.
	return new Aphront404Response();
	}

	$repository = $drequest->getRepository();
	$callsign = $repository->getCallsign();
	$commit = $drequest->getRawCommit();
	$changesets = array(
	0 => $changeset,
	);

	$changeset_view = new DifferentialChangesetListView();
	- $changeset_view->setTitle(DiffusionView::nameCommit($repository, $commit));
	$changeset_view->setChangesets($changesets);
	$changeset_view->setVisibleChangesets($changesets);
	$changeset_view->setRenderingReferences(
	array(
	0 => $drequest->generateURI(array('action' => 'rendering-ref'))
	));

	$raw_params = array(
	'action' => 'browse',
	'params' => array(
	'view' => 'raw',
	),
	);
	+
	$right_uri = $drequest->generateURI($raw_params);
	$raw_params['params']['before'] = $drequest->getRawCommit();
	$left_uri = $drequest->generateURI($raw_params);
	$changeset_view->setRawFileURIs($left_uri, $right_uri);

	- $changeset_view->setRenderURI(
	- '/diffusion/'.$callsign.'/diff/');
	+ $changeset_view->setRenderURI('/diffusion/'.$callsign.'/diff/');
	$changeset_view->setWhitespace(
	DifferentialChangesetParser::WHITESPACE_SHOW_ALL);
	$changeset_view->setUser($this->getRequest()->getUser());

	// TODO: This is pretty awkward, unify the CSS between Diffusion and
	// Differential better.
	require_celerity_resource('differential-core-view-css');
	$content[] = $changeset_view->render();

	- $nav = $this->buildSideNav('change', true);
	- $nav->appendChild($content);
	$crumbs = $this->buildCrumbs(
	array(
	'branch' => true,
	'path' => true,
	'view' => 'change',
	));
	- $nav->setCrumbs($crumbs);
	+
	+ $links = $this->renderPathLinks($drequest);
	+
	+ $header = id(new PHUIHeaderView())
	+ ->setHeader($links)
	+ ->setUser($viewer)
	+ ->setPolicyObject($drequest->getRepository());
	+ $actions = $this->buildActionView($drequest);
	+ $properties = $this->buildPropertyView($drequest);

	return $this->buildApplicationPage(
	- $nav,
	+ array(
	+ $crumbs,
	+ $header,
	+ $actions,
	+ $properties,
	+ $content,
	+ ),
	array(
	'title' => pht('Change'),
	- 'device' => true,
	));
	}

	+ private function buildActionView(DiffusionRequest $drequest) {
	+ $viewer = $this->getRequest()->getUser();
	+
	+ $view = id(new PhabricatorActionListView())
	+ ->setUser($viewer);
	+
	+ $history_uri = $drequest->generateURI(
	+ array(
	+ 'action' => 'history',
	+ ));
	+
	+ $browse_uri = $drequest->generateURI(
	+ array(
	+ 'action' => 'browse',
	+ ));
	+
	+ $view->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName(pht('View History'))
	+ ->setHref($history_uri)
	+ ->setIcon('history'));
	+
	+ $history_uri = $drequest->generateURI(
	+ array(
	+ 'action' => 'browse',
	+ ));
	+
	+ $view->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName(pht('Browse Content'))
	+ ->setHref($browse_uri)
	+ ->setIcon('file'));
	+
	+ return $view;
	+ }
	+
	+ protected function buildPropertyView(DiffusionRequest $drequest) {
	+ $viewer = $this->getRequest()->getUser();
	+
	+ $view = id(new PhabricatorPropertyListView())
	+ ->setUser($viewer);
	+
	+ $stable_commit = $drequest->getStableCommitName();
	+ $callsign = $drequest->getRepository()->getCallsign();
	+
	+ $view->addProperty(
	+ pht('Commit'),
	+ phutil_tag(
	+ 'a',
	+ array(
	+ 'href' => $drequest->generateURI(
	+ array(
	+ 'action' => 'commit',
	+ 'commit' => $stable_commit,
	+ )),
	+ ),
	+ $drequest->getRepository()->formatCommitName($stable_commit)));
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
	index 34fbe4ca43..b45c4b010d 100644
	--- a/src/applications/diffusion/controller/DiffusionController.php
	+++ b/src/applications/diffusion/controller/DiffusionController.php
	@@ -1,330 +1,333 @@
	<?php

	abstract class DiffusionController extends PhabricatorController {

	protected $diffusionRequest;

	public function willProcessRequest(array $data) {
	if (isset($data['callsign'])) {
	$drequest = DiffusionRequest::newFromAphrontRequestDictionary(
	$data,
	$this->getRequest());
	$this->diffusionRequest = $drequest;
	}
	}

	public function setDiffusionRequest(DiffusionRequest $request) {
	$this->diffusionRequest = $request;
	return $this;
	}

	protected function getDiffusionRequest() {
	if (!$this->diffusionRequest) {
	throw new Exception("No Diffusion request object!");
	}
	return $this->diffusionRequest;
	}

	final protected function buildSideNav($selected, $has_change_view) {
	$nav = new AphrontSideNavFilterView();
	$nav->setBaseURI(new PhutilURI(''));

	$navs = array(
	'history' => pht('History View'),
	'browse' => pht('Browse View'),
	'change' => pht('Change View'),
	);

	if (!$has_change_view) {
	unset($navs['change']);
	}

	$drequest = $this->getDiffusionRequest();
	$branch = $drequest->loadBranch();

	if ($branch && $branch->getLintCommit()) {
	$navs['lint'] = pht('Lint View');
	}

	$selected_href = null;
	foreach ($navs as $action => $name) {
	$href = $drequest->generateURI(
	array(
	'action' => $action,
	));
	if ($action == $selected) {
	$selected_href = $href;
	}

	$nav->addFilter($href, $name, $href);
	}
	$nav->selectFilter($selected_href, null);

	// TODO: URI encoding might need to be sorted out for this link.

	$nav->addFilter(
	'',
	pht("Search Owners \xE2\x86\x97"),
	'/owners/view/search/'.
	'?repository='.phutil_escape_uri($drequest->getCallsign()).
	'&path='.phutil_escape_uri('/'.$drequest->getPath()));

	return $nav;
	}

	public function buildCrumbs(array $spec = array()) {
	$crumbs = $this->buildApplicationCrumbs();
	$crumb_list = $this->buildCrumbList($spec);
	foreach ($crumb_list as $crumb) {
	$crumbs->addCrumb($crumb);
	}
	return $crumbs;
	}

	private function buildCrumbList(array $spec = array()) {

	$spec = $spec + array(
	'commit' => null,
	'tags' => null,
	'branches' => null,
	'view' => null,
	);

	$crumb_list = array();

	// On the home page, we don't have a DiffusionRequest.
	if ($this->diffusionRequest) {
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();
	} else {
	$drequest = null;
	$repository = null;
	}

	if (!$repository) {
	return $crumb_list;
	}

	$callsign = $repository->getCallsign();
	$repository_name = 'r'.$callsign;

	if (!$spec['commit'] && !$spec['tags'] && !$spec['branches']) {
	$branch_name = $drequest->getBranch();
	if ($branch_name) {
	$repository_name .= ' ('.$branch_name.')';
	}
	}

	$crumb = id(new PhabricatorCrumbView())
	->setName($repository_name);
	if (!$spec['view'] && !$spec['commit'] &&
	!$spec['tags'] && !$spec['branches']) {
	$crumb_list[] = $crumb;
	return $crumb_list;
	}
	- $crumb->setHref("/diffusion/{$callsign}/");
	+ $crumb->setHref(
	+ $drequest->generateURI(
	+ array(
	+ 'action' => 'branch',
	+ 'path' => '/',
	+ )));
	$crumb_list[] = $crumb;

	$raw_commit = $drequest->getRawCommit();

	if ($spec['tags']) {
	$crumb = new PhabricatorCrumbView();
	if ($spec['commit']) {
	$crumb->setName(
	pht("Tags for %s", 'r'.$callsign.$raw_commit));
	$crumb->setHref($drequest->generateURI(
	array(
	'action' => 'commit',
	'commit' => $raw_commit,
	)));
	} else {
	$crumb->setName(pht('Tags'));
	}
	$crumb_list[] = $crumb;
	return $crumb_list;
	}

	if ($spec['branches']) {
	$crumb = id(new PhabricatorCrumbView())
	->setName(pht('Branches'));
	$crumb_list[] = $crumb;
	return $crumb_list;
	}

	if ($spec['commit']) {
	$crumb = id(new PhabricatorCrumbView())
	->setName("r{$callsign}{$raw_commit}")
	->setHref("r{$callsign}{$raw_commit}");
	$crumb_list[] = $crumb;
	return $crumb_list;
	}

	$crumb = new PhabricatorCrumbView();
	$view = $spec['view'];

	$path = null;
	if (isset($spec['path'])) {
	$path = $drequest->getPath();
	}

	if ($raw_commit) {
	$commit_link = DiffusionView::linkCommit(
	$repository,
	$raw_commit);
	} else {
	$commit_link = '';
	}

	switch ($view) {
	case 'history':
	$view_name = pht('History');
	break;
	case 'browse':
	$view_name = pht('Browse');
	break;
	case 'lint':
	$view_name = pht('Lint');
	break;
	case 'change':
	$view_name = pht('Change');
	- $crumb_list[] = $crumb->setName(
	- hsprintf('%s (%s)', $path, $commit_link));
	- return $crumb_list;
	+ break;
	}

	$uri_params = array(
	'action' => $view,
	);

	$crumb = id(new PhabricatorCrumbView())
	->setName($view_name);

	- if ($view == 'browse') {
	+ if ($view == 'browse' \|\| $view == 'change') {
	$crumb_list[] = $crumb;
	return $crumb_list;
	}

	$crumb->setHref($drequest->generateURI(
	array(
	'path' => '',
	) + $uri_params));
	$crumb_list[] = $crumb;

	$path_parts = explode('/', $path);
	do {
	$last = array_pop($path_parts);
	} while (count($path_parts) && $last == '');

	$path_sections = array();
	$thus_far = '';
	foreach ($path_parts as $path_part) {
	$thus_far .= $path_part.'/';
	$path_sections[] = '/';
	$path_sections[] = phutil_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'path' => $thus_far,
	) + $uri_params),
	),
	$path_part);
	}

	$path_sections[] = '/'.$last;

	$crumb_list[] = id(new PhabricatorCrumbView())
	->setName($path_sections);

	$last_crumb = array_pop($crumb_list);

	if ($raw_commit) {
	$jump_link = phutil_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'commit' => '',
	) + $uri_params),
	),
	pht('Jump to HEAD'));

	$name = $last_crumb->getName();
	$name = hsprintf('%s @ %s (%s)', $name, $commit_link, $jump_link);
	$last_crumb->setName($name);
	} else if ($spec['view'] != 'lint') {
	$name = $last_crumb->getName();
	$name = hsprintf('%s @ HEAD', $name);
	$last_crumb->setName($name);
	}

	$crumb_list[] = $last_crumb;

	return $crumb_list;
	}

	protected function callConduitWithDiffusionRequest(
	$method,
	array $params = array()) {

	$user = $this->getRequest()->getUser();
	$drequest = $this->getDiffusionRequest();

	return DiffusionQuery::callConduitWithDiffusionRequest(
	$user,
	$drequest,
	$method,
	$params);
	}

	protected function getRepositoryControllerURI(
	PhabricatorRepository $repository,
	$path) {
	return $this->getApplicationURI($repository->getCallsign().'/'.$path);
	}

	protected function renderPathLinks(DiffusionRequest $drequest) {
	$path = $drequest->getPath();
	$path_parts = array_filter(explode('/', trim($path, '/')));

	$links = array();
	if ($path_parts) {
	$links[] = phutil_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'action' => 'browse',
	'path' => '',
	)),
	),
	'r'.$drequest->getRepository()->getCallsign().'/');
	$accum = '';
	$last_key = last_key($path_parts);
	foreach ($path_parts as $key => $part) {
	$links[] = ' ';
	$accum .= '/'.$part;
	if ($key === $last_key) {
	$links[] = $part;
	} else {
	$links[] = phutil_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'action' => 'browse',
	'path' => $accum,
	)),
	),
	$part.'/');
	}
	}
	} else {
	$links[] = 'r'.$drequest->getRepository()->getCallsign().'/';
	}

	return $links;
	}

	}

	diff --git a/src/applications/diffusion/controller/DiffusionDiffController.php b/src/applications/diffusion/controller/DiffusionDiffController.php
	index 2e98ef2175..5f6565bfb4 100644
	--- a/src/applications/diffusion/controller/DiffusionDiffController.php
	+++ b/src/applications/diffusion/controller/DiffusionDiffController.php
	@@ -1,115 +1,119 @@
	<?php

	final class DiffusionDiffController extends DiffusionController {

	+ public function shouldAllowPublic() {
	+ return true;
	+ }
	+
	public function willProcessRequest(array $data) {
	$data = $data + array(
	'dblob' => $this->getRequest()->getStr('ref'),
	);
	$drequest = DiffusionRequest::newFromAphrontRequestDictionary(
	$data,
	$this->getRequest());

	$this->diffusionRequest = $drequest;
	}

	public function processRequest() {
	$drequest = $this->getDiffusionRequest();
	$request = $this->getRequest();
	$user = $request->getUser();

	if (!$request->isAjax()) {

	// This request came out of the dropdown menu, either "View Standalone"
	// or "View Raw File".

	$view = $request->getStr('view');
	if ($view == 'r') {
	$uri = $drequest->generateURI(
	array(
	'action' => 'browse',
	'params' => array(
	'view' => 'raw',
	),
	));
	} else {
	$uri = $drequest->generateURI(
	array(
	'action' => 'change',
	));
	}

	return id(new AphrontRedirectResponse())->setURI($uri);
	}

	$data = $this->callConduitWithDiffusionRequest(
	'diffusion.diffquery',
	array(
	'commit' => $drequest->getCommit(),
	'path' => $drequest->getPath()));
	$drequest->setCommit($data['effectiveCommit']);
	$raw_changes = ArcanistDiffChange::newFromConduit($data['changes']);
	$diff = DifferentialDiff::newFromRawChanges($raw_changes);
	$changesets = $diff->getChangesets();
	$changeset = reset($changesets);

	if (!$changeset) {
	return new Aphront404Response();
	}

	$parser = new DifferentialChangesetParser();
	$parser->setUser($user);
	$parser->setChangeset($changeset);
	$parser->setRenderingReference($drequest->generateURI(
	array(
	'action' => 'rendering-ref')));

	$pquery = new DiffusionPathIDQuery(array($changeset->getFilename()));
	$ids = $pquery->loadPathIDs();
	$path_id = $ids[$changeset->getFilename()];

	$parser->setLeftSideCommentMapping($path_id, false);
	$parser->setRightSideCommentMapping($path_id, true);

	$parser->setWhitespaceMode(
	DifferentialChangesetParser::WHITESPACE_SHOW_ALL);

	$inlines = id(new PhabricatorAuditInlineComment())->loadAllWhere(
	'commitPHID = %s AND pathID = %d AND
	(authorPHID = %s OR auditCommentID IS NOT NULL)',
	$drequest->loadCommit()->getPHID(),
	$path_id,
	$user->getPHID());

	if ($inlines) {
	foreach ($inlines as $inline) {
	$parser->parseInlineComment($inline);
	}

	$phids = mpull($inlines, 'getAuthorPHID');
	$handles = $this->loadViewerHandles($phids);
	$parser->setHandles($handles);
	}

	$engine = new PhabricatorMarkupEngine();
	$engine->setViewer($user);

	foreach ($inlines as $inline) {
	$engine->addObject(
	$inline,
	PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);
	}

	$engine->process();

	$parser->setMarkupEngine($engine);

	$spec = $request->getStr('range');
	list($range_s, $range_e, $mask) =
	DifferentialChangesetParser::parseRangeSpecification($spec);
	$output = $parser->render($range_s, $range_e, $mask);

	return id(new PhabricatorChangesetResponse())
	->setRenderedChangeset($output);
	}
	}
	diff --git a/src/applications/diffusion/request/DiffusionRequest.php b/src/applications/diffusion/request/DiffusionRequest.php
	index f3c17b952a..b346d7af99 100644
	--- a/src/applications/diffusion/request/DiffusionRequest.php
	+++ b/src/applications/diffusion/request/DiffusionRequest.php
	@@ -1,663 +1,664 @@
	<?php

	/**
	* Contains logic to parse Diffusion requests, which have a complicated URI
	* structure.
	*
	*
	* @task new Creating Requests
	* @task uri Managing Diffusion URIs
	*
	* @group diffusion
	*/
	abstract class DiffusionRequest {

	protected $callsign;
	protected $path;
	protected $line;
	protected $symbolicCommit;
	protected $commit;
	protected $commitType = 'commit';
	protected $tagContent;
	protected $branch;
	protected $lint;

	protected $repository;
	protected $repositoryCommit;
	protected $repositoryCommitData;
	protected $stableCommitName;
	protected $arcanistProjects;

	private $initFromConduit = true;
	private $user;

	abstract protected function getSupportsBranches();
	abstract protected function didInitialize();


	/* -( Creating Requests )-------------------------------------------------- */


	/**
	* Create a new synthetic request from a parameter dictionary. If you need
	* a @{class:DiffusionRequest} object in order to issue a DiffusionQuery, you
	* can use this method to build one.
	*
	* Parameters are:
	*
	* - `callsign` Repository callsign. Provide this or `repository`.
	* - `user` Viewing user. Required if `callsign` is provided.
	* - `repository` Repository object. Provide this or `callsign`.
	* - `branch` Optional, branch name.
	* - `path` Optional, file path.
	* - `commit` Optional, commit identifier.
	* - `line` Optional, line range.
	*
	* @param map See documentation.
	* @return DiffusionRequest New request object.
	* @task new
	*/
	final public static function newFromDictionary(array $data) {
	if (isset($data['repository']) && isset($data['callsign'])) {
	throw new Exception(
	"Specify 'repository' or 'callsign', but not both.");
	} else if (!isset($data['repository']) && !isset($data['callsign'])) {
	throw new Exception(
	"One of 'repository' and 'callsign' is required.");
	} else if (isset($data['callsign']) && empty($data['user'])) {
	throw new Exception(
	"Parameter 'user' is required if 'callsign' is provided.");
	}

	if (isset($data['repository'])) {
	$object = self::newFromRepository($data['repository']);
	} else {
	$object = self::newFromCallsign($data['callsign'], $data['user']);
	}

	$object->initializeFromDictionary($data);

	return $object;
	}


	/**
	* Create a new request from an Aphront request dictionary. This is an
	* internal method that you generally should not call directly; instead,
	* call @{method:newFromDictionary}.
	*
	* @param map Map of Aphront request data.
	* @return DiffusionRequest New request object.
	* @task new
	*/
	final public static function newFromAphrontRequestDictionary(
	array $data,
	AphrontRequest $request) {

	$callsign = phutil_unescape_uri_path_component(idx($data, 'callsign'));
	$object = self::newFromCallsign($callsign, $request->getUser());

	$use_branches = $object->getSupportsBranches();
	$parsed = self::parseRequestBlob(idx($data, 'dblob'), $use_branches);

	$object->setUser($request->getUser());
	$object->initializeFromDictionary($parsed);
	$object->lint = $request->getStr('lint');
	return $object;
	}


	/**
	* Internal.
	*
	* @task new
	*/
	final private function __construct() {
	// <private>
	}


	/**
	* Internal. Use @{method:newFromDictionary}, not this method.
	*
	* @param string Repository callsign.
	* @param PhabricatorUser Viewing user.
	* @return DiffusionRequest New request object.
	* @task new
	*/
	final private static function newFromCallsign(
	$callsign,
	PhabricatorUser $viewer) {

	$repository = id(new PhabricatorRepositoryQuery())
	->setViewer($viewer)
	->withCallsigns(array($callsign))
	->executeOne();
	if (!$repository) {
	throw new Exception("No such repository '{$callsign}'.");
	}

	return self::newFromRepository($repository);
	}


	/**
	* Internal. Use @{method:newFromDictionary}, not this method.
	*
	* @param PhabricatorRepository Repository object.
	* @return DiffusionRequest New request object.
	* @task new
	*/
	final private static function newFromRepository(
	PhabricatorRepository $repository) {

	$map = array(
	PhabricatorRepositoryType::REPOSITORY_TYPE_GIT => 'DiffusionGitRequest',
	PhabricatorRepositoryType::REPOSITORY_TYPE_SVN => 'DiffusionSvnRequest',
	PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL =>
	'DiffusionMercurialRequest',
	);

	$class = idx($map, $repository->getVersionControlSystem());

	if (!$class) {
	throw new Exception("Unknown version control system!");
	}

	$object = new $class();

	$object->repository = $repository;
	$object->callsign = $repository->getCallsign();

	return $object;
	}


	/**
	* Internal. Use @{method:newFromDictionary}, not this method.
	*
	* @param map Map of parsed data.
	* @return void
	* @task new
	*/
	final private function initializeFromDictionary(array $data) {
	$this->path = idx($data, 'path');
	$this->symbolicCommit = idx($data, 'commit');
	$this->commit = idx($data, 'commit');
	$this->line = idx($data, 'line');
	$this->initFromConduit = idx($data, 'initFromConduit', true);

	if ($this->getSupportsBranches()) {
	$this->branch = idx($data, 'branch');
	}

	if (!$this->getUser()) {
	$user = idx($data, 'user');
	if (!$user) {
	throw new Exception(
	'You must provide a PhabricatorUser in the dictionary!');
	}
	$this->setUser($user);
	}

	$this->didInitialize();
	}

	final protected function shouldInitFromConduit() {
	return $this->initFromConduit;
	}

	final public function setUser(PhabricatorUser $user) {
	$this->user = $user;
	return $this;
	}
	final public function getUser() {
	return $this->user;
	}

	public function getRepository() {
	return $this->repository;
	}

	public function getCallsign() {
	return $this->callsign;
	}

	public function setPath($path) {
	$this->path = $path;
	return $this;
	}

	public function getPath() {
	return $this->path;
	}

	public function getLine() {
	return $this->line;
	}

	public function getCommit() {
	return $this->commit;
	}

	public function getSymbolicCommit() {
	return $this->symbolicCommit;
	}

	public function getBranch() {
	return $this->branch;
	}

	public function getLint() {
	return $this->lint;
	}

	protected function getArcanistBranch() {
	return $this->getBranch();
	}

	public function loadBranch() {
	return id(new PhabricatorRepositoryBranch())->loadOneWhere(
	'repositoryID = %d AND name = %s',
	$this->getRepository()->getID(),
	$this->getArcanistBranch());
	}

	public function getTagContent() {
	return $this->tagContent;
	}

	public function loadCommit() {
	if (empty($this->repositoryCommit)) {
	$repository = $this->getRepository();

	$commit = id(new PhabricatorRepositoryCommit())->loadOneWhere(
	'repositoryID = %d AND commitIdentifier = %s',
	$repository->getID(),
	$this->getCommit());
	$this->repositoryCommit = $commit;
	}
	return $this->repositoryCommit;
	}

	public function loadArcanistProjects() {
	if (empty($this->arcanistProjects)) {
	$projects = id(new PhabricatorRepositoryArcanistProject())->loadAllWhere(
	'repositoryID = %d',
	$this->getRepository()->getID());
	$this->arcanistProjects = $projects;
	}
	return $this->arcanistProjects;
	}

	public function loadCommitData() {
	if (empty($this->repositoryCommitData)) {
	$commit = $this->loadCommit();
	$data = id(new PhabricatorRepositoryCommitData())->loadOneWhere(
	'commitID = %d',
	$commit->getID());
	if (!$data) {
	$data = new PhabricatorRepositoryCommitData();
	$data->setCommitMessage(
	'(This commit has not been fully parsed yet.)');
	}
	$this->repositoryCommitData = $data;
	}
	return $this->repositoryCommitData;
	}

	/**
	* Retrieve a stable, permanent commit name. This returns a non-symbolic
	* identifier for the current commit: e.g., a specific commit hash in git
	* (NOT a symbolic name like "origin/master") or a specific revision number
	* in SVN (NOT a symbolic name like "HEAD").
	*
	* @return string Stable commit name, like a git hash or SVN revision. Not
	* a symbolic commit reference.
	*/
	public function getStableCommitName() {
	if (!$this->stableCommitName) {
	$this->queryStableCommitName();
	}
	return $this->stableCommitName;
	}

	final public function getRawCommit() {
	return $this->commit;
	}

	public function setCommit($commit) {
	$this->commit = $commit;
	return $this;
	}

	/* -( Managing Diffusion URIs )-------------------------------------------- */


	/**
	* Generate a Diffusion URI using this request to provide defaults. See
	* @{method:generateDiffusionURI} for details. This method is the same, but
	* preserves the request parameters if they are not overridden.
	*
	* @param map See @{method:generateDiffusionURI}.
	* @return PhutilURI Generated URI.
	* @task uri
	*/
	public function generateURI(array $params) {
	if (empty($params['stable'])) {
	$default_commit = $this->getRawCommit();
	} else {
	$default_commit = $this->getStableCommitName();
	}

	$defaults = array(
	'callsign' => $this->getCallsign(),
	'path' => $this->getPath(),
	'branch' => $this->getBranch(),
	'commit' => $default_commit,
	'lint' => idx($params, 'lint', $this->getLint()),
	);
	foreach ($defaults as $key => $val) {
	if (!isset($params[$key])) { // Overwrite NULL.
	$params[$key] = $val;
	}
	}
	return self::generateDiffusionURI($params);
	}


	/**
	* Generate a Diffusion URI from a parameter map. Applies the correct encoding
	* and formatting to the URI. Parameters are:
	*
	* - `action` One of `history`, `browse`, `change`, `lastmodified`,
	- * `branch` or `revision-ref`. The action specified by the URI.
	+ * `branch`, `tags`, `branches`, or `revision-ref`. The action specified
	+ * by the URI.
	* - `callsign` Repository callsign.
	* - `branch` Optional if action is not `branch`, branch name.
	* - `path` Optional, path to file.
	* - `commit` Optional, commit identifier.
	* - `line` Optional, line range.
	* - `lint` Optional, lint code.
	* - `params` Optional, query parameters.
	*
	* The function generates the specified URI and returns it.
	*
	* @param map See documentation.
	* @return PhutilURI Generated URI.
	* @task uri
	*/
	public static function generateDiffusionURI(array $params) {
	$action = idx($params, 'action');

	$callsign = idx($params, 'callsign');
	$path = idx($params, 'path');
	$branch = idx($params, 'branch');
	$commit = idx($params, 'commit');
	$line = idx($params, 'line');

	if (strlen($callsign)) {
	$callsign = phutil_escape_uri_path_component($callsign).'/';
	}

	if (strlen($branch)) {
	$branch = phutil_escape_uri_path_component($branch).'/';
	}

	if (strlen($path)) {
	$path = ltrim($path, '/');
	$path = str_replace(array(';', '$'), array(';;', '$$'), $path);
	$path = phutil_escape_uri($path);
	}

	$path = "{$branch}{$path}";

	if (strlen($commit)) {
	$commit = str_replace('$', '$$', $commit);
	$commit = ';'.phutil_escape_uri($commit);
	}

	if (strlen($line)) {
	$line = '$'.phutil_escape_uri($line);
	}

	$req_callsign = false;
	$req_branch = false;
	$req_commit = false;

	switch ($action) {
	case 'history':
	case 'browse':
	case 'change':
	case 'lastmodified':
	case 'tags':
	case 'branches':
	case 'lint':
	$req_callsign = true;
	break;
	case 'branch':
	$req_callsign = true;
	$req_branch = true;
	break;
	case 'commit':
	$req_callsign = true;
	$req_commit = true;
	break;
	}

	if ($req_callsign && !strlen($callsign)) {
	throw new Exception(
	"Diffusion URI action '{$action}' requires callsign!");
	}

	if ($req_branch && !strlen($branch)) {
	throw new Exception(
	"Diffusion URI action '{$action}' requires branch!");
	}

	if ($req_commit && !strlen($commit)) {
	throw new Exception(
	"Diffusion URI action '{$action}' requires commit!");
	}

	switch ($action) {
	case 'change':
	case 'history':
	case 'browse':
	case 'lastmodified':
	case 'tags':
	case 'branches':
	case 'lint':
	$uri = "/diffusion/{$callsign}{$action}/{$path}{$commit}{$line}";
	break;
	case 'branch':
	$uri = "/diffusion/{$callsign}repository/{$path}";
	break;
	case 'external':
	$commit = ltrim($commit, ';');
	$uri = "/diffusion/external/{$commit}/";
	break;
	case 'rendering-ref':
	// This isn't a real URI per se, it's passed as a query parameter to
	// the ajax changeset stuff but then we parse it back out as though
	// it came from a URI.
	$uri = rawurldecode("{$path}{$commit}");
	break;
	case 'commit':
	$commit = ltrim($commit, ';');
	$callsign = rtrim($callsign, '/');
	$uri = "/r{$callsign}{$commit}";
	break;
	default:
	throw new Exception("Unknown Diffusion URI action '{$action}'!");
	}

	if ($action == 'rendering-ref') {
	return $uri;
	}

	$uri = new PhutilURI($uri);

	if (isset($params['lint'])) {
	$params['params'] = idx($params, 'params', array()) + array(
	'lint' => $params['lint'],
	);
	}

	if (idx($params, 'params')) {
	$uri->setQueryParams($params['params']);
	}

	return $uri;
	}


	/**
	* Internal. Public only for unit tests.
	*
	* Parse the request URI into components.
	*
	* @param string URI blob.
	* @param bool True if this VCS supports branches.
	* @return map Parsed URI.
	*
	* @task uri
	*/
	public static function parseRequestBlob($blob, $supports_branches) {
	$result = array(
	'branch' => null,
	'path' => null,
	'commit' => null,
	'line' => null,
	);

	$matches = null;

	if ($supports_branches) {
	// Consume the front part of the URI, up to the first "/". This is the
	// path-component encoded branch name.
	if (preg_match('@^([^/]+)/@', $blob, $matches)) {
	$result['branch'] = phutil_unescape_uri_path_component($matches[1]);
	$blob = substr($blob, strlen($matches[1]) + 1);
	}
	}

	// Consume the back part of the URI, up to the first "$". Use a negative
	// lookbehind to prevent matching '$$'. We double the '$' symbol when
	// encoding so that files with names like "money/$100" will survive.
	$pattern = '@(?:(?:^\|[^$])(?:[$][$])*)[$]([\d-,]+)$@';
	if (preg_match($pattern, $blob, $matches)) {
	$result['line'] = $matches[1];
	$blob = substr($blob, 0, -(strlen($matches[1]) + 1));
	}

	// We've consumed the line number if it exists, so unescape "$" in the
	// rest of the string.
	$blob = str_replace('$$', '$', $blob);

	// Consume the commit name, stopping on ';;'. We allow any character to
	// appear in commits names, as they can sometimes be symbolic names (like
	// tag names or refs).
	if (preg_match('@(?:(?:^\|[^;])(?:;;));([^;].)$@', $blob, $matches)) {
	$result['commit'] = $matches[1];
	$blob = substr($blob, 0, -(strlen($matches[1]) + 1));
	}

	// We've consumed the commit if it exists, so unescape ";" in the rest
	// of the string.
	$blob = str_replace(';;', ';', $blob);

	if (strlen($blob)) {
	$result['path'] = $blob;
	}

	$parts = explode('/', $result['path']);
	foreach ($parts as $part) {
	// Prevent any hyjinx since we're ultimately shipping this to the
	// filesystem under a lot of workflows.
	if ($part == '..') {
	throw new Exception("Invalid path URI.");
	}
	}

	return $result;
	}

	/**
	* Check that the working copy of the repository is present and readable.
	*
	* @param string Path to the working copy.
	*/
	protected function validateWorkingCopy($path) {
	if (!is_readable(dirname($path))) {
	$this->raisePermissionException();
	}

	if (!Filesystem::pathExists($path)) {
	$this->raiseCloneException();
	}
	}

	protected function raisePermissionException() {
	$host = php_uname('n');
	$callsign = $this->getRepository()->getCallsign();
	throw new DiffusionSetupException(
	"The clone of this repository ('{$callsign}') on the local machine " .
	"('{$host}') could not be read. Ensure that the repository is in a " .
	"location where the web server has read permissions.");
	}

	protected function raiseCloneException() {
	$host = php_uname('n');
	$callsign = $this->getRepository()->getCallsign();
	throw new DiffusionSetupException(
	"The working copy for this repository ('{$callsign}') hasn't been ".
	"cloned yet on this machine ('{$host}'). Make sure you've started the ".
	"Phabricator daemons. If this problem persists for longer than a clone ".
	"should take, check the daemon logs (in the Daemon Console) to see if ".
	"there were errors cloning the repository. Consult the 'Diffusion User ".
	"Guide' in the documentation for help setting up repositories.");
	}

	final protected function expandCommitName() {
	if ($this->shouldInitFromConduit()) {
	$commit_data = DiffusionQuery::callConduitWithDiffusionRequest(
	$this->getUser(),
	$this,
	'diffusion.expandshortcommitquery',
	array(
	'commit' => $this->commit
	));
	} else {
	$repository = $this->getRepository();
	$this->validateWorkingCopy($repository->getLocalPath());
	$query = DiffusionExpandShortNameQuery::newFromRepository(
	$repository);
	$query->setCommit($this->commit);
	$commit_data = $query->expand();
	}

	$this->commit = $commit_data['commit'];
	$this->commitType = $commit_data['commitType'];
	$this->tagContent = $commit_data['tagContent'];
	}

	private function queryStableCommitName() {
	if ($this->commit) {
	$this->stableCommitName = $this->commit;
	} else if ($this->shouldInitFromConduit()) {
	$this->stableCommitName = DiffusionQuery::callConduitWithDiffusionRequest(
	$this->getUser(),
	$this,
	'diffusion.stablecommitnamequery',
	array(
	'branch' => $this->getBranch()
	));
	} else {
	$query = DiffusionStableCommitNameQuery::newFromRepository(
	$this->getRepository());
	$query->setBranch($this->getBranch());
	$this->stableCommitName = $query->load();
	}
	return $this->stableCommitName;
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Wed, Nov 5, 10:57 PM (17 h, 34 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 318398
Default Alt Text: (52 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions