mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-29 18:22:41 +01:00
Refactor DifferentialChangesetParser -- pass 1 of N
Summary: basically did my darnedest to pull out a TwoUp rendering view. Made a base class for the rendering views with "old" and "new" terminology rather than "left" and "right. Future revisions will finish cleaning up the terminology within the DifferentialChangesetParser itself and more of the ideas within T2009. Test Plan: been playing with differential all day Reviewers: epriestley Reviewed By: epriestley CC: vrana, chad, aran, Korvin Maniphest Tasks: T2009 Differential Revision: https://secure.phabricator.com/D4117
This commit is contained in:
Bob Trahan
parent
42a514ec79
commit
75e8ff26f5
4 changed files with 1287 additions and 961 deletions
|
|
@ -227,6 +227,8 @@ phutil_register_library_map(array(
|
|||
'DifferentialChangesetListView' => 'applications/differential/view/DifferentialChangesetListView.php',
|
||||
'DifferentialChangesetParser' => 'applications/differential/parser/DifferentialChangesetParser.php',
|
||||
'DifferentialChangesetParserTestCase' => 'applications/differential/parser/__tests__/DifferentialChangesetParserTestCase.php',
|
||||
'DifferentialChangesetRenderer' => 'applications/differential/render/DifferentialChangesetRenderer.php',
|
||||
'DifferentialChangesetTwoUpRenderer' => 'applications/differential/render/DifferentialChangesetTwoUpRenderer.php',
|
||||
'DifferentialChangesetViewController' => 'applications/differential/controller/DifferentialChangesetViewController.php',
|
||||
'DifferentialComment' => 'applications/differential/storage/DifferentialComment.php',
|
||||
'DifferentialCommentEditor' => 'applications/differential/editor/DifferentialCommentEditor.php',
|
||||
|
|
@ -1510,6 +1512,7 @@ phutil_register_library_map(array(
|
|||
'DifferentialChangesetDetailView' => 'AphrontView',
|
||||
'DifferentialChangesetListView' => 'AphrontView',
|
||||
'DifferentialChangesetParserTestCase' => 'ArcanistPhutilTestCase',
|
||||
'DifferentialChangesetTwoUpRenderer' => 'DifferentialChangesetRenderer',
|
||||
'DifferentialChangesetViewController' => 'DifferentialController',
|
||||
'DifferentialComment' =>
|
||||
array(
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,603 @@
|
|||
<?php
|
||||
|
||||
abstract class DifferentialChangesetRenderer {
|
||||
|
||||
private $user;
|
||||
private $changeset;
|
||||
private $renderingReference;
|
||||
private $renderPropertyChangeHeader;
|
||||
private $missingOldLines;
|
||||
private $missingNewLines;
|
||||
private $oldLines;
|
||||
private $newLines;
|
||||
private $visibleLines;
|
||||
private $oldComments;
|
||||
private $newComments;
|
||||
private $oldChangesetID;
|
||||
private $newChangesetID;
|
||||
private $oldAttachesToNewFile;
|
||||
private $newAttachesToNewFile;
|
||||
private $highlightOld = array();
|
||||
private $highlightNew = array();
|
||||
private $linesOfContext;
|
||||
private $codeCoverage;
|
||||
private $handles;
|
||||
private $markupEngine;
|
||||
private $oldRender;
|
||||
private $newRender;
|
||||
private $originalOld;
|
||||
private $originalNew;
|
||||
|
||||
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 setLinesOfContext($lines_of_context) {
|
||||
$this->linesOfContext = $lines_of_context;
|
||||
return $this;
|
||||
}
|
||||
protected function getLinesOfContext() {
|
||||
return $this->linesOfContext;
|
||||
}
|
||||
|
||||
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 setVisibleLines(array $visible_lines) {
|
||||
$this->visibleLines = $visible_lines;
|
||||
return $this;
|
||||
}
|
||||
protected function getVisibleLines() {
|
||||
return $this->visibleLines;
|
||||
}
|
||||
|
||||
public function setNewLines(array $new_lines) {
|
||||
phlog(print_r($new_lines, true));
|
||||
$this->newLines = $new_lines;
|
||||
return $this;
|
||||
}
|
||||
protected function getNewLines() {
|
||||
return $this->newLines;
|
||||
}
|
||||
|
||||
public function setOldLines(array $old_lines) {
|
||||
phlog(print_r($old_lines, true));
|
||||
$this->oldLines = $old_lines;
|
||||
return $this;
|
||||
}
|
||||
protected function getOldLines() {
|
||||
return $this->oldLines;
|
||||
}
|
||||
|
||||
public function setMissingNewLines(array $missing_new_lines) {
|
||||
$this->missingNewLines = $missing_new_lines;
|
||||
return $this;
|
||||
}
|
||||
protected function getMissingNewLines() {
|
||||
return $this->missingNewLines;
|
||||
}
|
||||
|
||||
public function setMissingOldLines(array $missing_old_lines) {
|
||||
$this->missingOldLines = $missing_old_lines;
|
||||
return $this;
|
||||
}
|
||||
protected function getMissingOldLines() {
|
||||
return $this->missingOldLines;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
abstract public function renderChangesetTable($contents);
|
||||
abstract public function renderTextChange(
|
||||
$range_start,
|
||||
$range_len,
|
||||
$mask_force,
|
||||
$feedback_mask
|
||||
);
|
||||
abstract public function renderFileChange(
|
||||
$old = null,
|
||||
$new = null,
|
||||
$id = 0,
|
||||
$vs = 0
|
||||
);
|
||||
|
||||
public function renderShield($message, $more) {
|
||||
|
||||
if ($more) {
|
||||
$end = max(
|
||||
count($this->getOldLines()),
|
||||
count($this->getNewLines())
|
||||
);
|
||||
$reference = $this->getRenderingReference();
|
||||
$more =
|
||||
' '.
|
||||
javelin_render_tag(
|
||||
'a',
|
||||
array(
|
||||
'mustcapture' => true,
|
||||
'sigil' => 'show-more',
|
||||
'class' => 'complete',
|
||||
'href' => '#',
|
||||
'meta' => array(
|
||||
'ref' => $reference,
|
||||
'range' => "0-{$end}",
|
||||
),
|
||||
),
|
||||
'Show File Contents');
|
||||
} else {
|
||||
$more = null;
|
||||
}
|
||||
|
||||
return javelin_render_tag(
|
||||
'tr',
|
||||
array(
|
||||
'sigil' => 'context-target',
|
||||
),
|
||||
'<td class="differential-shield" colspan="6">'.
|
||||
phutil_escape_html($message).
|
||||
$more.
|
||||
'</td>');
|
||||
}
|
||||
|
||||
|
||||
protected function renderPropertyChangeHeader($changeset) {
|
||||
if (!$this->shouldRenderPropertyChangeHeader()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$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 renderChangeTypeHeader($changeset, $force) {
|
||||
$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 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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,536 @@
|
|||
<?php
|
||||
|
||||
final class DifferentialChangesetTwoUpRenderer
|
||||
extends DifferentialChangesetRenderer {
|
||||
|
||||
public function renderChangesetTable($contents) {
|
||||
$changeset = $this->getChangeset();
|
||||
$props = $this->renderPropertyChangeHeader($changeset);
|
||||
$table = null;
|
||||
if ($contents) {
|
||||
$table = javelin_render_tag(
|
||||
'table',
|
||||
array(
|
||||
'class' => 'differential-diff remarkup-code PhabricatorMonospaced',
|
||||
'sigil' => 'differential-diff',
|
||||
),
|
||||
$contents);
|
||||
}
|
||||
|
||||
if (!$table && !$props) {
|
||||
$notice = $this->renderChangeTypeHeader($changeset, true);
|
||||
} else {
|
||||
$notice = $this->renderChangeTypeHeader($changeset, false);
|
||||
}
|
||||
|
||||
$result = implode(
|
||||
"\n",
|
||||
array(
|
||||
$notice,
|
||||
$props,
|
||||
$table,
|
||||
));
|
||||
|
||||
// TODO: Let the user customize their tab width / display style.
|
||||
$result = str_replace("\t", ' ', $result);
|
||||
|
||||
// TODO: We should possibly post-process "\r" as well.
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function renderTextChange(
|
||||
$range_start,
|
||||
$range_len,
|
||||
$mask_force,
|
||||
$feedback_mask) {
|
||||
|
||||
$missing_old = $this->getMissingOldLines();
|
||||
$missing_new = $this->getMissingNewLines();
|
||||
|
||||
$context_not_available = null;
|
||||
if ($missing_old || $missing_new) {
|
||||
$context_not_available = javelin_render_tag(
|
||||
'tr',
|
||||
array(
|
||||
'sigil' => 'context-target',
|
||||
),
|
||||
phutil_render_tag(
|
||||
'td',
|
||||
array(
|
||||
'colspan' => 6,
|
||||
'class' => 'show-more'
|
||||
),
|
||||
pht('Context not available.')
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
$html = array();
|
||||
$old_lines = $this->getOldLines();
|
||||
$new_lines = $this->getNewLines();
|
||||
|
||||
$rows = max(
|
||||
count($old_lines),
|
||||
count($new_lines));
|
||||
|
||||
phlog($rows);
|
||||
|
||||
if ($range_start === null) {
|
||||
$range_start = 0;
|
||||
}
|
||||
|
||||
if ($range_len === null) {
|
||||
$range_len = $rows;
|
||||
}
|
||||
|
||||
$range_len = min($range_len, $rows - $range_start);
|
||||
|
||||
// Gaps - compute gaps in the visible display diff, where we will render
|
||||
// "Show more context" spacers. This builds an aggregate $mask of all the
|
||||
// lines we must show (because they are near changed lines, near inline
|
||||
// comments, or the request has explicitly asked for them, i.e. resulting
|
||||
// from the user clicking "show more") and then finds all the gaps between
|
||||
// visible lines. If a gap is smaller than the context size, we just
|
||||
// display it. Otherwise, we record it into $gaps and will render a
|
||||
// "show more context" element instead of diff text below.
|
||||
|
||||
$gaps = array();
|
||||
$gap_start = 0;
|
||||
$in_gap = false;
|
||||
$lines_of_context = $this->getLinesOfContext();
|
||||
$mask = $this->getVisibleLines() + $mask_force + $feedback_mask;
|
||||
$mask[$range_start + $range_len] = true;
|
||||
for ($ii = $range_start; $ii <= $range_start + $range_len; $ii++) {
|
||||
if (isset($mask[$ii])) {
|
||||
if ($in_gap) {
|
||||
$gap_length = $ii - $gap_start;
|
||||
if ($gap_length <= $lines_of_context) {
|
||||
for ($jj = $gap_start; $jj <= $gap_start + $gap_length; $jj++) {
|
||||
$mask[$jj] = true;
|
||||
}
|
||||
} else {
|
||||
$gaps[] = array($gap_start, $gap_length);
|
||||
}
|
||||
$in_gap = false;
|
||||
}
|
||||
} else {
|
||||
if (!$in_gap) {
|
||||
$gap_start = $ii;
|
||||
$in_gap = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$gaps = array_reverse($gaps);
|
||||
|
||||
$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();
|
||||
|
||||
// We need to go backwards to properly indent whitespace in this code:
|
||||
//
|
||||
// 0: class C {
|
||||
// 1:
|
||||
// 1: function f() {
|
||||
// 2:
|
||||
// 2: return;
|
||||
// 3:
|
||||
// 3: }
|
||||
// 4:
|
||||
// 4: }
|
||||
//
|
||||
$depths = array();
|
||||
$last_depth = 0;
|
||||
$range_end = $range_start + $range_len;
|
||||
if (!isset($new_lines[$range_end])) {
|
||||
$range_end--;
|
||||
}
|
||||
for ($ii = $range_end; $ii >= $range_start; $ii--) {
|
||||
// We need to expand tabs to process mixed indenting and to round
|
||||
// correctly later.
|
||||
$line = str_replace("\t", " ", $new_lines[$ii]['text']);
|
||||
$trimmed = ltrim($line);
|
||||
if ($trimmed != '') {
|
||||
// We round down to flatten "/**" and " *".
|
||||
$last_depth = floor((strlen($line) - strlen($trimmed)) / 2);
|
||||
}
|
||||
$depths[$ii] = $last_depth;
|
||||
}
|
||||
|
||||
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_render_tag(
|
||||
'a',
|
||||
array(
|
||||
'href' => '#',
|
||||
'mustcapture' => true,
|
||||
'sigil' => 'show-more',
|
||||
'meta' => array(
|
||||
'ref' => $reference,
|
||||
'range' => "{$top}-{$len}/{$top}-20",
|
||||
),
|
||||
),
|
||||
$is_first_block
|
||||
? "Show First 20 Lines"
|
||||
: "\xE2\x96\xB2 Show 20 Lines");
|
||||
}
|
||||
|
||||
$contents[] = javelin_render_tag(
|
||||
'a',
|
||||
array(
|
||||
'href' => '#',
|
||||
'mustcapture' => true,
|
||||
'sigil' => 'show-more',
|
||||
'meta' => array(
|
||||
'type' => 'all',
|
||||
'ref' => $reference,
|
||||
'range' => "{$top}-{$len}/{$top}-{$len}",
|
||||
),
|
||||
),
|
||||
'Show All '.$len.' Lines');
|
||||
|
||||
$is_last_block = false;
|
||||
if ($ii + $len >= $rows) {
|
||||
$is_last_block = true;
|
||||
}
|
||||
|
||||
if ($len > 40) {
|
||||
$contents[] = javelin_render_tag(
|
||||
'a',
|
||||
array(
|
||||
'href' => '#',
|
||||
'mustcapture' => true,
|
||||
'sigil' => 'show-more',
|
||||
'meta' => array(
|
||||
'ref' => $reference,
|
||||
'range' => "{$top}-{$len}/{$end}-20",
|
||||
),
|
||||
),
|
||||
$is_last_block
|
||||
? "Show Last 20 Lines"
|
||||
: "\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_render_tag(
|
||||
'tr',
|
||||
array(
|
||||
'sigil' => 'context-target',
|
||||
),
|
||||
'<td colspan="2" class="show-more">'.
|
||||
implode(' • ', $contents).
|
||||
'</td>'.
|
||||
'<th class="show-context-line">'.$context_line.'</td>'.
|
||||
'<td colspan="3" class="show-context">'.$context.'</td>');
|
||||
|
||||
$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_render_tag(
|
||||
'td',
|
||||
array(
|
||||
'meta' => array(
|
||||
'msg' => $title,
|
||||
),
|
||||
'class' => 'copy '.$class,
|
||||
),
|
||||
'');
|
||||
}
|
||||
}
|
||||
}
|
||||
$n_classes .= ' right'.$n_colspan;
|
||||
|
||||
if (($o_num && !empty($missing_old[$o_num])) ||
|
||||
($n_num && !empty($missing_new[$n_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) {
|
||||
$xhp = $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[] =
|
||||
'<tr class="inline">'.
|
||||
'<th />'.
|
||||
'<td class="left">'.$xhp.'</td>'.
|
||||
'<th />'.
|
||||
'<td colspan="3" class="right3">'.$new.'</td>'.
|
||||
'</tr>';
|
||||
}
|
||||
}
|
||||
if ($n_num && isset($new_comments[$n_num])) {
|
||||
foreach ($new_comments[$n_num] as $comment) {
|
||||
$xhp = $this->renderInlineComment($comment, $on_right = true);
|
||||
$html[] =
|
||||
'<tr class="inline">'.
|
||||
'<th />'.
|
||||
'<td class="left" />'.
|
||||
'<th />'.
|
||||
'<td colspan="3" class="right3">'.$xhp.'</td>'.
|
||||
'</tr>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return implode('', $html);
|
||||
}
|
||||
|
||||
public function renderFileChange($old_file = null,
|
||||
$new_file = null,
|
||||
$id = 0,
|
||||
$vs = 0) {
|
||||
$old = null;
|
||||
if ($old_file) {
|
||||
$old = phutil_render_tag(
|
||||
'div',
|
||||
array(
|
||||
'class' => 'differential-image-stage'
|
||||
),
|
||||
phutil_render_tag(
|
||||
'img',
|
||||
array(
|
||||
'src' => $old_file->getBestURI(),
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
$new = null;
|
||||
if ($new_file) {
|
||||
$new = phutil_render_tag(
|
||||
'div',
|
||||
array(
|
||||
'class' => 'differential-image-stage'
|
||||
),
|
||||
phutil_render_tag(
|
||||
'img',
|
||||
array(
|
||||
'src' => $new_file->getBestURI(),
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
$html_old = array();
|
||||
$html_new = array();
|
||||
foreach ($this->getOldComments() as $comment) {
|
||||
$xhp = $this->renderInlineComment($comment, $on_right = false);
|
||||
$html_old[] =
|
||||
'<tr class="inline">'.
|
||||
'<th />'.
|
||||
'<td class="left">'.$xhp.'</td>'.
|
||||
'<th />'.
|
||||
'<td class="right3" colspan="3" />'.
|
||||
'</tr>';
|
||||
}
|
||||
foreach ($this->getNewComments() as $comment) {
|
||||
$xhp = $this->renderInlineComment($comment, $on_right = true);
|
||||
$html_new[] =
|
||||
'<tr class="inline">'.
|
||||
'<th />'.
|
||||
'<td class="left" />'.
|
||||
'<th />'.
|
||||
'<td class="right3" colspan="3">'.$xhp.'</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 = $this->renderChangesetTable(
|
||||
'<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));
|
||||
|
||||
return $output;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in a new issue