2011-01-27 23:55:52 +01:00
|
|
|
<?php
|
|
|
|
|
|
|
|
final class DifferentialRevisionDetailView extends AphrontView {
|
|
|
|
|
|
|
|
private $revision;
|
|
|
|
private $actions;
|
2011-08-10 22:46:01 +02:00
|
|
|
private $auxiliaryFields = array();
|
2012-12-11 23:59:27 +01:00
|
|
|
private $diff;
|
2013-07-13 19:33:32 +02:00
|
|
|
private $uri;
|
|
|
|
|
|
|
|
public function setURI($uri) {
|
|
|
|
$this->uri = $uri;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
public function getURI() {
|
|
|
|
return $this->uri;
|
|
|
|
}
|
2011-01-27 23:55:52 +01:00
|
|
|
|
2012-12-11 23:59:27 +01:00
|
|
|
public function setDiff(DifferentialDiff $diff) {
|
|
|
|
$this->diff = $diff;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
private function getDiff() {
|
|
|
|
return $this->diff;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function setRevision(DifferentialRevision $revision) {
|
2011-01-27 23:55:52 +01:00
|
|
|
$this->revision = $revision;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function setActions(array $actions) {
|
|
|
|
$this->actions = $actions;
|
|
|
|
return $this;
|
|
|
|
}
|
2012-12-11 23:59:27 +01:00
|
|
|
private function getActions() {
|
|
|
|
return $this->actions;
|
|
|
|
}
|
2011-01-27 23:55:52 +01:00
|
|
|
|
2011-08-10 22:46:01 +02:00
|
|
|
public function setAuxiliaryFields(array $fields) {
|
2012-04-04 01:35:35 +02:00
|
|
|
assert_instances_of($fields, 'DifferentialFieldSpecification');
|
2011-08-10 22:46:01 +02:00
|
|
|
$this->auxiliaryFields = $fields;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2011-01-27 23:55:52 +01:00
|
|
|
public function render() {
|
|
|
|
|
2014-01-02 20:59:35 +01:00
|
|
|
$this->requireResource('differential-core-view-css');
|
2011-01-27 23:55:52 +01:00
|
|
|
|
|
|
|
$revision = $this->revision;
|
2012-12-11 23:59:27 +01:00
|
|
|
$user = $this->getUser();
|
|
|
|
|
|
|
|
$header = $this->renderHeader($revision);
|
|
|
|
|
|
|
|
$actions = id(new PhabricatorActionListView())
|
|
|
|
->setUser($user)
|
2013-07-13 19:33:32 +02:00
|
|
|
->setObject($revision)
|
|
|
|
->setObjectURI($this->getURI());
|
2012-12-11 23:59:27 +01:00
|
|
|
foreach ($this->getActions() as $action) {
|
|
|
|
$obj = id(new PhabricatorActionView())
|
|
|
|
->setIcon(idx($action, 'icon', 'edit'))
|
|
|
|
->setName($action['name'])
|
|
|
|
->setHref(idx($action, 'href'))
|
|
|
|
->setWorkflow(idx($action, 'sigil') == 'workflow')
|
2013-02-02 02:22:48 +01:00
|
|
|
->setRenderAsForm(!empty($action['instant']))
|
2012-12-11 23:59:27 +01:00
|
|
|
->setUser($user)
|
|
|
|
->setDisabled(idx($action, 'disabled', false));
|
|
|
|
$actions->addAction($obj);
|
|
|
|
}
|
|
|
|
|
2013-10-11 16:53:56 +02:00
|
|
|
$properties = id(new PHUIPropertyListView())
|
2013-02-15 16:47:14 +01:00
|
|
|
->setUser($user)
|
|
|
|
->setObject($revision);
|
|
|
|
|
2012-12-11 23:59:27 +01:00
|
|
|
$status = $revision->getStatus();
|
|
|
|
$local_vcs = $this->getDiff()->getSourceControlSystem();
|
|
|
|
|
|
|
|
$next_step = null;
|
|
|
|
if ($status == ArcanistDifferentialRevisionStatus::ACCEPTED) {
|
|
|
|
switch ($local_vcs) {
|
|
|
|
case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
|
2013-02-14 20:58:20 +01:00
|
|
|
$bookmark = $this->getDiff()->getBookmark();
|
2013-02-20 00:25:27 +01:00
|
|
|
$next_step = ($bookmark != ''
|
2013-02-14 20:58:20 +01:00
|
|
|
? csprintf('arc land %s', $bookmark)
|
|
|
|
: 'arc land');
|
|
|
|
break;
|
|
|
|
|
2012-12-11 23:59:27 +01:00
|
|
|
case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
|
2013-02-14 20:58:20 +01:00
|
|
|
$branch = $this->getDiff()->getBranch();
|
2013-02-20 00:25:27 +01:00
|
|
|
$next_step = ($branch != ''
|
2013-02-14 20:58:20 +01:00
|
|
|
? csprintf('arc land %s', $branch)
|
|
|
|
: 'arc land');
|
2012-12-11 23:59:27 +01:00
|
|
|
break;
|
2013-02-14 20:58:20 +01:00
|
|
|
|
2012-12-11 23:59:27 +01:00
|
|
|
case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
|
2013-02-20 00:25:27 +01:00
|
|
|
$next_step = 'arc commit';
|
2012-12-11 23:59:27 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ($next_step) {
|
2013-02-20 00:25:27 +01:00
|
|
|
$next_step = phutil_tag('tt', array(), $next_step);
|
2013-01-24 22:18:44 +01:00
|
|
|
$properties->addProperty(pht('Next Step'), $next_step);
|
2012-12-11 23:59:27 +01:00
|
|
|
}
|
2011-01-27 23:55:52 +01:00
|
|
|
|
2011-08-10 22:46:01 +02:00
|
|
|
foreach ($this->auxiliaryFields as $field) {
|
|
|
|
$value = $field->renderValueForRevisionView();
|
Fix every HTML issue I could find
Summary:
I attempted to test every interface. I probably missed some stuff, but I at least have some level of confidence that the `phutil_tag` branch is fairly stable.
Fixed these issues:
[1] Fixed a Herald issue with object links in transcripts. Some actions return
links; this was previously hard-coded.
[2] DarkConsole refactoring created an issue where the "`" event handler registered too many times.
[3] Fixed a bug where `strlen($value)` was being checked, but fields may now return array(). Possibly we should implement phutil_is_empty_html() or similar.
[4] Fixed a undefined variable issue for image edit transactions.
[5] Fixed an issue with rendering participant transactions. This required phutil_safe_html() because `pht()` can't handle `array()` for `%s`.
[6] Fixed an issue where feed was entirely overescaped by reverting an overly ambitious render_tag -> tag.
[7] Fixed an issue with strict tables and inserting `''` instead of `0` into an integer column.
[8] Fixed an issue where • was shown escaped.
[9] Fixed an issue where "no data" was overescaped.
[10] Fixed an issue with strict tables and inserting `''` instead of `0` into an integer column.
[11] Fixed an issue with strict tables and inserting `''`.
[12] Fixed an issue with missing space after ":" for mini panels.
Encountered (but did not fix) these issues:
[X1] "e" works incorrectly on comments you are not allowed to edit. Did not fix.
[X2] Coverage currently interacts incorrectly with "--everything" for Phutil tests.
Test Plan:
- Viewed Differential.
- Created a diff via copy/paste.
- Viewed standalone diff.
- Jumped to diff via changeset table.
- Created a revision.
- Updated revision.
- Added a comment.
- Edited revision dependencies.
- Edited revision tasks.
- Viewed MetaMTA transcripts.
- Viewed Herald transcripts [1].
- Downloaded raw diff.
- Flagged / unflagged revision.
- Added/edited/deleted inline comment.
- Collapsed/expanded file.
- Did show raw left.
- Did show raw right.
- Checked previews for available actions.
- Clicked remarkup buttons
- Used filetree view.
- Used keyboard: F, j, k, J, K, n, p, t, h, "?" [2] [X1].
- Created a meme.
- Uploaded a file via drag and drop.
- Viewed a revision with no reviewers.
- Viewed a revision with >100 files.
- Viewed various other revisions [3].
- Viewed an image diff.
- Added image diff inline comments.
- Viewed Maniphest.
- Ran various queries.
- Created task.
- Created similar task.
- Added comments to tasks.
- Ran custom query.
- Saved custom query.
- Edited custom queries.
- Drag-reordered tasks.
- Batch edited tasks.
- Exported tasks to excel.
- Looked at reports (issue in T2311 notwithstanding).
- Viewed Diffusion.
- Browsed Git, SVN, HG repositories.
- Looked at history, browse, change, commit views.
- Viewed audit.
- Performed various audit searches.
- Viewed Paste.
- Performed paste searches.
- Created, edited, forked paste.
- Viewed Phriction.
- Edited a page.
- Viewed edit history.
- Used search typeahead to search for user / application.
- Used search to search for text.
- Viewed Phame.
- Viewed Blog, Post.
- Viewed live post.
- Published/unpublished post.
- Previewed post.
- Viewed Pholio.
- Edited/commented mock.
- Viewed ponder.
- Viewed question.
- Added answer/comment.
- Viewed Diviner.
- Viewed Conpherence [4] [5].
- Made Conpherence updates.
- Viewed calendar.
- Created status.
- Viewed status.
- Viewed Feed [6].
- Viewed Projects.
- Viewed project detail.
- Edited project.
- Viewed Owners.
- Viewed package detail.
- Edited package [7].
- Viewed flags.
- Edited flag.
- Deleted flag.
- Viewed Herald.
- Viewed rules.
- Created rule.
- Edited rule.
- Viewed edit log.
- Viewed transcripts.
- Inspected a transcript.
- Viewed People.
- Viewed list.
- Administrated user.
- Checked username/delete stuff.
- Looked at create/import LDAP/activity logs.
- Looked at a user profile.
- Looked at user about page.
- Looked at Repositories.
- Edited repository.
- Edited arcanist project.
- Looked at daemons.
- Looked at all daemons [8].
- Viewed combined log.
- Looked at configuration.
- Edited configuration.
- Looked at setup issues [9].
- Looked at current settings.
- Looked at application list.
- Installed / uninstalled applications [10].
- Looked at mailing lists.
- Created a mailing list.
- Edited a mailing list.
- Looked at sent mail.
- Looked at received mail.
- Looked at send/receive tests.
- Looked at settings.
- Clicked through all the panels.
- Looked at slowvote.
- Created a slowvote [11].
- Voted in a slowvote.
- Looked at Macro.
- Created a macro.
- Edited a macro.
- Commented on a macro.
- Looked at Countdown.
- Created a Countdown.
- Looked at it.
- Looked at Drydock.
- Poked around a bit.
- Looked at Fact.
- Poked around a bit.
- Looked at files.
- Looked at a file.
- Uploaded a file.
- Looked at Conduit.
- Made a Conduit call.
- Looked at UIExamples.
- Looked at PHPAST.
- Looked at PHIDs.
- Looked at notification menu.
- Looked at notification detail.
- Logged out.
- Logged in.
- Looked at homepage [12].
- Ran `arc unit --everything --no-coverage` [X2].
Reviewers: vrana, btrahan
Reviewed By: vrana
CC: aran
Maniphest Tasks: T2432
Differential Revision: https://secure.phabricator.com/D4807
2013-02-05 02:06:34 +01:00
|
|
|
if ($value !== null) {
|
2012-03-30 23:12:10 +02:00
|
|
|
$label = rtrim($field->renderLabelForRevisionView(), ':');
|
2012-12-11 23:59:27 +01:00
|
|
|
$properties->addProperty($label, $value);
|
2011-08-10 22:46:01 +02:00
|
|
|
}
|
|
|
|
}
|
2012-12-11 23:59:27 +01:00
|
|
|
$properties->setHasKeyboardShortcuts(true);
|
2013-10-11 16:53:56 +02:00
|
|
|
$properties->setActionList($actions);
|
2011-08-10 22:46:01 +02:00
|
|
|
|
2013-10-22 02:01:27 +02:00
|
|
|
$properties->invokeWillRenderEvent();
|
|
|
|
|
|
|
|
if (strlen($revision->getSummary())) {
|
2013-11-04 20:07:51 +01:00
|
|
|
$properties->addSectionHeader(
|
|
|
|
pht('Summary'),
|
|
|
|
PHUIPropertyListView::ICON_SUMMARY);
|
2013-10-22 02:01:27 +02:00
|
|
|
$properties->addTextContent(
|
|
|
|
PhabricatorMarkupEngine::renderOneObject(
|
2013-10-31 01:20:06 +01:00
|
|
|
id(new PhabricatorMarkupOneOff())
|
|
|
|
->setPreserveLinebreaks(true)
|
|
|
|
->setContent($revision->getSummary()),
|
2013-10-22 02:01:27 +02:00
|
|
|
'default',
|
|
|
|
$user));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strlen($revision->getTestPlan())) {
|
2013-11-04 20:07:51 +01:00
|
|
|
$properties->addSectionHeader(
|
|
|
|
pht('Test Plan'),
|
|
|
|
PHUIPropertyListView::ICON_TESTPLAN);
|
2013-10-22 02:01:27 +02:00
|
|
|
$properties->addTextContent(
|
|
|
|
PhabricatorMarkupEngine::renderOneObject(
|
2013-10-31 01:20:06 +01:00
|
|
|
id(new PhabricatorMarkupOneOff())
|
|
|
|
->setPreserveLinebreaks(true)
|
|
|
|
->setContent($revision->getTestPlan()),
|
2013-10-22 02:01:27 +02:00
|
|
|
'default',
|
|
|
|
$user));
|
|
|
|
}
|
|
|
|
|
2013-09-29 00:55:38 +02:00
|
|
|
$object_box = id(new PHUIObjectBoxView())
|
Provide more structure to PHUIObjectBoxView
Summary:
Three changes here.
- Add `setActionList()`, and use that to set the action list.
- Add `setPropertyList()`, and use that to set the property list.
These will let us add some apropriate CSS so we can fix the border issue, and get rid of a bunch of goofy `.x + .y` selectors.
- Replace `addContent()` with `appendChild()`.
This is just a consistency thing; `AphrontView` already provides `appendChild()`, and `addContent()` did the same thing.
Test Plan:
- Viewed "All Config".
- Viewed a countdown.
- Viewed a revision (add comment, change list, table of contents, comment, local commits, open revisions affecting these files, update history).
- Viewed Diffusion (browse, change, history, repository, lint).
- Viewed Drydock (resource, lease).
- Viewed Files.
- Viewed Herald.
- Viewed Legalpad.
- Viewed macro (edit, edit audio, view).
- Viewed Maniphest.
- Viewed Applications.
- Viewed Paste.
- Viewed People.
- Viewed Phulux.
- Viewed Pholio.
- Viewed Phame (blog, post).
- Viewed Phortune (account, product).
- Viewed Ponder (questions, answers, comments).
- Viewed Releeph.
- Viewed Projects.
- Viewed Slowvote.
NOTE: Images in Files aren't on a black background anymore -- I assume that's on purpose?
NOTE: Some jankiness in Phortune, I'll clean that up when I get back to it. Not related to this diff.
Reviewers: chad
Reviewed By: chad
CC: aran
Differential Revision: https://secure.phabricator.com/D7174
2013-09-30 18:36:04 +02:00
|
|
|
->setHeader($header)
|
2013-10-11 16:53:56 +02:00
|
|
|
->addPropertyList($properties);
|
2013-09-29 00:55:38 +02:00
|
|
|
|
|
|
|
return $object_box;
|
2012-12-11 23:59:27 +01:00
|
|
|
}
|
2011-02-20 21:50:28 +01:00
|
|
|
|
2012-12-11 23:59:27 +01:00
|
|
|
private function renderHeader(DifferentialRevision $revision) {
|
2013-09-17 18:12:37 +02:00
|
|
|
$view = id(new PHUIHeaderView())
|
2013-09-26 21:37:05 +02:00
|
|
|
->setHeader($revision->getTitle($revision))
|
|
|
|
->setUser($this->getUser())
|
|
|
|
->setPolicyObject($revision);
|
2013-04-03 17:28:18 +02:00
|
|
|
|
2013-09-24 17:42:04 +02:00
|
|
|
$status = $revision->getStatus();
|
|
|
|
$status_name =
|
|
|
|
DifferentialRevisionStatus::renderFullDescription($status);
|
|
|
|
|
|
|
|
$view->addProperty(PHUIHeaderView::PROPERTY_STATUS, $status_name);
|
2013-04-03 17:28:18 +02:00
|
|
|
|
|
|
|
return $view;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static function renderTagForRevision(
|
|
|
|
DifferentialRevision $revision) {
|
2011-01-27 23:55:52 +01:00
|
|
|
|
2012-12-11 23:59:27 +01:00
|
|
|
$status = $revision->getStatus();
|
|
|
|
$status_name =
|
|
|
|
ArcanistDifferentialRevisionStatus::getNameForRevisionStatus($status);
|
2012-03-30 23:12:10 +02:00
|
|
|
|
2013-04-03 17:28:18 +02:00
|
|
|
return id(new PhabricatorTagView())
|
2012-12-11 23:59:27 +01:00
|
|
|
->setType(PhabricatorTagView::TYPE_STATE)
|
2013-09-24 17:42:04 +02:00
|
|
|
->setName($status_name);
|
2011-01-27 23:55:52 +01:00
|
|
|
}
|
2013-09-24 17:42:04 +02:00
|
|
|
|
2011-01-27 23:55:52 +01:00
|
|
|
}
|