No OneTemporary
Actions

Size

49 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
	index 7a9bb3a1af..91cfbebabd 100644
	--- a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
	+++ b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
	@@ -1,446 +1,449 @@
	<?php

	final class DifferentialChangesetTwoUpRenderer
	extends DifferentialChangesetHTMLRenderer {

	public function isOneUpRenderer() {
	return false;
	}

	public function renderTextChange(
	$range_start,
	$range_len,
	$rows) {

	$hunk_starts = $this->getHunkStartLines();

	$context_not_available = null;
	if ($hunk_starts) {
	$context_not_available = javelin_tag(
	'tr',
	array(
	'sigil' => 'context-target',
	),
	phutil_tag(
	'td',
	array(
	'colspan' => 6,
	'class' => 'show-more'
	),
	pht('Context not available.')
	)
	);
	}

	$html = array();
	$old_lines = $this->getOldLines();
	$new_lines = $this->getNewLines();
	$gaps = $this->getGaps();
	$reference = $this->getRenderingReference();
	$left_id = $this->getOldChangesetID();
	$right_id = $this->getNewChangesetID();

	// "N" stands for 'new' and means the comment should attach to the new file
	// when stored, i.e. DifferentialInlineComment->setIsNewFile().
	// "O" stands for 'old' and means the comment should attach to the old file.

	$left_char = $this->getOldAttachesToNewFile()
	? 'N'
	: 'O';
	$right_char = $this->getNewAttachesToNewFile()
	? 'N'
	: 'O';

	$changeset = $this->getChangeset();
	$copy_lines = idx($changeset->getMetadata(), 'copy:lines', array());
	$highlight_old = $this->getHighlightOld();
	$highlight_new = $this->getHighlightNew();
	$old_render = $this->getOldRender();
	$new_render = $this->getNewRender();
	$original_left = $this->getOriginalOld();
	$original_right = $this->getOriginalNew();
	$depths = $this->getDepths();
	$mask = $this->getMask();

	for ($ii = $range_start; $ii < $range_start + $range_len; $ii++) {
	if (empty($mask[$ii])) {
	// If we aren't going to show this line, we've just entered a gap.
	// Pop information about the next gap off the $gaps stack and render
	// an appropriate "Show more context" element. This branch eventually
	// increments $ii by the entire size of the gap and then continues
	// the loop.
	$gap = array_pop($gaps);
	$top = $gap[0];
	$len = $gap[1];

	$end = $top + $len - 20;

	$contents = array();

	if ($len > 40) {
	$is_first_block = false;
	if ($ii == 0) {
	$is_first_block = true;
	}

	$contents[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'show-more',
	'meta' => array(
	'ref' => $reference,
	'range' => "{$top}-{$len}/{$top}-20",
	),
	),
	$is_first_block
	? pht("Show First 20 Lines")
	: pht("\xE2\x96\xB2 Show 20 Lines"));
	}

	$contents[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'show-more',
	'meta' => array(
	'type' => 'all',
	'ref' => $reference,
	'range' => "{$top}-{$len}/{$top}-{$len}",
	),
	),
	pht('Show All %d Lines', $len));

	$is_last_block = false;
	if ($ii + $len >= $rows) {
	$is_last_block = true;
	}

	if ($len > 40) {
	$contents[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'show-more',
	'meta' => array(
	'ref' => $reference,
	'range' => "{$top}-{$len}/{$end}-20",
	),
	),
	$is_last_block
	? pht("Show Last 20 Lines")
	: pht("\xE2\x96\xBC Show 20 Lines"));
	}

	$context = null;
	$context_line = null;
	if (!$is_last_block && $depths[$ii + $len]) {
	for ($l = $ii + $len - 1; $l >= $ii; $l--) {
	$line = $new_lines[$l]['text'];
	if ($depths[$l] < $depths[$ii + $len] && trim($line) != '') {
	$context = $new_render[$l];
	$context_line = $new_lines[$l]['line'];
	break;
	}
	}
	}

	$container = javelin_tag(
	'tr',
	array(
	'sigil' => 'context-target',
	),
	array(
	phutil_tag(
	'td',
	array(
	'colspan' => 2,
	'class' => 'show-more',
	),
	array_interleave(
	" \xE2\x80\xA2 ", // Bullet
	$contents)),
	phutil_tag(
	'th',
	array(
	'class' => 'show-context-line',
	),
	$context_line ? (int)$context_line : null),
	phutil_tag(
	'td',
	array(
	'colspan' => 3,
	'class' => 'show-context',
	),
	// TODO: [HTML] Escaping model here isn't ideal.
	phutil_safe_html($context)),
	));

	$html[] = $container;

	$ii += ($len - 1);
	continue;
	}

	$o_num = null;
	$o_classes = 'left';
	$o_text = null;
	if (isset($old_lines[$ii])) {
	$o_num = $old_lines[$ii]['line'];
	$o_text = isset($old_render[$ii]) ? $old_render[$ii] : null;
	if ($old_lines[$ii]['type']) {
	if ($old_lines[$ii]['type'] == '\\') {
	$o_text = $old_lines[$ii]['text'];
	$o_classes .= ' comment';
	} else if ($original_left && !isset($highlight_old[$o_num])) {
	$o_classes .= ' old-rebase';
	} else if (empty($new_lines[$ii])) {
	$o_classes .= ' old old-full';
	} else {
	$o_classes .= ' old';
	}
	}
	}

	$n_copy = '<td class="copy" />';
	$n_cov = null;
	$n_colspan = 2;
	$n_classes = '';
	$n_num = null;
	$n_text = null;

	if (isset($new_lines[$ii])) {
	$n_num = $new_lines[$ii]['line'];
	$n_text = isset($new_render[$ii]) ? $new_render[$ii] : null;
	$coverage = $this->getCodeCoverage();

	if ($coverage !== null) {
	if (empty($coverage[$n_num - 1])) {
	$cov_class = 'N';
	} else {
	$cov_class = $coverage[$n_num - 1];
	}
	$cov_class = 'cov-'.$cov_class;
	$n_cov = '<td class="cov '.$cov_class.'"></td>';
	$n_colspan--;
	}

	if ($new_lines[$ii]['type']) {
	if ($new_lines[$ii]['type'] == '\\') {
	$n_text = $new_lines[$ii]['text'];
	$n_class = 'comment';
	} else if ($original_right && !isset($highlight_new[$n_num])) {
	$n_class = 'new-rebase';
	} else if (empty($old_lines[$ii])) {
	$n_class = 'new new-full';
	} else {
	$n_class = 'new';
	}
	$n_classes = $n_class;

	if ($new_lines[$ii]['type'] == '\\' \|\| !isset($copy_lines[$n_num])) {
	$n_copy = '<td class="copy '.$n_class.'"></td>';
	} else {
	list($orig_file, $orig_line, $orig_type) = $copy_lines[$n_num];
	$title = ($orig_type == '-' ? 'Moved' : 'Copied').' from ';
	if ($orig_file == '') {
	$title .= "line {$orig_line}";
	} else {
	$title .=
	basename($orig_file).
	":{$orig_line} in dir ".
	dirname('/'.$orig_file);
	}
	$class = ($orig_type == '-' ? 'new-move' : 'new-copy');
	$n_copy = javelin_tag(
	'td',
	array(
	'meta' => array(
	'msg' => $title,
	),
	'class' => 'copy '.$class,
	),
	'');
	}
	}
	}
	$n_classes .= ' right'.$n_colspan;

	if (isset($hunk_starts[$o_num])) {
	$html[] = $context_not_available;
	}

	if ($o_num && $left_id) {
	$o_id = ' id="C'.$left_id.$left_char.'L'.$o_num.'"';
	} else {
	$o_id = null;
	}

	if ($n_num && $right_id) {
	$n_id = ' id="C'.$right_id.$right_char.'L'.$n_num.'"';
	} else {
	$n_id = null;
	}

	// NOTE: The Javascript is sensitive to whitespace changes in this
	// block!

	$html[] =
	'<tr>'.
	'<th'.$o_id.'>'.$o_num.'</th>'.
	'<td class="'.$o_classes.'">'.$o_text.'</td>'.
	'<th'.$n_id.'>'.$n_num.'</th>'.
	$n_copy.
	// NOTE: This is a unicode zero-width space, which we use as a hint
	// when intercepting 'copy' events to make sure sensible text ends
	// up on the clipboard. See the 'phabricator-oncopy' behavior.
	'<td class="'.$n_classes.'" colspan="'.$n_colspan.'">'.
	"\xE2\x80\x8B".$n_text.
	'</td>'.
	$n_cov.
	'</tr>';

	if ($context_not_available && ($ii == $rows - 1)) {
	$html[] = $context_not_available;
	}

	$old_comments = $this->getOldComments();
	$new_comments = $this->getNewComments();

	if ($o_num && isset($old_comments[$o_num])) {
	foreach ($old_comments[$o_num] as $comment) {
	$comment_html = $this->renderInlineComment($comment,
	$on_right = false);
	$new = '';
	if ($n_num && isset($new_comments[$n_num])) {
	foreach ($new_comments[$n_num] as $key => $new_comment) {
	if ($comment->isCompatible($new_comment)) {
	$new = $this->renderInlineComment($new_comment,
	$on_right = true);
	unset($new_comments[$n_num][$key]);
	}
	}
	}
	- $html[] =
	+ $html[] = hsprintf(
	'<tr class="inline">'.
	'<th />'.
	- '<td class="left">'.$comment_html.'</td>'.
	+ '<td class="left">%s</td>'.
	'<th />'.
	- '<td colspan="3" class="right3">'.$new.'</td>'.
	- '</tr>';
	+ '<td colspan="3" class="right3">%s</td>'.
	+ '</tr>',
	+ $comment_html,
	+ $new);
	}
	}
	if ($n_num && isset($new_comments[$n_num])) {
	foreach ($new_comments[$n_num] as $comment) {
	$comment_html = $this->renderInlineComment($comment,
	$on_right = true);
	- $html[] =
	+ $html[] = hsprintf(
	'<tr class="inline">'.
	'<th />'.
	'<td class="left" />'.
	'<th />'.
	- '<td colspan="3" class="right3">'.$comment_html.'</td>'.
	- '</tr>';
	+ '<td colspan="3" class="right3">%s</td>'.
	+ '</tr>',
	+ $comment_html);
	}
	}
	}

	return $this->wrapChangeInTable(implode('', $html));
	}

	public function renderFileChange($old_file = null,
	$new_file = null,
	$id = 0,
	$vs = 0) {
	$old = null;
	if ($old_file) {
	$old = phutil_tag(
	'div',
	array(
	'class' => 'differential-image-stage'
	),
	phutil_tag(
	'img',
	array(
	'src' => $old_file->getBestURI(),
	)
	)
	);
	}

	$new = null;
	if ($new_file) {
	$new = phutil_tag(
	'div',
	array(
	'class' => 'differential-image-stage'
	),
	phutil_tag(
	'img',
	array(
	'src' => $new_file->getBestURI(),
	)
	)
	);
	}

	$html_old = array();
	$html_new = array();
	foreach ($this->getOldComments() as $on_line => $comment_group) {
	foreach ($comment_group as $comment) {
	$comment_html = $this->renderInlineComment($comment, $on_right = false);
	$html_old[] =
	'<tr class="inline">'.
	'<th />'.
	'<td class="left">'.$comment_html.'</td>'.
	'<th />'.
	'<td class="right3" colspan="3" />'.
	'</tr>';
	}
	}
	foreach ($this->getNewComments() as $lin_line => $comment_group) {
	foreach ($comment_group as $comment) {
	$comment_html = $this->renderInlineComment($comment, $on_right = true);
	$html_new[] =
	'<tr class="inline">'.
	'<th />'.
	'<td class="left" />'.
	'<th />'.
	'<td class="right3" colspan="3">'.$comment_html.'</td>'.
	'</tr>';
	}
	}

	if (!$old) {
	$th_old = '<th></th>';
	} else {
	$th_old = '<th id="C'.$vs.'OL1">1</th>';
	}

	if (!$new) {
	$th_new = '<th></th>';
	} else {
	$th_new = '<th id="C'.$id.'NL1">1</th>';
	}

	$output =
	'<tr class="differential-image-diff">'.
	$th_old.
	'<td class="left differential-old-image">'.$old.'</td>'.
	$th_new.
	'<td class="right3 differential-new-image" colspan="3">'.
	$new.
	'</td>'.
	'</tr>'.
	implode('', $html_old).
	implode('', $html_new);

	$output = $this->wrapChangeInTable($output);

	return $this->renderChangesetTable($output);
	}

	}
	diff --git a/src/applications/differential/view/DifferentialInlineCommentView.php b/src/applications/differential/view/DifferentialInlineCommentView.php
	index 0340d3287a..0fa497fa59 100644
	--- a/src/applications/differential/view/DifferentialInlineCommentView.php
	+++ b/src/applications/differential/view/DifferentialInlineCommentView.php
	@@ -1,261 +1,264 @@
	<?php

	final class DifferentialInlineCommentView extends AphrontView {

	private $inlineComment;
	private $onRight;
	private $buildScaffolding;
	private $handles;
	private $markupEngine;
	private $editable;
	private $preview;
	private $allowReply;

	public function setInlineComment(PhabricatorInlineCommentInterface $comment) {
	$this->inlineComment = $comment;
	return $this;
	}

	public function setOnRight($on_right) {
	$this->onRight = $on_right;
	return $this;
	}

	public function setBuildScaffolding($scaffold) {
	$this->buildScaffolding = $scaffold;
	return $this;
	}

	public function setHandles(array $handles) {
	assert_instances_of($handles, 'PhabricatorObjectHandle');
	$this->handles = $handles;
	return $this;
	}

	public function setMarkupEngine(PhabricatorMarkupEngine $engine) {
	$this->markupEngine = $engine;
	return $this;
	}

	public function setEditable($editable) {
	$this->editable = $editable;
	return $this;
	}

	public function setPreview($preview) {
	$this->preview = $preview;
	return $this;
	}

	public function setAllowReply($allow_reply) {
	$this->allowReply = $allow_reply;
	return $this;
	}

	public function render() {

	$inline = $this->inlineComment;

	$start = $inline->getLineNumber();
	$length = $inline->getLineLength();
	if ($length) {
	$end = $start + $length;
	$line = 'Lines '.number_format($start).'-'.number_format($end);
	} else {
	$line = 'Line '.number_format($start);
	}

	$metadata = array(
	'id' => $inline->getID(),
	'number' => $inline->getLineNumber(),
	'length' => $inline->getLineLength(),
	'on_right' => $this->onRight,
	'original' => $inline->getContent(),
	);

	$sigil = 'differential-inline-comment';
	if ($this->preview) {
	$sigil = $sigil . ' differential-inline-comment-preview';
	}

	$content = $inline->getContent();
	$handles = $this->handles;

	$links = array();

	$is_synthetic = false;
	if ($inline->getSyntheticAuthor()) {
	$is_synthetic = true;
	}

	$is_draft = false;
	if ($inline->isDraft() && !$is_synthetic) {
	$links[] = pht('Not Submitted Yet');
	$is_draft = true;
	}

	if (!$this->preview) {
	$links[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'differential-inline-prev',
	),
	pht('Previous'));

	$links[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'differential-inline-next',
	),
	pht('Next'));

	if ($this->allowReply) {

	if (!$is_synthetic) {

	// NOTE: No product reason why you can't reply to these, but the reply
	// mechanism currently sends the inline comment ID to the server, not
	// file/line information, and synthetic comments don't have an inline
	// comment ID.

	$links[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'differential-inline-reply',
	),
	pht('Reply'));
	}

	}
	}

	$anchor_name = 'inline-'.$inline->getID();

	if ($this->editable && !$this->preview) {
	$links[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'differential-inline-edit',
	),
	pht('Edit'));
	$links[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'differential-inline-delete',
	),
	pht('Delete'));
	} else if ($this->preview) {
	$links[] = javelin_tag(
	'a',
	array(
	'meta' => array(
	'anchor' => $anchor_name,
	),
	'sigil' => 'differential-inline-preview-jump',
	),
	pht('Not Visible'));
	$links[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'differential-inline-delete',
	),
	pht('Delete'));
	}

	if ($links) {
	- $links =
	- '<span class="differential-inline-comment-links">'.
	- implode(' · ', $links).
	- '</span>';
	+ $links = phutil_tag(
	+ 'span',
	+ array('class' => 'differential-inline-comment-links'),
	+ array_interleave(" \xC2\xB7 ", $links));
	} else {
	$links = null;
	}

	$content = $this->markupEngine->getOutput(
	$inline,
	PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);

	if ($this->preview) {
	$anchor = null;
	} else {
	$anchor = phutil_tag(
	'a',
	array(
	'name' => $anchor_name,
	'id' => $anchor_name,
	'class' => 'differential-inline-comment-anchor',
	),
	'');
	}

	$classes = array(
	'differential-inline-comment',
	);
	if ($is_draft) {
	$classes[] = 'differential-inline-comment-unsaved-draft';
	}
	if ($is_synthetic) {
	$classes[] = 'differential-inline-comment-synthetic';
	}
	$classes = implode(' ', $classes);

	if ($is_synthetic) {
	$author = $inline->getSyntheticAuthor();
	} else {
	$author = $handles[$inline->getAuthorPHID()]->getName();
	}

	- $markup = javelin_render_tag(
	+ $markup = javelin_tag(
	'div',
	array(
	'class' => $classes,
	'sigil' => $sigil,
	'meta' => $metadata,
	),
	- '<div class="differential-inline-comment-head">'.
	- $anchor.
	- $links.
	- ' <span class="differential-inline-comment-line">'.$line.'</span> '.
	- phutil_escape_html($author).
	- '</div>'.
	- '<div class="differential-inline-comment-content">'.
	- '<div class="phabricator-remarkup">'.
	- $content.
	+ hsprintf(
	+ '<div class="differential-inline-comment-head">'.
	+ '%s%s <span class="differential-inline-comment-line">%s</span> %s'.
	'</div>'.
	- '</div>');
	+ '<div class="differential-inline-comment-content">'.
	+ '<div class="phabricator-remarkup">%s</div>'.
	+ '</div>',
	+ $anchor,
	+ $links,
	+ $line,
	+ $author,
	+ $content));

	return $this->scaffoldMarkup($markup);
	}

	private function scaffoldMarkup($markup) {
	if (!$this->buildScaffolding) {
	return $markup;
	}

	$left_markup = !$this->onRight ? $markup : '';
	$right_markup = $this->onRight ? $markup : '';

	- return
	+ return hsprintf(
	'<table>'.
	'<tr class="inline">'.
	'<th></th>'.
	- '<td class="left">'.$left_markup.'</td>'.
	+ '<td class="left">%s</td>'.
	'<th></th>'.
	- '<td class="right3" colspan="3">'.$right_markup.'</td>'.
	+ '<td class="right3" colspan="3">%s</td>'.
	'</tr>'.
	- '</table>';
	+ '</table>',
	+ $left_markup,
	+ $right_markup);
	}

	}
	diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	index b690c484ea..f89e6ef7c6 100644
	--- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	+++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	@@ -1,960 +1,955 @@
	<?php

	final class DiffusionBrowseFileController extends DiffusionController {

	private $corpusType = 'text';

	private $lintCommit;
	private $lintMessages;

	public function processRequest() {

	$request = $this->getRequest();
	$drequest = $this->getDiffusionRequest();

	$before = $request->getStr('before');
	if ($before) {
	return $this->buildBeforeResponse($before);
	}

	$path = $drequest->getPath();

	$selected = $request->getStr('view');
	$preferences = $request->getUser()->loadPreferences();
	if (!$selected) {
	$selected = $preferences->getPreference(
	PhabricatorUserPreferences::PREFERENCE_DIFFUSION_VIEW,
	'highlighted');
	} else if ($request->isFormPost() && $selected != 'raw') {
	$preferences->setPreference(
	PhabricatorUserPreferences::PREFERENCE_DIFFUSION_VIEW,
	$selected);
	$preferences->save();

	return id(new AphrontRedirectResponse())
	->setURI($request->getRequestURI()->alter('view', $selected));
	}

	$needs_blame = ($selected == 'blame' \|\| $selected == 'plainblame');

	$file_query = DiffusionFileContentQuery::newFromDiffusionRequest(
	$this->diffusionRequest);
	$file_query->setViewer($request->getUser());
	$file_query->setNeedsBlame($needs_blame);
	$file_query->loadFileContent();
	$data = $file_query->getRawData();

	if ($selected === 'raw') {
	return $this->buildRawResponse($path, $data);
	}

	$this->loadLintMessages();

	// Build the content of the file.
	$corpus = $this->buildCorpus(
	$selected,
	$file_query,
	$needs_blame,
	$drequest,
	$path,
	$data);

	require_celerity_resource('diffusion-source-css');

	if ($this->corpusType == 'text') {
	$view_select_panel = $this->renderViewSelectPanel($selected);
	} else {
	$view_select_panel = null;
	}

	// Render the page.
	$content = array();

	$follow = $request->getStr('follow');
	if ($follow) {
	$notice = new AphrontErrorView();
	$notice->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$notice->setTitle('Unable to Continue');
	switch ($follow) {
	case 'first':
	$notice->appendChild(
	"Unable to continue tracing the history of this file because ".
	"this commit is the first commit in the repository.");
	break;
	case 'created':
	$notice->appendChild(
	"Unable to continue tracing the history of this file because ".
	"this commit created the file.");
	break;
	}
	$content[] = $notice;
	}

	$renamed = $request->getStr('renamed');
	if ($renamed) {
	$notice = new AphrontErrorView();
	$notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$notice->setTitle('File Renamed');
	$notice->appendChild(
	"File history passes through a rename from '".
	phutil_escape_html($drequest->getPath())."' to '".
	phutil_escape_html($renamed)."'.");
	$content[] = $notice;
	}

	$content[] = $view_select_panel;
	$content[] = $corpus;
	$content[] = $this->buildOpenRevisions();

	$nav = $this->buildSideNav('browse', true);
	$nav->appendChild($content);
	$crumbs = $this->buildCrumbs(
	array(
	'branch' => true,
	'path' => true,
	'view' => 'browse',
	));
	$nav->setCrumbs($crumbs);

	$basename = basename($this->getDiffusionRequest()->getPath());

	return $this->buildApplicationPage(
	$nav,
	array(
	'title' => $basename,
	));
	}

	private function loadLintMessages() {
	$drequest = $this->getDiffusionRequest();
	$branch = $drequest->loadBranch();

	if (!$branch \|\| !$branch->getLintCommit()) {
	return;
	}

	$this->lintCommit = $branch->getLintCommit();

	$conn = id(new PhabricatorRepository())->establishConnection('r');

	$where = '';
	if ($drequest->getLint()) {
	$where = qsprintf(
	$conn,
	'AND code = %s',
	$drequest->getLint());
	}

	$this->lintMessages = queryfx_all(
	$conn,
	'SELECT * FROM %T WHERE branchID = %d %Q AND path = %s',
	PhabricatorRepository::TABLE_LINTMESSAGE,
	$branch->getID(),
	$where,
	'/'.$drequest->getPath());
	}

	private function buildCorpus($selected,
	DiffusionFileContentQuery $file_query,
	$needs_blame,
	DiffusionRequest $drequest,
	$path,
	$data) {

	if (ArcanistDiffUtils::isHeuristicBinaryFile($data)) {
	$file = $this->loadFileForData($path, $data);
	$file_uri = $file->getBestURI();

	if ($file->isViewableImage()) {
	$this->corpusType = 'image';
	return $this->buildImageCorpus($file_uri);
	} else {
	$this->corpusType = 'binary';
	return $this->buildBinaryCorpus($file_uri, $data);
	}
	}

	switch ($selected) {
	case 'plain':
	$style =
	"margin: 1em 2em; width: 90%; height: 80em; font-family: monospace";
	$corpus = phutil_tag(
	'textarea',
	array(
	'style' => $style,
	),
	$file_query->getRawData());

	break;

	case 'plainblame':
	$style =
	"margin: 1em 2em; width: 90%; height: 80em; font-family: monospace";
	list($text_list, $rev_list, $blame_dict) =
	$file_query->getBlameData();

	$rows = array();
	foreach ($text_list as $k => $line) {
	$rev = $rev_list[$k];
	if (isset($blame_dict[$rev]['handle'])) {
	$author = $blame_dict[$rev]['handle']->getName();
	} else {
	$author = $blame_dict[$rev]['author'];
	}
	$rows[] =
	sprintf("%-10s %-20s %s", substr($rev, 0, 7), $author, $line);
	}

	$corpus = phutil_tag(
	'textarea',
	array(
	'style' => $style,
	),
	implode("\n", $rows));

	break;

	case 'highlighted':
	case 'blame':
	default:
	require_celerity_resource('syntax-highlighting-css');

	list($text_list, $rev_list, $blame_dict) = $file_query->getBlameData();

	$text_list = implode("\n", $text_list);
	$text_list = PhabricatorSyntaxHighlighter::highlightWithFilename(
	$path,
	$text_list);
	$text_list = explode("\n", $text_list);

	$rows = $this->buildDisplayRows($text_list, $rev_list, $blame_dict,
	$needs_blame, $drequest, $file_query, $selected);

	$id = celerity_generate_unique_node_id();

	$projects = $drequest->loadArcanistProjects();
	$langs = array();
	foreach ($projects as $project) {
	$ls = $project->getSymbolIndexLanguages();
	if (!$ls) {
	continue;
	}
	$dep_projects = $project->getSymbolIndexProjects();
	$dep_projects[] = $project->getPHID();
	foreach ($ls as $lang) {
	if (!isset($langs[$lang])) {
	$langs[$lang] = array();
	}
	$langs[$lang] += $dep_projects + array($project);
	}
	}

	$lang = last(explode('.', $drequest->getPath()));

	$prefs = $this->getRequest()->getUser()->loadPreferences();
	$pref_symbols = $prefs->getPreference(
	PhabricatorUserPreferences::PREFERENCE_DIFFUSION_SYMBOLS);
	if (isset($langs[$lang]) && $pref_symbols != 'disabled') {
	Javelin::initBehavior(
	'repository-crossreference',
	array(
	'container' => $id,
	'lang' => $lang,
	'projects' => $langs[$lang],
	));
	}

	- $corpus_table = javelin_render_tag(
	+ $corpus_table = javelin_tag(
	'table',
	array(
	'class' => "diffusion-source remarkup-code PhabricatorMonospaced",
	'sigil' => 'diffusion-source',
	),
	- implode("\n", $rows));
	-
	- // TODO: [HTML] Major cheating here.
	- $corpus_table = phutil_safe_html($corpus_table);
	+ $rows);

	$corpus = phutil_tag(
	'div',
	array(
	'style' => 'padding: 0 2em;',
	'id' => $id,
	),
	$corpus_table);

	break;
	}

	return $corpus;
	}

	private function renderViewSelectPanel($selected) {
	$toggle_blame = array(
	'highlighted' => 'blame',
	'blame' => 'highlighted',
	'plain' => 'plainblame',
	'plainblame' => 'plain',
	'raw' => 'raw', // not a real case.
	);
	$toggle_highlight = array(
	'highlighted' => 'plain',
	'blame' => 'plainblame',
	'plain' => 'highlighted',
	'plainblame' => 'blame',
	'raw' => 'raw', // not a real case.
	);

	$user = $this->getRequest()->getUser();
	$base_uri = $this->getRequest()->getRequestURI();

	$blame_on = ($selected == 'blame' \|\| $selected == 'plainblame');
	if ($blame_on) {
	$blame_text = pht('Disable Blame');
	} else {
	$blame_text = pht('Enable Blame');
	}

	$blame_button = $this->createViewAction(
	$blame_text,
	$base_uri->alter('view', $toggle_blame[$selected]),
	$user);


	$highlight_on = ($selected == 'blame' \|\| $selected == 'highlighted');
	if ($highlight_on) {
	$highlight_text = pht('Disable Highlighting');
	} else {
	$highlight_text = pht('Enable Highlighting');
	}
	$highlight_button = $this->createViewAction(
	$highlight_text,
	$base_uri->alter('view', $toggle_highlight[$selected]),
	$user);


	$href = null;
	if ($this->getRequest()->getStr('lint') !== null) {
	$lint_text = pht('Hide %d Lint Message(s)', count($this->lintMessages));
	$href = $base_uri->alter('lint', null);

	} else if ($this->lintCommit === null) {
	$lint_text = pht('Lint not Available');

	} else {
	$lint_text = pht(
	'Show %d Lint Message(s)',
	count($this->lintMessages));
	$href = $this->getDiffusionRequest()->generateURI(array(
	'action' => 'browse',
	'commit' => $this->lintCommit,
	))->alter('lint', '');
	}

	$lint_button = $this->createViewAction(
	$lint_text,
	$href,
	$user);

	if (!$href) {
	$lint_button->setDisabled(true);
	}


	$raw_button = $this->createViewAction(
	pht('View Raw File'),
	$base_uri->alter('view', 'raw'),
	$user,
	'file');

	$edit_button = $this->createEditAction();

	return id(new PhabricatorActionListView())
	->setUser($user)
	->addAction($blame_button)
	->addAction($highlight_button)
	->addAction($lint_button)
	->addAction($raw_button)
	->addAction($edit_button);
	}

	private function createViewAction(
	$localized_text,
	$href,
	$user,
	$icon = null) {

	return id(new PhabricatorActionView())
	->setName($localized_text)
	->setIcon($icon)
	->setUser($user)
	->setRenderAsForm(true)
	->setHref($href);
	}

	private function createEditAction() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$drequest = $this->getDiffusionRequest();

	$repository = $drequest->getRepository();
	$path = $drequest->getPath();
	$line = nonempty((int)$drequest->getLine(), 1);

	$callsign = $repository->getCallsign();
	$editor_link = $user->loadEditorLink($path, $line, $callsign);

	$action = id(new PhabricatorActionView())
	->setName(pht('Open in Editor'))
	->setIcon('edit');

	$action->setHref($editor_link);
	$action->setDisabled(!$editor_link);

	return $action;
	}

	private function buildDisplayRows(
	array $text_list,
	array $rev_list,
	array $blame_dict,
	$needs_blame,
	DiffusionRequest $drequest,
	DiffusionFileContentQuery $file_query,
	$selected) {

	if ($blame_dict) {
	$epoch_list = ipull(ifilter($blame_dict, 'epoch'), 'epoch');
	$epoch_min = min($epoch_list);
	$epoch_max = max($epoch_list);
	$epoch_range = ($epoch_max - $epoch_min) + 1;
	}

	$line_arr = array();
	$line_str = $drequest->getLine();
	$ranges = explode(',', $line_str);
	foreach ($ranges as $range) {
	if (strpos($range, '-') !== false) {
	list($min, $max) = explode('-', $range, 2);
	$line_arr[] = array(
	'min' => min($min, $max),
	'max' => max($min, $max),
	);
	} else if (strlen($range)) {
	$line_arr[] = array(
	'min' => $range,
	'max' => $range,
	);
	}
	}

	$display = array();

	$line_number = 1;
	$last_rev = null;
	$color = null;
	foreach ($text_list as $k => $line) {
	$display_line = array(
	'color' => null,
	'epoch' => null,
	'commit' => null,
	'author' => null,
	'target' => null,
	'highlighted' => null,
	'line' => $line_number,
	'data' => $line,
	);

	if ($needs_blame) {
	// If the line's rev is same as the line above, show empty content
	// with same color; otherwise generate blame info. The newer a change
	// is, the more saturated the color.

	$rev = idx($rev_list, $k, $last_rev);

	if ($last_rev == $rev) {
	$display_line['color'] = $color;
	} else {
	$blame = $blame_dict[$rev];

	if (!isset($blame['epoch'])) {
	$color = '#ffd'; // Render as warning.
	} else {
	$color_ratio = ($blame['epoch'] - $epoch_min) / $epoch_range;
	$color_value = 0xF6 * (1.0 - $color_ratio);
	$color = sprintf(
	'#%02x%02x%02x',
	$color_value,
	0xF6,
	$color_value);
	}

	$display_line['epoch'] = idx($blame, 'epoch');
	$display_line['color'] = $color;
	$display_line['commit'] = $rev;

	if (isset($blame['handle'])) {
	$author_link = $blame['handle']->renderLink();
	} else {
	$author_link = phutil_tag(
	'span',
	array(
	),
	$blame['author']);
	}
	$display_line['author'] = $author_link;

	$last_rev = $rev;
	}
	}

	if ($line_arr) {
	if ($line_number == $line_arr[0]['min']) {
	$display_line['target'] = true;
	}
	foreach ($line_arr as $range) {
	if ($line_number >= $range['min'] &&
	$line_number <= $range['max']) {
	$display_line['highlighted'] = true;
	}
	}
	}

	$display[] = $display_line;
	++$line_number;
	}

	$commits = array_filter(ipull($display, 'commit'));
	if ($commits) {
	$commits = id(new PhabricatorAuditCommitQuery())
	->withIdentifiers($drequest->getRepository()->getID(), $commits)
	->needCommitData(true)
	->execute();
	$commits = mpull($commits, null, 'getCommitIdentifier');
	}

	$revision_ids = id(new DifferentialRevision())
	->loadIDsByCommitPHIDs(mpull($commits, 'getPHID'));
	$revisions = array();
	if ($revision_ids) {
	$revisions = id(new DifferentialRevision())->loadAllWhere(
	'id IN (%Ld)',
	$revision_ids);
	}

	$request = $this->getRequest();
	$user = $request->getUser();

	Javelin::initBehavior('phabricator-oncopy', array());

	$engine = null;
	$inlines = array();
	if ($this->getRequest()->getStr('lint') !== null && $this->lintMessages) {
	$engine = new PhabricatorMarkupEngine();
	$engine->setViewer($user);

	foreach ($this->lintMessages as $message) {
	$inline = id(new PhabricatorAuditInlineComment())
	->setID($message['id'])
	->setSyntheticAuthor(
	ArcanistLintSeverity::getStringForSeverity($message['severity']).
	' '.$message['code'].' ('.$message['name'].')')
	->setLineNumber($message['line'])
	->setContent($message['description']);
	$inlines[$message['line']][] = $inline;

	$engine->addObject(
	$inline,
	PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);
	}

	$engine->process();
	require_celerity_resource('differential-changeset-view-css');
	}

	$rows = $this->renderInlines(
	idx($inlines, 0, array()),
	$needs_blame,
	$engine);

	foreach ($display as $line) {

	$line_href = $drequest->generateURI(
	array(
	'action' => 'browse',
	'line' => $line['line'],
	'stable' => true,
	));

	$blame = array();
	if ($line['color']) {
	$color = $line['color'];

	$before_link = null;
	$commit_link = null;
	$revision_link = null;
	if (idx($line, 'commit')) {
	$commit = $line['commit'];

	$summary = 'Unknown';
	if (idx($commits, $commit)) {
	$summary = $commits[$commit]->getCommitData()->getSummary();
	}

	$tooltip = phabricator_date(
	$line['epoch'],
	$user)." \xC2\xB7 ".$summary;

	Javelin::initBehavior('phabricator-tooltips', array());
	require_celerity_resource('aphront-tooltip-css');

	$commit_link = javelin_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'action' => 'commit',
	'commit' => $line['commit'],
	)),
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => $tooltip,
	'align' => 'E',
	'size' => 600,
	),
	),
	phutil_utf8_shorten($line['commit'], 9, ''));

	$revision_id = null;
	if (idx($commits, $commit)) {
	$revision_id = idx($revision_ids, $commits[$commit]->getPHID());
	}

	if ($revision_id) {
	$revision = idx($revisions, $revision_id);
	if (!$revision) {
	$tooltip = '(Invalid revision)';
	} else {
	$tooltip =
	phabricator_date($revision->getDateModified(), $user).
	" \xC2\xB7 ".
	$revision->getTitle();
	}
	$revision_link = javelin_tag(
	'a',
	array(
	'href' => '/D'.$revision_id,
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => $tooltip,
	'align' => 'E',
	'size' => 600,
	),
	),
	'D'.$revision_id);
	}

	$uri = $line_href->alter('before', $commit);
	$before_link = javelin_tag(
	'a',
	array(
	'href' => $uri->setQueryParam('view', 'blame'),
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => 'Skip Past This Commit',
	'align' => 'E',
	'size' => 300,
	),
	),
	"\xC2\xAB");
	}

	$blame[] = phutil_tag(
	'th',
	array(
	'class' => 'diffusion-blame-link',
	'style' => 'background: '.$color,
	),
	$before_link);

	$blame[] = phutil_tag(
	'th',
	array(
	'class' => 'diffusion-rev-link',
	'style' => 'background: '.$color,
	),
	$commit_link);

	$blame[] = phutil_tag(
	'th',
	array(
	'class' => 'diffusion-rev-link',
	'style' => 'background: '.$color,
	),
	$revision_link);

	$blame[] = phutil_tag(
	'th',
	array(
	'class' => 'diffusion-author-link',
	'style' => 'background: '.$color,
	),
	idx($line, 'author'));
	}

	$line_link = phutil_tag(
	'a',
	array(
	'href' => $line_href,
	),
	$line['line']);

	$blame[] = javelin_tag(
	'th',
	array(
	'class' => 'diffusion-line-link',
	'sigil' => 'diffusion-line-link',
	'style' => isset($color) ? 'background: '.$color : null,
	),
	$line_link);

	Javelin::initBehavior('diffusion-line-linker');

	if ($line['target']) {
	Javelin::initBehavior(
	'diffusion-jump-to',
	array(
	'target' => 'scroll_target',
	));
	$anchor_text = phutil_tag(
	'a',
	array(
	'id' => 'scroll_target',
	),
	'');
	} else {
	$anchor_text = null;
	}

	$blame[] = phutil_tag(
	'td',
	array(
	),
	array(
	$anchor_text,

	// NOTE: See phabricator-oncopy behavior.
	"\xE2\x80\x8B",

	// TODO: [HTML] Not ideal.
	phutil_safe_html($line['data']),
	));

	$rows[] = phutil_tag(
	'tr',
	array(
	'class' => ($line['highlighted'] ? 'highlighted' : null),
	),
	$blame);

	$rows = array_merge($rows, $this->renderInlines(
	idx($inlines, $line['line'], array()),
	$needs_blame,
	$engine));
	}

	return $rows;
	}

	private function renderInlines(array $inlines, $needs_blame, $engine) {
	$rows = array();
	foreach ($inlines as $inline) {
	$inline_view = id(new DifferentialInlineCommentView())
	->setMarkupEngine($engine)
	->setInlineComment($inline)
	->render();
	- $rows[] =
	- '<tr class="inline">'.
	- str_repeat('<th></th>', ($needs_blame ? 5 : 1)).
	- '<td>'.$inline_view.'</td>'.
	- '</tr>';
	+ $row = array_fill(0, ($needs_blame ? 5 : 1), phutil_tag('th'));
	+ $row[] = phutil_tag('td', array(), $inline_view);
	+ $rows[] = phutil_tag('tr', array('class' => 'inline'), $row);
	}
	return $rows;
	}

	private function loadFileForData($path, $data) {
	return PhabricatorFile::buildFromFileDataOrHash(
	$data,
	array(
	'name' => basename($path),
	));
	}

	private function buildRawResponse($path, $data) {
	$file = $this->loadFileForData($path, $data);
	return id(new AphrontRedirectResponse())->setURI($file->getBestURI());
	}

	private function buildImageCorpus($file_uri) {
	$properties = new PhabricatorPropertyListView();

	$properties->addProperty(
	pht('Image'),
	phutil_tag(
	'img',
	array(
	'src' => $file_uri,
	)));

	$actions = id(new PhabricatorActionListView())
	->setUser($this->getRequest()->getUser())
	->addAction($this->createEditAction());

	return array($actions, $properties);
	}

	private function buildBinaryCorpus($file_uri, $data) {
	$properties = new PhabricatorPropertyListView();

	$size = strlen($data);
	$properties->addTextContent(
	pht('This is a binary file. It is %2$s byte(s) in length.',
	$size,
	PhutilTranslator::getInstance()->formatNumber($size)));

	$actions = id(new PhabricatorActionListView())
	->setUser($this->getRequest()->getUser())
	->addAction($this->createEditAction())
	->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Download Binary File...'))
	->setIcon('download')
	->setHref($file_uri));

	return array($actions, $properties);

	}

	private function buildBeforeResponse($before) {
	$request = $this->getRequest();
	$drequest = $this->getDiffusionRequest();

	// NOTE: We need to get the grandparent so we can capture filename changes
	// in the parent.

	$parent = $this->loadParentRevisionOf($before);
	$old_filename = null;
	$was_created = false;
	if ($parent) {
	$grandparent = $this->loadParentRevisionOf(
	$parent->getCommitIdentifier());

	if ($grandparent) {
	$rename_query = new DiffusionRenameHistoryQuery();
	$rename_query->setRequest($drequest);
	$rename_query->setOldCommit($grandparent->getCommitIdentifier());
	$old_filename = $rename_query->loadOldFilename();
	$was_created = $rename_query->getWasCreated();
	}
	}

	$follow = null;
	if ($was_created) {
	// If the file was created in history, that means older commits won't
	// have it. Since we know it existed at 'before', it must have been
	// created then; jump there.
	$target_commit = $before;
	$follow = 'created';
	} else if ($parent) {
	// If we found a parent, jump to it. This is the normal case.
	$target_commit = $parent->getCommitIdentifier();
	} else {
	// If there's no parent, this was probably created in the initial commit?
	// And the "was_created" check will fail because we can't identify the
	// grandparent. Keep the user at 'before'.
	$target_commit = $before;
	$follow = 'first';
	}

	$path = $drequest->getPath();
	$renamed = null;
	if ($old_filename !== null &&
	$old_filename !== '/'.$path) {
	$renamed = $path;
	$path = $old_filename;
	}

	$line = null;
	// If there's a follow error, drop the line so the user sees the message.
	if (!$follow) {
	$line = $this->getBeforeLineNumber($target_commit);
	}

	$before_uri = $drequest->generateURI(
	array(
	'action' => 'browse',
	'commit' => $target_commit,
	'line' => $line,
	'path' => $path,
	));

	$before_uri->setQueryParams($request->getRequestURI()->getQueryParams());
	$before_uri = $before_uri->alter('before', null);
	$before_uri = $before_uri->alter('renamed', $renamed);
	$before_uri = $before_uri->alter('follow', $follow);

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

	private function getBeforeLineNumber($target_commit) {
	$drequest = $this->getDiffusionRequest();

	$line = $drequest->getLine();
	if (!$line) {
	return null;
	}

	$diff_query = DiffusionRawDiffQuery::newFromDiffusionRequest($drequest);
	$diff_query->setAgainstCommit($target_commit);
	try {
	$raw_diff = $diff_query->loadRawDiff();
	$old_line = 0;
	$new_line = 0;

	foreach (explode("\n", $raw_diff) as $text) {
	if ($text[0] == '-' \|\| $text[0] == ' ') {
	$old_line++;
	}
	if ($text[0] == '+' \|\| $text[0] == ' ') {
	$new_line++;
	}
	if ($new_line == $line) {
	return $old_line;
	}
	}

	// We didn't find the target line.
	return $line;

	} catch (Exception $ex) {
	return $line;
	}
	}

	private function loadParentRevisionOf($commit) {
	$drequest = $this->getDiffusionRequest();

	$before_req = DiffusionRequest::newFromDictionary(
	array(
	'repository' => $drequest->getRepository(),
	'commit' => $commit,
	));

	$query = DiffusionCommitParentsQuery::newFromDiffusionRequest($before_req);
	$parents = $query->loadParents();

	return head($parents);
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Oct 16, 3:49 AM (1 d, 5 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 272401
Default Alt Text: (49 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions