2011-08-30 20:34:07 +02:00
|
|
|
<?php
|
|
|
|
|
|
|
|
final class DifferentialLocalCommitsView extends AphrontView {
|
|
|
|
|
|
|
|
private $localCommits;
|
|
|
|
|
|
|
|
public function setLocalCommits($local_commits) {
|
|
|
|
$this->localCommits = $local_commits;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function render() {
|
|
|
|
$user = $this->user;
|
|
|
|
if (!$user) {
|
|
|
|
throw new Exception("Call setUser() before render()-ing this view.");
|
|
|
|
}
|
|
|
|
|
|
|
|
$local = $this->localCommits;
|
|
|
|
if (!$local) {
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
|
|
|
require_celerity_resource('differential-local-commits-view-css');
|
|
|
|
|
|
|
|
$has_tree = false;
|
|
|
|
$has_local = false;
|
|
|
|
|
|
|
|
foreach ($local as $commit) {
|
|
|
|
if (idx($commit, 'tree')) {
|
|
|
|
$has_tree = true;
|
|
|
|
}
|
|
|
|
if (idx($commit, 'local')) {
|
|
|
|
$has_local = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
$rows = array();
|
2012-12-13 19:46:41 +01:00
|
|
|
$highlight = true;
|
2011-08-30 20:34:07 +02:00
|
|
|
foreach ($local as $commit) {
|
2012-12-13 19:46:41 +01:00
|
|
|
if ($highlight) {
|
|
|
|
$class = 'alt';
|
|
|
|
$highlight = false;
|
|
|
|
} else {
|
|
|
|
$class = '';
|
|
|
|
$highlight = true;
|
|
|
|
}
|
|
|
|
|
2011-08-30 20:34:07 +02:00
|
|
|
|
|
|
|
$row = array();
|
|
|
|
if (idx($commit, 'commit')) {
|
2013-01-18 23:43:34 +01:00
|
|
|
$commit_hash = self::formatCommit($commit['commit']);
|
2011-08-30 20:34:07 +02:00
|
|
|
} else if (isset($commit['rev'])) {
|
2013-01-18 23:43:34 +01:00
|
|
|
$commit_hash = self::formatCommit($commit['rev']);
|
2011-08-30 20:34:07 +02:00
|
|
|
} else {
|
|
|
|
$commit_hash = null;
|
|
|
|
}
|
2013-02-08 21:07:44 +01:00
|
|
|
$row[] = phutil_tag('td', array(), $commit_hash);
|
2011-08-30 20:34:07 +02:00
|
|
|
|
|
|
|
if ($has_tree) {
|
|
|
|
$tree = idx($commit, 'tree');
|
2013-01-18 23:43:34 +01:00
|
|
|
$tree = self::formatCommit($tree);
|
2013-02-08 21:07:44 +01:00
|
|
|
$row[] = phutil_tag('td', array(), $tree);
|
2011-08-30 20:34:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ($has_local) {
|
|
|
|
$local_rev = idx($commit, 'local', null);
|
2013-02-08 21:07:44 +01:00
|
|
|
$row[] = phutil_tag('td', array(), $local_rev);
|
2011-08-30 20:34:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
$parents = idx($commit, 'parents', array());
|
|
|
|
foreach ($parents as $k => $parent) {
|
|
|
|
if (is_array($parent)) {
|
|
|
|
$parent = idx($parent, 'rev');
|
|
|
|
}
|
2013-01-18 23:43:34 +01:00
|
|
|
$parents[$k] = self::formatCommit($parent);
|
2011-08-30 20:34:07 +02:00
|
|
|
}
|
2013-02-13 23:50:15 +01:00
|
|
|
$parents = phutil_implode_html(phutil_tag('br'), $parents);
|
2013-02-08 21:07:44 +01:00
|
|
|
$row[] = phutil_tag('td', array(), $parents);
|
2011-08-30 20:34:07 +02:00
|
|
|
|
|
|
|
$author = nonempty(
|
|
|
|
idx($commit, 'user'),
|
|
|
|
idx($commit, 'author'));
|
2013-02-08 21:07:44 +01:00
|
|
|
$row[] = phutil_tag('td', array(), $author);
|
2011-08-30 20:34:07 +02:00
|
|
|
|
2012-05-10 00:56:37 +02:00
|
|
|
$message = idx($commit, 'message');
|
|
|
|
|
2011-08-30 20:34:07 +02:00
|
|
|
$summary = idx($commit, 'summary');
|
2012-05-10 00:56:37 +02:00
|
|
|
$summary = phutil_utf8_shorten($summary, 80);
|
|
|
|
|
|
|
|
$view = new AphrontMoreView();
|
2013-01-31 18:08:02 +01:00
|
|
|
$view->setSome($summary);
|
2012-05-10 00:56:37 +02:00
|
|
|
|
|
|
|
if ($message && (trim($summary) != trim($message))) {
|
2013-01-31 18:08:02 +01:00
|
|
|
$view->setMore(phutil_escape_html_newlines($message));
|
2012-05-10 00:56:37 +02:00
|
|
|
}
|
|
|
|
|
2013-01-31 18:08:02 +01:00
|
|
|
$row[] = phutil_tag(
|
2012-05-10 00:56:37 +02:00
|
|
|
'td',
|
|
|
|
array(
|
|
|
|
'class' => 'summary',
|
|
|
|
),
|
|
|
|
$view->render());
|
2011-08-30 20:34:07 +02:00
|
|
|
|
|
|
|
$date = nonempty(
|
|
|
|
idx($commit, 'date'),
|
|
|
|
idx($commit, 'time'));
|
|
|
|
if ($date) {
|
|
|
|
$date = phabricator_datetime($date, $user);
|
|
|
|
}
|
2013-02-08 21:07:44 +01:00
|
|
|
$row[] = phutil_tag('td', array(), $date);
|
2011-08-30 20:34:07 +02:00
|
|
|
|
2013-02-08 21:07:44 +01:00
|
|
|
$rows[] = phutil_tag('tr', array('class' => $class), $row);
|
2011-08-30 20:34:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$headers = array();
|
2013-02-13 23:50:15 +01:00
|
|
|
$headers[] = phutil_tag('th', array(), pht('Commit'));
|
2011-08-30 20:34:07 +02:00
|
|
|
if ($has_tree) {
|
2013-02-13 23:50:15 +01:00
|
|
|
$headers[] = phutil_tag('th', array(), pht('Tree'));
|
2011-08-30 20:34:07 +02:00
|
|
|
}
|
|
|
|
if ($has_local) {
|
2013-02-13 23:50:15 +01:00
|
|
|
$headers[] = phutil_tag('th', array(), pht('Local'));
|
2011-08-30 20:34:07 +02:00
|
|
|
}
|
2013-02-13 23:50:15 +01:00
|
|
|
$headers[] = phutil_tag('th', array(), pht('Parents'));
|
|
|
|
$headers[] = phutil_tag('th', array(), pht('Author'));
|
|
|
|
$headers[] = phutil_tag('th', array(), pht('Summary'));
|
|
|
|
$headers[] = phutil_tag('th', array(), pht('Date'));
|
2011-08-30 20:34:07 +02:00
|
|
|
|
2013-02-13 23:50:15 +01:00
|
|
|
$headers = phutil_tag('tr', array(), $headers);
|
2011-08-30 20:34:07 +02:00
|
|
|
|
2013-11-11 18:23:23 +01:00
|
|
|
$content = phutil_tag_div('differential-panel', phutil_tag(
|
|
|
|
'table',
|
|
|
|
array('class' => 'differential-local-commits-table'),
|
|
|
|
array($headers, phutil_implode_html("\n", $rows))));
|
2013-09-29 00:55:38 +02:00
|
|
|
|
|
|
|
return 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
|
|
|
->setHeaderText(pht('Local Commits'))
|
|
|
|
->appendChild($content);
|
2011-08-30 20:34:07 +02:00
|
|
|
}
|
2013-01-18 23:43:34 +01:00
|
|
|
|
|
|
|
private static function formatCommit($commit) {
|
|
|
|
return substr($commit, 0, 12);
|
|
|
|
}
|
|
|
|
|
2011-08-30 20:34:07 +02:00
|
|
|
}
|