No OneTemporary
Actions

Size

33 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
	index ef95235350..73205aed4b 100644
	--- a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
	+++ b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
	@@ -1,362 +1,388 @@
	<?php

	abstract class DifferentialChangesetHTMLRenderer
	extends DifferentialChangesetRenderer {

	protected function renderChangeTypeHeader($force) {
	$changeset = $this->getChangeset();

	$change = $changeset->getChangeType();
	$file = $changeset->getFileType();

	$message = null;
	if ($change == DifferentialChangeType::TYPE_CHANGE &&
	$file == DifferentialChangeType::FILE_TEXT) {
	if ($force) {
	// We have to force something to render because there were no changes
	// of other kinds.
	$message = pht('This file was not modified.');
	} else {
	// Default case of changes to a text file, no metadata.
	return null;
	}
	} else {
	switch ($change) {

	case DifferentialChangeType::TYPE_ADD:
	switch ($file) {
	case DifferentialChangeType::FILE_TEXT:
	$message = pht('This file was <strong>added</strong>.');
	break;
	case DifferentialChangeType::FILE_IMAGE:
	$message = pht('This image was <strong>added</strong>.');
	break;
	case DifferentialChangeType::FILE_DIRECTORY:
	$message = pht('This directory was <strong>added</strong>.');
	break;
	case DifferentialChangeType::FILE_BINARY:
	$message = pht('This binary file was <strong>added</strong>.');
	break;
	case DifferentialChangeType::FILE_SYMLINK:
	$message = pht('This symlink was <strong>added</strong>.');
	break;
	case DifferentialChangeType::FILE_SUBMODULE:
	$message = pht('This submodule was <strong>added</strong>.');
	break;
	}
	break;

	case DifferentialChangeType::TYPE_DELETE:
	switch ($file) {
	case DifferentialChangeType::FILE_TEXT:
	$message = pht('This file was <strong>deleted</strong>.');
	break;
	case DifferentialChangeType::FILE_IMAGE:
	$message = pht('This image was <strong>deleted</strong>.');
	break;
	case DifferentialChangeType::FILE_DIRECTORY:
	$message = pht('This directory was <strong>deleted</strong>.');
	break;
	case DifferentialChangeType::FILE_BINARY:
	$message = pht('This binary file was <strong>deleted</strong>.');
	break;
	case DifferentialChangeType::FILE_SYMLINK:
	$message = pht('This symlink was <strong>deleted</strong>.');
	break;
	case DifferentialChangeType::FILE_SUBMODULE:
	$message = pht('This submodule was <strong>deleted</strong>.');
	break;
	}
	break;

	case DifferentialChangeType::TYPE_MOVE_HERE:
	$from =
	"<strong>".
	phutil_escape_html($changeset->getOldFile()).
	"</strong>";
	switch ($file) {
	case DifferentialChangeType::FILE_TEXT:
	$message = pht('This file was moved from %s.', $from);
	break;
	case DifferentialChangeType::FILE_IMAGE:
	$message = pht('This image was moved from %s.', $from);
	break;
	case DifferentialChangeType::FILE_DIRECTORY:
	$message = pht('This directory was moved from %s.', $from);
	break;
	case DifferentialChangeType::FILE_BINARY:
	$message = pht('This binary file was moved from %s.', $from);
	break;
	case DifferentialChangeType::FILE_SYMLINK:
	$message = pht('This symlink was moved from %s.', $from);
	break;
	case DifferentialChangeType::FILE_SUBMODULE:
	$message = pht('This submodule was moved from %s.', $from);
	break;
	}
	break;

	case DifferentialChangeType::TYPE_COPY_HERE:
	$from =
	"<strong>".
	phutil_escape_html($changeset->getOldFile()).
	"</strong>";
	switch ($file) {
	case DifferentialChangeType::FILE_TEXT:
	$message = pht('This file was copied from %s.', $from);
	break;
	case DifferentialChangeType::FILE_IMAGE:
	$message = pht('This image was copied from %s.', $from);
	break;
	case DifferentialChangeType::FILE_DIRECTORY:
	$message = pht('This directory was copied from %s.', $from);
	break;
	case DifferentialChangeType::FILE_BINARY:
	$message = pht('This binary file was copied from %s.', $from);
	break;
	case DifferentialChangeType::FILE_SYMLINK:
	$message = pht('This symlink was copied from %s.', $from);
	break;
	case DifferentialChangeType::FILE_SUBMODULE:
	$message = pht('This submodule was copied from %s.', $from);
	break;
	}
	break;

	case DifferentialChangeType::TYPE_MOVE_AWAY:
	$paths =
	"<strong>".
	phutil_escape_html(implode(', ', $changeset->getAwayPaths())).
	"</strong>";
	switch ($file) {
	case DifferentialChangeType::FILE_TEXT:
	$message = pht('This file was moved to %s.', $paths);
	break;
	case DifferentialChangeType::FILE_IMAGE:
	$message = pht('This image was moved to %s.', $paths);
	break;
	case DifferentialChangeType::FILE_DIRECTORY:
	$message = pht('This directory was moved to %s.', $paths);
	break;
	case DifferentialChangeType::FILE_BINARY:
	$message = pht('This binary file was moved to %s.', $paths);
	break;
	case DifferentialChangeType::FILE_SYMLINK:
	$message = pht('This symlink was moved to %s.', $paths);
	break;
	case DifferentialChangeType::FILE_SUBMODULE:
	$message = pht('This submodule was moved to %s.', $paths);
	break;
	}
	break;

	case DifferentialChangeType::TYPE_COPY_AWAY:
	$paths =
	"<strong>".
	phutil_escape_html(implode(', ', $changeset->getAwayPaths())).
	"</strong>";
	switch ($file) {
	case DifferentialChangeType::FILE_TEXT:
	$message = pht('This file was copied to %s.', $paths);
	break;
	case DifferentialChangeType::FILE_IMAGE:
	$message = pht('This image was copied to %s.', $paths);
	break;
	case DifferentialChangeType::FILE_DIRECTORY:
	$message = pht('This directory was copied to %s.', $paths);
	break;
	case DifferentialChangeType::FILE_BINARY:
	$message = pht('This binary file was copied to %s.', $paths);
	break;
	case DifferentialChangeType::FILE_SYMLINK:
	$message = pht('This symlink was copied to %s.', $paths);
	break;
	case DifferentialChangeType::FILE_SUBMODULE:
	$message = pht('This submodule was copied to %s.', $paths);
	break;
	}
	break;

	case DifferentialChangeType::TYPE_MULTICOPY:
	$paths =
	"<strong>".
	phutil_escape_html(implode(', ', $changeset->getAwayPaths())).
	"</strong>";
	switch ($file) {
	case DifferentialChangeType::FILE_TEXT:
	$message = pht(
	'This file was deleted after being copied to %s.',
	$paths);
	break;
	case DifferentialChangeType::FILE_IMAGE:
	$message = pht(
	'This image was deleted after being copied to %s.',
	$paths);
	break;
	case DifferentialChangeType::FILE_DIRECTORY:
	$message = pht(
	'This directory was deleted after being copied to %s.',
	$paths);
	break;
	case DifferentialChangeType::FILE_BINARY:
	$message = pht(
	'This binary file was deleted after being copied to %s.',
	$paths);
	break;
	case DifferentialChangeType::FILE_SYMLINK:
	$message = pht(
	'This symlink was deleted after being copied to %s.',
	$paths);
	break;
	case DifferentialChangeType::FILE_SUBMODULE:
	$message = pht(
	'This submodule was deleted after being copied to %s.',
	$paths);
	break;
	}
	break;

	default:
	switch ($file) {
	case DifferentialChangeType::FILE_TEXT:
	$message = pht('This is a file.');
	break;
	case DifferentialChangeType::FILE_IMAGE:
	$message = pht('This is an image.');
	break;
	case DifferentialChangeType::FILE_DIRECTORY:
	$message = pht('This is a directory.');
	break;
	case DifferentialChangeType::FILE_BINARY:
	$message = pht('This is a binary file.');
	break;
	case DifferentialChangeType::FILE_SYMLINK:
	$message = pht('This is a symlink.');
	break;
	case DifferentialChangeType::FILE_SUBMODULE:
	$message = pht('This is a submodule.');
	break;
	}
	break;
	}
	}

	return
	'<div class="differential-meta-notice">'.
	$message.
	'</div>';
	}

	protected function renderPropertyChangeHeader() {
	$changeset = $this->getChangeset();

	$old = $changeset->getOldProperties();
	$new = $changeset->getNewProperties();

	$keys = array_keys($old + $new);
	sort($keys);

	$rows = array();
	foreach ($keys as $key) {
	$oval = idx($old, $key);
	$nval = idx($new, $key);
	if ($oval !== $nval) {
	if ($oval === null) {
	$oval = '<em>null</em>';
	} else {
	$oval = nl2br(phutil_escape_html($oval));
	}

	if ($nval === null) {
	$nval = '<em>null</em>';
	} else {
	$nval = nl2br(phutil_escape_html($nval));
	}

	$rows[] =
	'<tr>'.
	'<th>'.phutil_escape_html($key).'</th>'.
	'<td class="oval">'.$oval.'</td>'.
	'<td class="nval">'.$nval.'</td>'.
	'</tr>';
	}
	}

	return
	'<table class="differential-property-table">'.
	'<tr class="property-table-header">'.
	'<th>Property Changes</th>'.
	'<td class="oval">Old Value</td>'.
	'<td class="nval">New Value</td>'.
	'</tr>'.
	implode('', $rows).
	'</table>';
	}

	- protected function renderShield($message, $force = 'default') {
	+ public function renderShield($message, $force = 'default') {
	$end = count($this->getOldLines());
	$reference = $this->getRenderingReference();

	if ($force !== 'text' &&
	$force !== 'whitespace' &&
	$force !== 'none' &&
	$force !== 'default') {
	throw new Exception("Invalid 'force' parameter '{$force}'!");
	}

	$range = "0-{$end}";
	if ($force == 'text') {
	// If we're forcing text, force the whole file to be rendered.
	$range = "{$range}/0-{$end}";
	}

	$meta = array(
	'ref' => $reference,
	'range' => $range,
	);

	if ($force == 'whitespace') {
	$meta['whitespace'] = DifferentialChangesetParser::WHITESPACE_SHOW_ALL;
	}

	$more = null;
	if ($force !== 'none') {
	$more = ' '.javelin_render_tag(
	'a',
	array(
	'mustcapture' => true,
	'sigil' => 'show-more',
	'class' => 'complete',
	'href' => '#',
	'meta' => $meta,
	),
	'Show File Contents');
	}

	- return javelin_render_tag(
	- 'tr',
	- array(
	- 'sigil' => 'context-target',
	- ),
	- '<td class="differential-shield" colspan="6">'.
	- phutil_escape_html($message).
	- $more.
	- '</td>');
	+ return $this->wrapChangeInTable(
	+ javelin_render_tag(
	+ 'tr',
	+ array(
	+ 'sigil' => 'context-target',
	+ ),
	+ '<td class="differential-shield" colspan="6">'.
	+ phutil_escape_html($message).
	+ $more.
	+ '</td>'));
	}

	protected function wrapChangeInTable($content) {
	if (!$content) {
	return null;
	}

	return javelin_render_tag(
	'table',
	array(
	'class' => 'differential-diff remarkup-code PhabricatorMonospaced',
	'sigil' => 'differential-diff',
	),
	$content);
	}

	+ protected function renderInlineComment(
	+ PhabricatorInlineCommentInterface $comment,
	+ $on_right = false) {
	+
	+ return $this->buildInlineComment($comment, $on_right)->render();
	+ }
	+
	+ protected function buildInlineComment(
	+ PhabricatorInlineCommentInterface $comment,
	+ $on_right = false) {
	+
	+ $user = $this->getUser();
	+ $edit = $user &&
	+ ($comment->getAuthorPHID() == $user->getPHID()) &&
	+ ($comment->isDraft());
	+ $allow_reply = (bool)$user;
	+
	+ return id(new DifferentialInlineCommentView())
	+ ->setInlineComment($comment)
	+ ->setOnRight($on_right)
	+ ->setHandles($this->getHandles())
	+ ->setMarkupEngine($this->getMarkupEngine())
	+ ->setEditable($edit)
	+ ->setAllowReply($allow_reply);
	+ }

	}
	diff --git a/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php b/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
	index 5ab1fa07b2..18f49f6eaa 100644
	--- a/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
	+++ b/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
	@@ -1,74 +1,77 @@
	<?php

	final class DifferentialChangesetOneUpRenderer
	extends DifferentialChangesetHTMLRenderer {

	public function isOneUpRenderer() {
	return true;
	}

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

	$primitives = $this->buildPrimitives($range_start, $range_len);

	$out = array();
	foreach ($primitives as $p) {
	$type = $p['type'];
	switch ($type) {
	case 'old':
	case 'new':
	$out[] = '<tr>';
	if ($type == 'old') {
	if ($p['htype']) {
	$class = 'left old';
	} else {
	$class = 'left';
	}
	$out[] = '<th>'.$p['line'].'</th>';
	$out[] = '<th></th>';
	$out[] = '<td class="'.$class.'">'.$p['render'].'</td>';
	} else if ($type == 'new') {
	if ($p['htype']) {
	$class = 'right new';
	$out[] = '<th />';
	} else {
	$class = 'right';
	$out[] = '<th>'.$p['oline'].'</th>';
	}
	$out[] = '<th>'.$p['line'].'</th>';
	$out[] = '<td class="'.$class.'">'.$p['render'].'</td>';
	}
	$out[] = '</tr>';
	break;
	case 'inline':
	$out[] = '<tr><th /><th />';
	- $out[] = '<td style="background: #ddd; color: #888;">';
	+ $out[] = '<td>';

	- $out[] = 'INLINE COMMENT<br />';
	- $out[] = phutil_escape_html($p['comment']->getContent());
	+ $inline = $this->buildInlineComment(
	+ $p['comment'],
	+ $p['right']);
	+ $inline->setBuildScaffolding(false);
	+ $out[] = $inline->render();

	$out[] = '</td></tr>';
	break;
	default:
	$out[] = '<tr><th /><th /><td>'.$type.'</td></tr>';
	break;
	}
	}

	if ($out) {
	return $this->wrapChangeInTable(implode('', $out));
	}
	return null;
	}

	public function renderFileChange($old_file = null,
	$new_file = null,
	$id = 0,
	$vs = 0) {
	throw new Exception("Not implemented!");
	}

	}
	diff --git a/src/applications/differential/render/DifferentialChangesetRenderer.php b/src/applications/differential/render/DifferentialChangesetRenderer.php
	index b592e988eb..3fbd6a916d 100644
	--- a/src/applications/differential/render/DifferentialChangesetRenderer.php
	+++ b/src/applications/differential/render/DifferentialChangesetRenderer.php
	@@ -1,501 +1,481 @@
	<?php

	abstract class DifferentialChangesetRenderer {

	private $user;
	private $changeset;
	private $renderingReference;
	private $renderPropertyChangeHeader;
	private $hunkStartLines;
	private $oldLines;
	private $newLines;
	private $oldComments;
	private $newComments;
	private $oldChangesetID;
	private $newChangesetID;
	private $oldAttachesToNewFile;
	private $newAttachesToNewFile;
	private $highlightOld = array();
	private $highlightNew = array();
	private $codeCoverage;
	private $handles;
	private $markupEngine;
	private $oldRender;
	private $newRender;
	private $originalOld;
	private $originalNew;
	private $gaps;
	private $mask;
	private $depths;

	public function setDepths($depths) {
	$this->depths = $depths;
	return $this;
	}
	protected function getDepths() {
	return $this->depths;
	}

	public function setMask($mask) {
	$this->mask = $mask;
	return $this;
	}
	protected function getMask() {
	return $this->mask;
	}

	public function setGaps($gaps) {
	$this->gaps = $gaps;
	return $this;
	}
	protected function getGaps() {
	return $this->gaps;
	}

	public function setOriginalNew($original_new) {
	$this->originalNew = $original_new;
	return $this;
	}
	protected function getOriginalNew() {
	return $this->originalNew;
	}

	public function setOriginalOld($original_old) {
	$this->originalOld = $original_old;
	return $this;
	}
	protected function getOriginalOld() {
	return $this->originalOld;
	}

	public function setNewRender($new_render) {
	$this->newRender = $new_render;
	return $this;
	}
	protected function getNewRender() {
	return $this->newRender;
	}

	public function setOldRender($old_render) {
	$this->oldRender = $old_render;
	return $this;
	}
	protected function getOldRender() {
	return $this->oldRender;
	}

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

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

	public function setCodeCoverage($code_coverage) {
	$this->codeCoverage = $code_coverage;
	return $this;
	}
	protected function getCodeCoverage() {
	return $this->codeCoverage;
	}

	public function setHighlightNew($highlight_new) {
	$this->highlightNew = $highlight_new;
	return $this;
	}
	protected function getHighlightNew() {
	return $this->highlightNew;
	}

	public function setHighlightOld($highlight_old) {
	$this->highlightOld = $highlight_old;
	return $this;
	}
	protected function getHighlightOld() {
	return $this->highlightOld;
	}

	public function setNewAttachesToNewFile($attaches) {
	$this->newAttachesToNewFile = $attaches;
	return $this;
	}
	protected function getNewAttachesToNewFile() {
	return $this->newAttachesToNewFile;
	}

	public function setOldAttachesToNewFile($attaches) {
	$this->oldAttachesToNewFile = $attaches;
	return $this;
	}
	protected function getOldAttachesToNewFile() {
	return $this->oldAttachesToNewFile;
	}

	public function setNewChangesetID($new_changeset_id) {
	$this->newChangesetID = $new_changeset_id;
	return $this;
	}
	protected function getNewChangesetID() {
	return $this->newChangesetID;
	}

	public function setOldChangesetID($old_changeset_id) {
	$this->oldChangesetID = $old_changeset_id;
	return $this;
	}
	protected function getOldChangesetID() {
	return $this->oldChangesetID;
	}

	public function setNewComments(array $new_comments) {
	foreach ($new_comments as $line_number => $comments) {
	assert_instances_of($comments, 'PhabricatorInlineCommentInterface');
	}
	$this->newComments = $new_comments;
	return $this;
	}
	protected function getNewComments() {
	return $this->newComments;
	}

	public function setOldComments(array $old_comments) {
	foreach ($old_comments as $line_number => $comments) {
	assert_instances_of($comments, 'PhabricatorInlineCommentInterface');
	}
	$this->oldComments = $old_comments;
	return $this;
	}
	protected function getOldComments() {
	return $this->oldComments;
	}

	public function setNewLines(array $new_lines) {
	$this->newLines = $new_lines;
	return $this;
	}
	protected function getNewLines() {
	return $this->newLines;
	}

	public function setOldLines(array $old_lines) {
	$this->oldLines = $old_lines;
	return $this;
	}
	protected function getOldLines() {
	return $this->oldLines;
	}

	public function setHunkStartLines(array $hunk_start_lines) {
	$this->hunkStartLines = $hunk_start_lines;
	return $this;
	}

	protected function getHunkStartLines() {
	return $this->hunkStartLines;
	}

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

	public function setChangeset(DifferentialChangeset $changeset) {
	$this->changeset = $changeset;
	return $this;
	}
	protected function getChangeset() {
	return $this->changeset;
	}

	public function setRenderingReference($rendering_reference) {
	$this->renderingReference = $rendering_reference;
	return $this;
	}
	protected function getRenderingReference() {
	return $this->renderingReference;
	}

	public function setRenderPropertyChangeHeader($should_render) {
	$this->renderPropertyChangeHeader = $should_render;
	return $this;
	}
	private function shouldRenderPropertyChangeHeader() {
	return $this->renderPropertyChangeHeader;
	}

	final public function renderChangesetTable($content) {
	$props = null;
	if ($this->shouldRenderPropertyChangeHeader()) {
	$props = $this->renderPropertyChangeHeader();
	}

	$force = (!$content && !$props);
	$notice = $this->renderChangeTypeHeader($force);

	$result = $notice.$props.$content;

	// TODO: Let the user customize their tab width / display style.
	// TODO: We should possibly post-process "\r" as well.
	// TODO: Both these steps should happen earlier.
	$result = str_replace("\t", ' ', $result);

	return $result;
	}

	abstract public function isOneUpRenderer();
	abstract public function renderTextChange(
	$range_start,
	$range_len,
	$rows
	);
	abstract public function renderFileChange(
	$old = null,
	$new = null,
	$id = 0,
	$vs = 0
	);

	abstract protected function renderChangeTypeHeader($force);

	protected function didRenderChangesetTableContents($contents) {
	return $contents;
	}

	/**
	* Render a "shield" over the diff, with a message like "This file is
	* generated and does not need to be reviewed." or "This file was completely
	* deleted." This UI element hides unimportant text so the reviewer doesn't
	* need to scroll past it.
	*
	* The shield includes a link to view the underlying content. This link
	* may force certain rendering modes when the link is clicked:
	*
	* - `"default"`: Render the diff normally, as though it was not
	* shielded. This is the default and appropriate if the underlying
	* diff is a normal change, but was hidden for reasons of not being
	* important (e.g., generated code).
	* - `"text"`: Force the text to be shown. This is probably only relevant
	* when a file is not changed.
	* - `"whitespace"`: Force the text to be shown, and the diff to be
	* rendered with all whitespace shown. This is probably only relevant
	* when a file is changed only by altering whitespace.
	* - `"none"`: Don't show the link (e.g., text not available).
	*
	* @param string Message explaining why the diff is hidden.
	* @param string\|null Force mode, see above.
	* @return string Shield markup.
	*/
	- abstract protected function renderShield($message, $force = 'default');
	+ abstract public function renderShield($message, $force = 'default');

	abstract protected function renderPropertyChangeHeader();

	- protected function renderInlineComment(
	- PhabricatorInlineCommentInterface $comment,
	- $on_right = false) {
	-
	- $user = $this->getUser();
	- $edit = $user &&
	- ($comment->getAuthorPHID() == $user->getPHID()) &&
	- ($comment->isDraft());
	- $allow_reply = (bool)$user;
	-
	- return id(new DifferentialInlineCommentView())
	- ->setInlineComment($comment)
	- ->setOnRight($on_right)
	- ->setHandles($this->getHandles())
	- ->setMarkupEngine($this->getMarkupEngine())
	- ->setEditable($edit)
	- ->setAllowReply($allow_reply)
	- ->render();
	- }
	-
	protected function buildPrimitives($range_start, $range_len) {
	$primitives = array();

	$hunk_starts = $this->getHunkStartLines();

	$mask = $this->getMask();
	$gaps = $this->getGaps();

	$old = $this->getOldLines();
	$new = $this->getNewLines();
	$old_render = $this->getOldRender();
	$new_render = $this->getNewRender();
	$old_comments = $this->getOldComments();
	$new_comments = $this->getNewComments();

	$size = count($old);
	for ($ii = $range_start; $ii < $range_start + $range_len; $ii++) {
	if (empty($mask[$ii])) {
	list($top, $len) = array_pop($gaps);
	$primitives[] = array(
	'type' => 'context',
	'top' => $top,
	'len' => $len,
	);

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

	$ospec = array(
	'type' => 'old',
	'htype' => null,
	'cursor' => $ii,
	'line' => null,
	'oline' => null,
	'render' => null,
	);

	$nspec = array(
	'type' => 'new',
	'htype' => null,
	'cursor' => $ii,
	'line' => null,
	'oline' => null,
	'render' => null,
	'copy' => null,
	'coverage' => null,
	);

	if (isset($old[$ii])) {
	$ospec['line'] = (int)$old[$ii]['line'];
	$nspec['oline'] = (int)$old[$ii]['line'];
	$ospec['htype'] = $old[$ii]['type'];
	if (isset($old_render[$ii])) {
	$ospec['render'] = $old_render[$ii];
	}
	}

	if (isset($new[$ii])) {
	$nspec['line'] = (int)$new[$ii]['line'];
	$ospec['oline'] = (int)$new[$ii]['line'];
	$nspec['htype'] = $new[$ii]['type'];
	if (isset($new_render[$ii])) {
	$nspec['render'] = $new_render[$ii];
	}
	}

	if (isset($hunk_starts[$ospec['line']])) {
	$primitives[] = array(
	'type' => 'no-context',
	);
	}

	$primitives[] = $ospec;
	$primitives[] = $nspec;

	if ($ospec['line'] !== null && isset($old_comments[$ospec['line']])) {
	foreach ($old_comments[$ospec['line']] as $comment) {
	$primitives[] = array(
	'type' => 'inline',
	'comment' => $comment,
	'right' => false,
	);
	}
	}

	if ($nspec['line'] !== null && isset($new_comments[$nspec['line']])) {
	foreach ($new_comments[$nspec['line']] as $comment) {
	$primitives[] = array(
	'type' => 'inline',
	'comment' => $comment,
	'right' => true,
	);
	}
	}

	if ($hunk_starts && ($ii == $size - 1)) {
	$primitives[] = array(
	'type' => 'no-context',
	);
	}
	}

	if ($this->isOneUpRenderer()) {
	$primitives = $this->processPrimitivesForOneUp($primitives);
	}

	return $primitives;
	}

	private function processPrimitivesForOneUp(array $primitives) {
	// Primitives come out of buildPrimitives() in two-up format, because it
	// is the most general, flexible format. To put them into one-up format,
	// we need to filter and reorder them. In particular:
	//
	// - We discard unchanged lines in the old file; in one-up format, we
	// render them only once.
	// - We group contiguous blocks of old-modified and new-modified lines, so
	// they render in "block of old, block of new" order instead of
	// alternating old and new lines.

	$out = array();

	$old_buf = array();
	$new_buf = array();
	foreach ($primitives as $primitive) {
	$type = $primitive['type'];

	if ($type == 'old') {
	if (!$primitive['htype']) {
	// This is a line which appears in both the old file and the new
	// file, or the spacer corresponding to a line added in the new file.
	// Ignore it when rendering a one-up diff.
	continue;
	}
	if ($new_buf) {
	$out[] = $new_buf;
	$new_buf = array();
	}
	$old_buf[] = $primitive;
	} else if ($type == 'new') {
	if ($primitive['line'] === null) {
	// This is an empty spacer corresponding to a line removed from the
	// old file. Ignore it when rendering a one-up diff.
	continue;
	}
	if ($old_buf) {
	$out[] = $old_buf;
	$old_buf = array();
	}
	$new_buf[] = $primitive;
	} else if ($type == 'context' \|\| $type == 'no-context') {
	$out[] = $old_buf;
	$out[] = $new_buf;
	$old_buf = array();
	$new_buf = array();
	$out[] = array($primitive);
	} else if ($type == 'inline') {
	$out[] = $old_buf;
	$out[] = $new_buf;
	$old_buf = array();
	$new_buf = array();

	$out[] = array($primitive);
	} else {
	throw new Exception("Unknown primitive type '{$primitive}'!");
	}
	}

	$out[] = $old_buf;
	$out[] = $new_buf;
	$out = array_mergev($out);

	return $out;
	}

	}
	diff --git a/src/applications/differential/render/DifferentialChangesetTestRenderer.php b/src/applications/differential/render/DifferentialChangesetTestRenderer.php
	index 202b783463..4472eaf246 100644
	--- a/src/applications/differential/render/DifferentialChangesetTestRenderer.php
	+++ b/src/applications/differential/render/DifferentialChangesetTestRenderer.php
	@@ -1,86 +1,86 @@
	<?php

	abstract class DifferentialChangesetTestRenderer
	extends DifferentialChangesetRenderer {

	protected function renderChangeTypeHeader($force) {
	$changeset = $this->getChangeset();

	$old = nonempty($changeset->getOldFile(), '-');
	$away = nonempty(implode(', ', $changeset->getAwayPaths()), '-');
	$ctype = $changeset->getChangeType();
	$ftype = $changeset->getFileType();
	$force = ($force ? '(forced)' : '(unforced)');

	return "CTYPE {$ctype} {$ftype} {$force}\n".
	"{$old}\n".
	"{$away}\n";
	}

	- protected function renderShield($message, $force = 'default') {
	+ public function renderShield($message, $force = 'default') {
	return "SHIELD ({$force}) {$message}\n";
	}

	protected function renderPropertyChangeHeader() {
	$changeset = $this->getChangeset();
	$old = $changeset->getOldProperties();
	$new = $changeset->getNewProperties();

	if (!$old && !$new) {
	return null;
	}

	$props = '';
	foreach ($old as $key => $value) {
	$props .= "P - {$key} {$value}~\n";
	}
	foreach ($new as $key => $value) {
	$props .= "P + {$key} {$value}~\n";
	}

	return "PROPERTIES\n".$props;
	}

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

	$out = array();

	$primitives = $this->buildPrimitives($range_start, $range_len);
	foreach ($primitives as $p) {
	$type = $p['type'];
	switch ($type) {
	case 'old':
	case 'new':
	$num = nonempty($p['line'], '-');
	$render = $p['render'];
	$htype = nonempty($p['htype'], '.');

	// TODO: This should probably happen earlier, whenever we deal with
	// \r and \t normalization?
	$render = rtrim($render, "\r\n");
	$t = ($type == 'old') ? 'O' : 'N';

	$out[] = "{$t} {$num} {$htype} {$render}~";
	break;
	default:
	$out[] = $type;
	break;
	}
	}

	$out = implode("\n", $out)."\n";
	return $out;
	}


	public function renderFileChange($old_file = null,
	$new_file = null,
	$id = 0,
	$vs = 0) {
	throw new Exception("Not implemented!");
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Jul 29, 12:54 AM (1 w, 5 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 187705
Default Alt Text: (33 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions