2011-03-09 02:31:44 +01:00
|
|
|
<?php
|
|
|
|
|
|
|
|
/*
|
2012-03-23 23:32:26 +01:00
|
|
|
* Copyright 2012 Facebook, Inc.
|
2011-03-09 02:31:44 +01:00
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
2011-03-13 01:17:34 +01:00
|
|
|
final class DiffusionHistoryTableView extends DiffusionView {
|
2011-03-09 02:31:44 +01:00
|
|
|
|
|
|
|
private $history;
|
2011-04-03 01:39:23 +02:00
|
|
|
private $handles = array();
|
2012-03-24 01:11:15 +01:00
|
|
|
private $isHead;
|
|
|
|
private $parents;
|
2011-03-09 02:31:44 +01:00
|
|
|
|
|
|
|
public function setHistory(array $history) {
|
2012-04-04 01:22:31 +02:00
|
|
|
assert_instances_of($history, 'DiffusionPathChange');
|
2011-03-09 02:31:44 +01:00
|
|
|
$this->history = $history;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2011-04-03 01:39:23 +02:00
|
|
|
public function setHandles(array $handles) {
|
2012-04-04 01:22:31 +02:00
|
|
|
assert_instances_of($handles, 'PhabricatorObjectHandle');
|
2011-04-03 01:39:23 +02:00
|
|
|
$this->handles = $handles;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2012-03-23 23:32:26 +01:00
|
|
|
public function getRequiredHandlePHIDs() {
|
|
|
|
$phids = array();
|
|
|
|
foreach ($this->history as $item) {
|
|
|
|
$data = $item->getCommitData();
|
|
|
|
if ($data) {
|
|
|
|
if ($data->getCommitDetail('authorPHID')) {
|
|
|
|
$phids[$data->getCommitDetail('authorPHID')] = true;
|
|
|
|
}
|
2012-05-23 17:34:36 +02:00
|
|
|
if ($data->getCommitDetail('committerPHID')) {
|
|
|
|
$phids[$data->getCommitDetail('committerPHID')] = true;
|
|
|
|
}
|
2012-03-23 23:32:26 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return array_keys($phids);
|
|
|
|
}
|
|
|
|
|
2012-03-24 01:11:15 +01:00
|
|
|
public function setParents(array $parents) {
|
|
|
|
$this->parents = $parents;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function setIsHead($is_head) {
|
|
|
|
$this->isHead = $is_head;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2011-03-09 02:31:44 +01:00
|
|
|
public function render() {
|
2011-03-13 01:17:34 +01:00
|
|
|
$drequest = $this->getDiffusionRequest();
|
|
|
|
|
2011-04-03 01:39:23 +02:00
|
|
|
$handles = $this->handles;
|
|
|
|
|
2012-03-24 01:11:15 +01:00
|
|
|
$graph = null;
|
|
|
|
if ($this->parents) {
|
|
|
|
$graph = $this->renderGraph();
|
|
|
|
}
|
|
|
|
|
2011-03-09 02:31:44 +01:00
|
|
|
$rows = array();
|
2012-03-24 01:11:15 +01:00
|
|
|
$ii = 0;
|
2011-03-09 02:31:44 +01:00
|
|
|
foreach ($this->history as $history) {
|
2011-03-13 07:51:40 +01:00
|
|
|
$epoch = $history->getEpoch();
|
|
|
|
|
|
|
|
if ($epoch) {
|
|
|
|
$date = date('M j, Y', $epoch);
|
|
|
|
$time = date('g:i A', $epoch);
|
|
|
|
} else {
|
|
|
|
$date = null;
|
|
|
|
$time = null;
|
|
|
|
}
|
|
|
|
|
2011-04-03 01:39:23 +02:00
|
|
|
$data = $history->getCommitData();
|
2012-05-23 17:34:36 +02:00
|
|
|
$author_phid = $committer = $committer_phid = null;
|
2011-04-03 01:39:23 +02:00
|
|
|
if ($data) {
|
|
|
|
$author_phid = $data->getCommitDetail('authorPHID');
|
2012-05-23 17:34:36 +02:00
|
|
|
$committer_phid = $data->getCommitDetail('committerPHID');
|
|
|
|
$committer = $data->getCommitDetail('committer');
|
2011-04-03 01:39:23 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ($author_phid && isset($handles[$author_phid])) {
|
|
|
|
$author = $handles[$author_phid]->renderLink();
|
|
|
|
} else {
|
|
|
|
$author = phutil_escape_html($history->getAuthorName());
|
|
|
|
}
|
|
|
|
|
2012-06-07 21:26:19 +02:00
|
|
|
$different_committer = false;
|
|
|
|
if ($committer_phid) {
|
|
|
|
$different_committer = ($committer_phid != $author_phid);
|
|
|
|
} else if ($committer != '') {
|
|
|
|
$different_committer = ($committer != $history->getAuthorName());
|
|
|
|
}
|
|
|
|
if ($different_committer) {
|
2012-05-23 17:34:36 +02:00
|
|
|
if ($committer_phid && isset($handles[$committer_phid])) {
|
|
|
|
$committer = $handles[$committer_phid]->renderLink();
|
|
|
|
} else {
|
|
|
|
$committer = phutil_escape_html($committer);
|
|
|
|
}
|
2012-06-07 21:26:19 +02:00
|
|
|
$author .= '/'.$committer;
|
2012-05-23 17:34:36 +02:00
|
|
|
}
|
|
|
|
|
2012-05-10 02:28:57 +02:00
|
|
|
$commit = $history->getCommit();
|
|
|
|
if ($commit && !$commit->getIsUnparsed() && $data) {
|
|
|
|
$change = $this->linkChange(
|
|
|
|
$history->getChangeType(),
|
|
|
|
$history->getFileType(),
|
|
|
|
$path = null,
|
|
|
|
$history->getCommitIdentifier());
|
|
|
|
} else {
|
|
|
|
$change = "<em>Importing\xE2\x80\xA6</em>";
|
|
|
|
}
|
|
|
|
|
2011-03-09 02:31:44 +01:00
|
|
|
$rows[] = array(
|
2011-03-13 01:17:34 +01:00
|
|
|
$this->linkBrowse(
|
|
|
|
$drequest->getPath(),
|
|
|
|
array(
|
|
|
|
'commit' => $history->getCommitIdentifier(),
|
|
|
|
)),
|
2012-03-24 01:11:15 +01:00
|
|
|
$graph ? $graph[$ii++] : null,
|
2011-03-13 01:17:34 +01:00
|
|
|
self::linkCommit(
|
|
|
|
$drequest->getRepository(),
|
|
|
|
$history->getCommitIdentifier()),
|
2012-05-10 02:28:57 +02:00
|
|
|
$change,
|
2011-03-13 07:51:40 +01:00
|
|
|
$date,
|
|
|
|
$time,
|
2011-04-03 01:39:23 +02:00
|
|
|
$author,
|
2011-07-31 17:38:06 +02:00
|
|
|
AphrontTableView::renderSingleDisplayLine(
|
|
|
|
phutil_escape_html($history->getSummary())),
|
2011-03-09 02:31:44 +01:00
|
|
|
// TODO: etc etc
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
$view = new AphrontTableView($rows);
|
|
|
|
$view->setHeaders(
|
|
|
|
array(
|
2011-03-13 01:17:34 +01:00
|
|
|
'Browse',
|
2012-03-24 01:11:15 +01:00
|
|
|
'',
|
2011-03-09 02:31:44 +01:00
|
|
|
'Commit',
|
2011-03-13 01:17:34 +01:00
|
|
|
'Change',
|
|
|
|
'Date',
|
2011-03-13 07:51:40 +01:00
|
|
|
'Time',
|
2012-06-07 21:26:19 +02:00
|
|
|
'Author/Committer',
|
2011-03-13 01:17:34 +01:00
|
|
|
'Details',
|
|
|
|
));
|
|
|
|
$view->setColumnClasses(
|
|
|
|
array(
|
|
|
|
'',
|
2012-03-24 01:11:15 +01:00
|
|
|
'threads',
|
2011-03-13 01:17:34 +01:00
|
|
|
'n',
|
|
|
|
'',
|
|
|
|
'',
|
2011-03-13 07:51:40 +01:00
|
|
|
'right',
|
2011-03-13 01:17:34 +01:00
|
|
|
'',
|
2011-07-31 17:38:06 +02:00
|
|
|
'wide',
|
2011-03-09 02:31:44 +01:00
|
|
|
));
|
2012-03-24 01:11:15 +01:00
|
|
|
$view->setColumnVisibility(
|
|
|
|
array(
|
|
|
|
true,
|
|
|
|
$graph ? true : false,
|
|
|
|
));
|
2011-03-09 02:31:44 +01:00
|
|
|
return $view->render();
|
|
|
|
}
|
|
|
|
|
2012-03-24 01:11:15 +01:00
|
|
|
/**
|
|
|
|
* Draw a merge/branch graph from the parent revision data. We're basically
|
|
|
|
* building up a bunch of strings like this:
|
|
|
|
*
|
|
|
|
* ^
|
|
|
|
* |^
|
|
|
|
* o|
|
|
|
|
* |o
|
|
|
|
* o
|
|
|
|
*
|
|
|
|
* ...which form an ASCII representation of the graph we eventaully want to
|
|
|
|
* draw.
|
|
|
|
*
|
|
|
|
* NOTE: The actual implementation is black magic.
|
|
|
|
*/
|
|
|
|
private function renderGraph() {
|
|
|
|
|
|
|
|
// This keeps our accumulated information about each line of the
|
|
|
|
// merge/branch graph.
|
|
|
|
$graph = array();
|
|
|
|
|
|
|
|
// This holds the next commit we're looking for in each column of the
|
|
|
|
// graph.
|
|
|
|
$threads = array();
|
|
|
|
|
|
|
|
// This is the largest number of columns any row has, i.e. the width of
|
|
|
|
// the graph.
|
|
|
|
$count = 0;
|
|
|
|
|
|
|
|
foreach ($this->history as $key => $history) {
|
|
|
|
$joins = array();
|
|
|
|
$splits = array();
|
|
|
|
|
|
|
|
$parent_list = $this->parents[$history->getCommitIdentifier()];
|
|
|
|
|
|
|
|
// Look for some thread which has this commit as the next commit. If
|
|
|
|
// we find one, this commit goes on that thread. Otherwise, this commit
|
|
|
|
// goes on a new thread.
|
|
|
|
|
|
|
|
$line = '';
|
|
|
|
$found = false;
|
|
|
|
$pos = count($threads);
|
|
|
|
for ($n = 0; $n < $count; $n++) {
|
|
|
|
if (empty($threads[$n])) {
|
|
|
|
$line .= ' ';
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($threads[$n] == $history->getCommitIdentifier()) {
|
|
|
|
if ($found) {
|
|
|
|
$line .= ' ';
|
|
|
|
$joins[] = $n;
|
|
|
|
unset($threads[$n]);
|
|
|
|
} else {
|
|
|
|
$line .= 'o';
|
|
|
|
$found = true;
|
|
|
|
$pos = $n;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
|
|
|
|
// We render a "|" for any threads which have a commit that we haven't
|
|
|
|
// seen yet, this is later drawn as a vertical line.
|
|
|
|
$line .= '|';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we didn't find the thread this commit goes on, start a new thread.
|
|
|
|
// We use "o" to mark the commit for the rendering engine, or "^" to
|
|
|
|
// indicate that there's nothing after it so the line from the commit
|
|
|
|
// upward should not be drawn.
|
|
|
|
|
|
|
|
if (!$found) {
|
|
|
|
if ($this->isHead) {
|
|
|
|
$line .= '^';
|
|
|
|
} else {
|
|
|
|
$line .= 'o';
|
|
|
|
foreach ($graph as $k => $meta) {
|
|
|
|
// Go back across all the lines we've already drawn and add a
|
|
|
|
// "|" to the end, since this is connected to some future commit
|
|
|
|
// we don't know about.
|
|
|
|
for ($jj = strlen($meta['line']); $jj <= $count; $jj++) {
|
|
|
|
$graph[$k]['line'] .= '|';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Update the next commit on this thread to the commit's first parent.
|
|
|
|
// This might have the effect of making a new thread.
|
|
|
|
$threads[$pos] = head($parent_list);
|
|
|
|
|
|
|
|
// If we made a new thread, increase the thread count.
|
|
|
|
$count = max($pos + 1, $count);
|
|
|
|
|
|
|
|
// Now, deal with splits (merges). I picked this terms opposite to the
|
|
|
|
// underlying repository term to confuse you.
|
|
|
|
foreach (array_slice($parent_list, 1) as $parent) {
|
|
|
|
$found = false;
|
|
|
|
|
|
|
|
// Try to find the other parent(s) in our existing threads. If we find
|
|
|
|
// them, split to that thread.
|
|
|
|
|
2012-03-29 22:24:06 +02:00
|
|
|
foreach ($threads as $idx => $thread_commit) {
|
2012-03-24 01:11:15 +01:00
|
|
|
if ($thread_commit == $parent) {
|
|
|
|
$found = true;
|
2012-03-29 22:24:06 +02:00
|
|
|
$splits[] = $idx;
|
2012-03-24 01:11:15 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we didn't find the parent, we don't know about it yet. Find the
|
|
|
|
// first free thread and add it as the "next" commit in that thread.
|
|
|
|
// This might create a new thread.
|
|
|
|
|
|
|
|
if (!$found) {
|
|
|
|
for ($n = 0; $n < $count; $n++) {
|
|
|
|
if (empty($threads[$n])) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$threads[$n] = $parent;
|
|
|
|
$splits[] = $n;
|
|
|
|
$count = max($n + 1, $count);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
$graph[] = array(
|
|
|
|
'line' => $line,
|
|
|
|
'split' => $splits,
|
|
|
|
'join' => $joins,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Render into tags for the behavior.
|
|
|
|
|
|
|
|
foreach ($graph as $k => $meta) {
|
|
|
|
$graph[$k] = javelin_render_tag(
|
|
|
|
'div',
|
|
|
|
array(
|
|
|
|
'sigil' => 'commit-graph',
|
|
|
|
'meta' => $meta,
|
|
|
|
),
|
|
|
|
'');
|
|
|
|
}
|
|
|
|
|
|
|
|
Javelin::initBehavior(
|
|
|
|
'diffusion-commit-graph',
|
|
|
|
array(
|
|
|
|
'count' => $count,
|
|
|
|
));
|
|
|
|
|
|
|
|
return $graph;
|
|
|
|
}
|
|
|
|
|
2011-03-09 02:31:44 +01:00
|
|
|
}
|