+4

src/__phutil_library_map__.php

reviewed

··· 556 556 'DifferentialRevisionViewController' => 'applications/differential/controller/DifferentialRevisionViewController.php', 557 557 'DifferentialSchemaSpec' => 'applications/differential/storage/DifferentialSchemaSpec.php', 558 558 'DifferentialSetDiffPropertyConduitAPIMethod' => 'applications/differential/conduit/DifferentialSetDiffPropertyConduitAPIMethod.php', 559 559 + 'DifferentialStackGraph' => 'applications/differential/edge/DifferentialStackGraph.php', 559 560 'DifferentialStoredCustomField' => 'applications/differential/customfield/DifferentialStoredCustomField.php', 560 561 'DifferentialSubscribersField' => 'applications/differential/customfield/DifferentialSubscribersField.php', 561 562 'DifferentialSummaryField' => 'applications/differential/customfield/DifferentialSummaryField.php', ··· 1599 1600 'PHUICurtainExtension' => 'view/extension/PHUICurtainExtension.php', 1600 1601 'PHUICurtainPanelView' => 'view/layout/PHUICurtainPanelView.php', 1601 1602 'PHUICurtainView' => 'view/layout/PHUICurtainView.php', 1603 1603 + 'PHUIDiffGraphView' => 'infrastructure/diff/view/PHUIDiffGraphView.php', 1602 1604 'PHUIDiffInlineCommentDetailView' => 'infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php', 1603 1605 'PHUIDiffInlineCommentEditView' => 'infrastructure/diff/view/PHUIDiffInlineCommentEditView.php', 1604 1606 'PHUIDiffInlineCommentRowScaffold' => 'infrastructure/diff/view/PHUIDiffInlineCommentRowScaffold.php', ··· 4928 4930 'DifferentialRevisionViewController' => 'DifferentialController', 4929 4931 'DifferentialSchemaSpec' => 'PhabricatorConfigSchemaSpec', 4930 4932 'DifferentialSetDiffPropertyConduitAPIMethod' => 'DifferentialConduitAPIMethod', 4933 4933 + 'DifferentialStackGraph' => 'AbstractDirectedGraph', 4931 4934 'DifferentialStoredCustomField' => 'DifferentialCustomField', 4932 4935 'DifferentialSubscribersField' => 'DifferentialCoreCustomField', 4933 4936 'DifferentialSummaryField' => 'DifferentialCoreCustomField', ··· 6132 6135 'PHUICurtainExtension' => 'Phobject', 6133 6136 'PHUICurtainPanelView' => 'AphrontTagView', 6134 6137 'PHUICurtainView' => 'AphrontTagView', 6138 6138 + 'PHUIDiffGraphView' => 'Phobject', 6135 6139 'PHUIDiffInlineCommentDetailView' => 'PHUIDiffInlineCommentView', 6136 6140 'PHUIDiffInlineCommentEditView' => 'PHUIDiffInlineCommentView', 6137 6141 'PHUIDiffInlineCommentRowScaffold' => 'AphrontView',

+160

src/applications/differential/controller/DifferentialRevisionViewController.php

reviewed

··· 341 341 ->setKey('commits') 342 342 ->appendChild($local_table)); 343 343 344 344 + $stack_graph = id(new DifferentialStackGraph()) 345 345 + ->setSeedRevision($revision) 346 346 + ->loadGraph(); 347 347 + if (!$stack_graph->isEmpty()) { 348 348 + $stack_view = $this->renderStackView($revision, $stack_graph); 349 349 + list($stack_name, $stack_color, $stack_table) = $stack_view; 350 350 + 351 351 + $tab_group->addTab( 352 352 + id(new PHUITabView()) 353 353 + ->setName($stack_name) 354 354 + ->setKey('stack') 355 355 + ->setColor($stack_color) 356 356 + ->appendChild($stack_table)); 357 357 + } 358 358 + 344 359 if ($other_view) { 345 360 $tab_group->addTab( 346 361 id(new PHUITabView()) ··· 1197 1212 ->setShowViewAll(true); 1198 1213 } 1199 1214 1215 1215 + 1216 1216 + private function renderStackView( 1217 1217 + DifferentialRevision $current, 1218 1218 + DifferentialStackGraph $graph) { 1219 1219 + 1220 1220 + $ancestry = $graph->getParentEdges(); 1221 1221 + $viewer = $this->getViewer(); 1222 1222 + 1223 1223 + $revisions = id(new DifferentialRevisionQuery()) 1224 1224 + ->setViewer($viewer) 1225 1225 + ->withPHIDs(array_keys($ancestry)) 1226 1226 + ->execute(); 1227 1227 + $revisions = mpull($revisions, null, 'getPHID'); 1228 1228 + 1229 1229 + $order = id(new PhutilDirectedScalarGraph()) 1230 1230 + ->addNodes($ancestry) 1231 1231 + ->getTopographicallySortedNodes(); 1232 1232 + 1233 1233 + $ancestry = array_select_keys($ancestry, $order); 1234 1234 + 1235 1235 + $traces = id(new PHUIDiffGraphView()) 1236 1236 + ->renderGraph($ancestry); 1237 1237 + 1238 1238 + // Load author handles, and also revision handles for any revisions which 1239 1239 + // we failed to load (they might be policy restricted). 1240 1240 + $handle_phids = mpull($revisions, 'getAuthorPHID'); 1241 1241 + foreach ($order as $phid) { 1242 1242 + if (empty($revisions[$phid])) { 1243 1243 + $handle_phids[] = $phid; 1244 1244 + } 1245 1245 + } 1246 1246 + $handles = $viewer->loadHandles($handle_phids); 1247 1247 + 1248 1248 + $rows = array(); 1249 1249 + $rowc = array(); 1250 1250 + 1251 1251 + $ii = 0; 1252 1252 + $seen = false; 1253 1253 + foreach ($ancestry as $phid => $ignored) { 1254 1254 + $revision = idx($revisions, $phid); 1255 1255 + if ($revision) { 1256 1256 + $status_icon = $revision->getStatusIcon(); 1257 1257 + $status_name = $revision->getStatusDisplayName(); 1258 1258 + 1259 1259 + $status = array( 1260 1260 + id(new PHUIIconView())->setIcon($status_icon), 1261 1261 + ' ', 1262 1262 + $status_name, 1263 1263 + ); 1264 1264 + 1265 1265 + $author = $viewer->renderHandle($revision->getAuthorPHID()); 1266 1266 + $title = phutil_tag( 1267 1267 + 'a', 1268 1268 + array( 1269 1269 + 'href' => $revision->getURI(), 1270 1270 + ), 1271 1271 + array( 1272 1272 + $revision->getMonogram(), 1273 1273 + ' ', 1274 1274 + $revision->getTitle(), 1275 1275 + )); 1276 1276 + } else { 1277 1277 + $status = null; 1278 1278 + $author = null; 1279 1279 + $title = $viewer->renderHandle($phid); 1280 1280 + } 1281 1281 + 1282 1282 + $rows[] = array( 1283 1283 + $traces[$ii++], 1284 1284 + $status, 1285 1285 + $author, 1286 1286 + $title, 1287 1287 + ); 1288 1288 + 1289 1289 + if ($phid == $current->getPHID()) { 1290 1290 + $rowc[] = 'highlighted'; 1291 1291 + } else { 1292 1292 + $rowc[] = null; 1293 1293 + } 1294 1294 + } 1295 1295 + 1296 1296 + $stack_table = id(new AphrontTableView($rows)) 1297 1297 + ->setHeaders( 1298 1298 + array( 1299 1299 + null, 1300 1300 + pht('Status'), 1301 1301 + pht('Author'), 1302 1302 + pht('Revision'), 1303 1303 + )) 1304 1304 + ->setRowClasses($rowc) 1305 1305 + ->setColumnClasses( 1306 1306 + array( 1307 1307 + 'threads', 1308 1308 + null, 1309 1309 + null, 1310 1310 + 'wide', 1311 1311 + )); 1312 1312 + 1313 1313 + // Count how many revisions this one depends on that are not yet closed. 1314 1314 + $seen = array(); 1315 1315 + $look = array($current->getPHID()); 1316 1316 + while ($look) { 1317 1317 + $phid = array_pop($look); 1318 1318 + 1319 1319 + $parents = idx($ancestry, $phid, array()); 1320 1320 + foreach ($parents as $parent) { 1321 1321 + if (isset($seen[$parent])) { 1322 1322 + continue; 1323 1323 + } 1324 1324 + 1325 1325 + $seen[$parent] = $parent; 1326 1326 + $look[] = $parent; 1327 1327 + } 1328 1328 + } 1329 1329 + 1330 1330 + $blocking_count = 0; 1331 1331 + foreach ($seen as $parent) { 1332 1332 + if ($parent == $current->getPHID()) { 1333 1333 + continue; 1334 1334 + } 1335 1335 + 1336 1336 + $revision = idx($revisions, $parent); 1337 1337 + if (!$revision) { 1338 1338 + continue; 1339 1339 + } 1340 1340 + 1341 1341 + if ($revision->isClosed()) { 1342 1342 + continue; 1343 1343 + } 1344 1344 + 1345 1345 + $blocking_count++; 1346 1346 + } 1347 1347 + 1348 1348 + if (!$blocking_count) { 1349 1349 + $stack_name = pht('Stack'); 1350 1350 + $stack_color = null; 1351 1351 + } else { 1352 1352 + $stack_name = pht( 1353 1353 + 'Stack (%s Open)', 1354 1354 + new PhutilNumber($blocking_count)); 1355 1355 + $stack_color = PHUIListItemView::STATUS_FAIL; 1356 1356 + } 1357 1357 + 1358 1358 + return array($stack_name, $stack_color, $stack_table); 1359 1359 + } 1200 1360 1201 1361 }

-18

src/applications/differential/customfield/DifferentialChildRevisionsField.php

reviewed

··· 19 19 return pht('Lists revisions this one is depended on by.'); 20 20 } 21 21 22 22 - public function shouldAppearInPropertyView() { 23 23 - return true; 24 24 - } 25 25 - 26 26 - public function renderPropertyViewLabel() { 27 27 - return $this->getFieldName(); 28 28 - } 29 29 - 30 30 - public function getRequiredHandlePHIDsForPropertyView() { 31 31 - return PhabricatorEdgeQuery::loadDestinationPHIDs( 32 32 - $this->getObject()->getPHID(), 33 33 - DifferentialRevisionDependedOnByRevisionEdgeType::EDGECONST); 34 34 - } 35 35 - 36 36 - public function renderPropertyViewValue(array $handles) { 37 37 - return $this->renderHandleList($handles); 38 38 - } 39 39 - 40 22 }

-18

src/applications/differential/customfield/DifferentialParentRevisionsField.php

reviewed

··· 23 23 return pht('Lists revisions this one depends on.'); 24 24 } 25 25 26 26 - public function shouldAppearInPropertyView() { 27 27 - return true; 28 28 - } 29 29 - 30 30 - public function renderPropertyViewLabel() { 31 31 - return $this->getFieldName(); 32 32 - } 33 33 - 34 34 - public function getRequiredHandlePHIDsForPropertyView() { 35 35 - return PhabricatorEdgeQuery::loadDestinationPHIDs( 36 36 - $this->getObject()->getPHID(), 37 37 - DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST); 38 38 - } 39 39 - 40 40 - public function renderPropertyViewValue(array $handles) { 41 41 - return $this->renderHandleList($handles); 42 42 - } 43 43 - 44 26 public function getProTips() { 45 27 return array( 46 28 pht(

+58

src/applications/differential/edge/DifferentialStackGraph.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class DifferentialStackGraph 4 4 + extends AbstractDirectedGraph { 5 5 + 6 6 + private $parentEdges = array(); 7 7 + private $childEdges = array(); 8 8 + 9 9 + public function setSeedRevision(DifferentialRevision $revision) { 10 10 + return $this->addNodes( 11 11 + array( 12 12 + '<seed>' => array($revision->getPHID()), 13 13 + )); 14 14 + } 15 15 + 16 16 + public function isEmpty() { 17 17 + return (count($this->getNodes()) <= 2); 18 18 + } 19 19 + 20 20 + public function getParentEdges() { 21 21 + return $this->parentEdges; 22 22 + } 23 23 + 24 24 + protected function loadEdges(array $nodes) { 25 25 + $query = id(new PhabricatorEdgeQuery()) 26 26 + ->withSourcePHIDs($nodes) 27 27 + ->withEdgeTypes( 28 28 + array( 29 29 + DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST, 30 30 + DifferentialRevisionDependedOnByRevisionEdgeType::EDGECONST, 31 31 + )); 32 32 + 33 33 + $query->execute(); 34 34 + 35 35 + $map = array(); 36 36 + foreach ($nodes as $node) { 37 37 + $parents = $query->getDestinationPHIDs( 38 38 + array($node), 39 39 + array( 40 40 + DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST, 41 41 + )); 42 42 + 43 43 + $children = $query->getDestinationPHIDs( 44 44 + array($node), 45 45 + array( 46 46 + DifferentialRevisionDependedOnByRevisionEdgeType::EDGECONST, 47 47 + )); 48 48 + 49 49 + $this->parentEdges[$node] = $parents; 50 50 + $this->childEdges[$node] = $children; 51 51 + 52 52 + $map[$node] = array_values(array_fuse($parents) + array_fuse($children)); 53 53 + } 54 54 + 55 55 + return $map; 56 56 + } 57 57 + 58 58 + }

+29

src/applications/differential/storage/DifferentialRevision.php

reviewed

··· 136 136 return "D{$id}"; 137 137 } 138 138 139 139 + public function getURI() { 140 140 + return '/'.$this->getMonogram(); 141 141 + } 142 142 + 139 143 public function setTitle($title) { 140 144 $this->title = $title; 141 145 if (!$this->getID()) { ··· 424 428 425 429 public function isClosed() { 426 430 return DifferentialRevisionStatus::isClosedStatus($this->getStatus()); 431 431 + } 432 432 + 433 433 + public function getStatusIcon() { 434 434 + $map = array( 435 435 + ArcanistDifferentialRevisionStatus::NEEDS_REVIEW 436 436 + => 'fa-code grey', 437 437 + ArcanistDifferentialRevisionStatus::NEEDS_REVISION 438 438 + => 'fa-refresh red', 439 439 + ArcanistDifferentialRevisionStatus::CHANGES_PLANNED 440 440 + => 'fa-headphones red', 441 441 + ArcanistDifferentialRevisionStatus::ACCEPTED 442 442 + => 'fa-check green', 443 443 + ArcanistDifferentialRevisionStatus::CLOSED 444 444 + => 'fa-check-square-o black', 445 445 + ArcanistDifferentialRevisionStatus::ABANDONED 446 446 + => 'fa-plane black', 447 447 + ); 448 448 + 449 449 + return idx($map, $this->getStatus()); 450 450 + } 451 451 + 452 452 + public function getStatusDisplayName() { 453 453 + $status = $this->getStatus(); 454 454 + return ArcanistDifferentialRevisionStatus::getNameForRevisionStatus( 455 455 + $status); 427 456 } 428 457 429 458 public function getFlag(PhabricatorUser $viewer) {

+6 -25

src/applications/differential/view/DifferentialRevisionListView.php

reviewed

··· 104 104 105 105 $modified = $revision->getDateModified(); 106 106 107 107 - $status = $revision->getStatus(); 108 108 - $status_name = 109 109 - ArcanistDifferentialRevisionStatus::getNameForRevisionStatus($status); 110 110 - 111 107 if (isset($icons['flag'])) { 112 108 $item->addHeadIcon($icons['flag']); 113 109 } ··· 155 151 $item->addAttribute(pht('Reviewers: %s', $reviewers)); 156 152 $item->setEpoch($revision->getDateModified()); 157 153 158 158 - switch ($status) { 159 159 - case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW: 160 160 - $item->setStatusIcon('fa-code grey', pht('Needs Review')); 161 161 - break; 162 162 - case ArcanistDifferentialRevisionStatus::NEEDS_REVISION: 163 163 - $item->setStatusIcon('fa-refresh red', pht('Needs Revision')); 164 164 - break; 165 165 - case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED: 166 166 - $item->setStatusIcon('fa-headphones red', pht('Changes Planned')); 167 167 - break; 168 168 - case ArcanistDifferentialRevisionStatus::ACCEPTED: 169 169 - $item->setStatusIcon('fa-check green', pht('Accepted')); 170 170 - break; 171 171 - case ArcanistDifferentialRevisionStatus::CLOSED: 172 172 - $item->setDisabled(true); 173 173 - $item->setStatusIcon('fa-check-square-o black', pht('Closed')); 174 174 - break; 175 175 - case ArcanistDifferentialRevisionStatus::ABANDONED: 176 176 - $item->setDisabled(true); 177 177 - $item->setStatusIcon('fa-plane black', pht('Abandoned')); 178 178 - break; 154 154 + if ($revision->isClosed()) { 155 155 + $item->setDisabled(true); 179 156 } 157 157 + 158 158 + $item->setStatusIcon( 159 159 + $revision->getStatusIcon(), 160 160 + $revision->getStatusDisplayName()); 180 161 181 162 $list->addItem($item); 182 163 }

+4 -163

src/applications/diffusion/view/DiffusionHistoryTableView.php

reviewed

··· 82 82 83 83 $graph = null; 84 84 if ($this->parents) { 85 85 - $graph = $this->renderGraph(); 85 85 + $graph = id(new PHUIDiffGraphView()) 86 86 + ->setIsHead($this->isHead) 87 87 + ->setIsTail($this->isTail) 88 88 + ->renderGraph($this->parents); 86 89 } 87 90 88 91 $show_builds = PhabricatorApplication::isClassInstalledForViewer( ··· 217 220 false, 218 221 )); 219 222 return $view->render(); 220 220 - } 221 221 - 222 222 - /** 223 223 - * Draw a merge/branch graph from the parent revision data. We're basically 224 224 - * building up a bunch of strings like this: 225 225 - * 226 226 - * ^ 227 227 - * |^ 228 228 - * o| 229 229 - * |o 230 230 - * o 231 231 - * 232 232 - * ...which form an ASCII representation of the graph we eventually want to 233 233 - * draw. 234 234 - * 235 235 - * NOTE: The actual implementation is black magic. 236 236 - */ 237 237 - private function renderGraph() { 238 238 - // This keeps our accumulated information about each line of the 239 239 - // merge/branch graph. 240 240 - $graph = array(); 241 241 - 242 242 - // This holds the next commit we're looking for in each column of the 243 243 - // graph. 244 244 - $threads = array(); 245 245 - 246 246 - // This is the largest number of columns any row has, i.e. the width of 247 247 - // the graph. 248 248 - $count = 0; 249 249 - 250 250 - foreach ($this->history as $key => $history) { 251 251 - $joins = array(); 252 252 - $splits = array(); 253 253 - 254 254 - $parent_list = $this->parents[$history->getCommitIdentifier()]; 255 255 - 256 256 - // Look for some thread which has this commit as the next commit. If 257 257 - // we find one, this commit goes on that thread. Otherwise, this commit 258 258 - // goes on a new thread. 259 259 - 260 260 - $line = ''; 261 261 - $found = false; 262 262 - $pos = count($threads); 263 263 - for ($n = 0; $n < $count; $n++) { 264 264 - if (empty($threads[$n])) { 265 265 - $line .= ' '; 266 266 - continue; 267 267 - } 268 268 - 269 269 - if ($threads[$n] == $history->getCommitIdentifier()) { 270 270 - if ($found) { 271 271 - $line .= ' '; 272 272 - $joins[] = $n; 273 273 - unset($threads[$n]); 274 274 - } else { 275 275 - $line .= 'o'; 276 276 - $found = true; 277 277 - $pos = $n; 278 278 - } 279 279 - } else { 280 280 - 281 281 - // We render a "|" for any threads which have a commit that we haven't 282 282 - // seen yet, this is later drawn as a vertical line. 283 283 - $line .= '|'; 284 284 - } 285 285 - } 286 286 - 287 287 - // If we didn't find the thread this commit goes on, start a new thread. 288 288 - // We use "o" to mark the commit for the rendering engine, or "^" to 289 289 - // indicate that there's nothing after it so the line from the commit 290 290 - // upward should not be drawn. 291 291 - 292 292 - if (!$found) { 293 293 - if ($this->isHead) { 294 294 - $line .= '^'; 295 295 - } else { 296 296 - $line .= 'o'; 297 297 - foreach ($graph as $k => $meta) { 298 298 - // Go back across all the lines we've already drawn and add a 299 299 - // "|" to the end, since this is connected to some future commit 300 300 - // we don't know about. 301 301 - for ($jj = strlen($meta['line']); $jj <= $count; $jj++) { 302 302 - $graph[$k]['line'] .= '|'; 303 303 - } 304 304 - } 305 305 - } 306 306 - } 307 307 - 308 308 - // Update the next commit on this thread to the commit's first parent. 309 309 - // This might have the effect of making a new thread. 310 310 - $threads[$pos] = head($parent_list); 311 311 - 312 312 - // If we made a new thread, increase the thread count. 313 313 - $count = max($pos + 1, $count); 314 314 - 315 315 - // Now, deal with splits (merges). I picked this terms opposite to the 316 316 - // underlying repository term to confuse you. 317 317 - foreach (array_slice($parent_list, 1) as $parent) { 318 318 - $found = false; 319 319 - 320 320 - // Try to find the other parent(s) in our existing threads. If we find 321 321 - // them, split to that thread. 322 322 - 323 323 - foreach ($threads as $idx => $thread_commit) { 324 324 - if ($thread_commit == $parent) { 325 325 - $found = true; 326 326 - $splits[] = $idx; 327 327 - } 328 328 - } 329 329 - 330 330 - // If we didn't find the parent, we don't know about it yet. Find the 331 331 - // first free thread and add it as the "next" commit in that thread. 332 332 - // This might create a new thread. 333 333 - 334 334 - if (!$found) { 335 335 - for ($n = 0; $n < $count; $n++) { 336 336 - if (empty($threads[$n])) { 337 337 - break; 338 338 - } 339 339 - } 340 340 - $threads[$n] = $parent; 341 341 - $splits[] = $n; 342 342 - $count = max($n + 1, $count); 343 343 - } 344 344 - } 345 345 - 346 346 - $graph[] = array( 347 347 - 'line' => $line, 348 348 - 'split' => $splits, 349 349 - 'join' => $joins, 350 350 - ); 351 351 - } 352 352 - 353 353 - // If this is the last page in history, replace the "o" with an "x" so we 354 354 - // do not draw a connecting line downward, and replace "^" with an "X" for 355 355 - // repositories with exactly one commit. 356 356 - if ($this->isTail && $graph) { 357 357 - $last = array_pop($graph); 358 358 - $last['line'] = str_replace('o', 'x', $last['line']); 359 359 - $last['line'] = str_replace('^', 'X', $last['line']); 360 360 - $graph[] = $last; 361 361 - } 362 362 - 363 363 - // Render into tags for the behavior. 364 364 - 365 365 - foreach ($graph as $k => $meta) { 366 366 - $graph[$k] = javelin_tag( 367 367 - 'div', 368 368 - array( 369 369 - 'sigil' => 'commit-graph', 370 370 - 'meta' => $meta, 371 371 - ), 372 372 - ''); 373 373 - } 374 374 - 375 375 - Javelin::initBehavior( 376 376 - 'diffusion-commit-graph', 377 377 - array( 378 378 - 'count' => $count, 379 379 - )); 380 380 - 381 381 - return $graph; 382 223 } 383 224 384 225 }

+171

src/infrastructure/diff/view/PHUIDiffGraphView.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class PHUIDiffGraphView extends Phobject { 4 4 + 5 5 + private $isHead = true; 6 6 + private $isTail = true; 7 7 + 8 8 + public function setIsHead($is_head) { 9 9 + $this->isHead = $is_head; 10 10 + return $this; 11 11 + } 12 12 + 13 13 + public function getIsHead() { 14 14 + return $this->isHead; 15 15 + } 16 16 + 17 17 + public function setIsTail($is_tail) { 18 18 + $this->isTail = $is_tail; 19 19 + return $this; 20 20 + } 21 21 + 22 22 + public function getIsTail() { 23 23 + return $this->isTail; 24 24 + } 25 25 + 26 26 + public function renderGraph(array $parents) { 27 27 + // This keeps our accumulated information about each line of the 28 28 + // merge/branch graph. 29 29 + $graph = array(); 30 30 + 31 31 + // This holds the next commit we're looking for in each column of the 32 32 + // graph. 33 33 + $threads = array(); 34 34 + 35 35 + // This is the largest number of columns any row has, i.e. the width of 36 36 + // the graph. 37 37 + $count = 0; 38 38 + 39 39 + foreach ($parents as $cursor => $parent_list) { 40 40 + $joins = array(); 41 41 + $splits = array(); 42 42 + 43 43 + // Look for some thread which has this commit as the next commit. If 44 44 + // we find one, this commit goes on that thread. Otherwise, this commit 45 45 + // goes on a new thread. 46 46 + 47 47 + $line = ''; 48 48 + $found = false; 49 49 + $pos = count($threads); 50 50 + for ($n = 0; $n < $count; $n++) { 51 51 + if (empty($threads[$n])) { 52 52 + $line .= ' '; 53 53 + continue; 54 54 + } 55 55 + 56 56 + if ($threads[$n] == $cursor) { 57 57 + if ($found) { 58 58 + $line .= ' '; 59 59 + $joins[] = $n; 60 60 + unset($threads[$n]); 61 61 + } else { 62 62 + $line .= 'o'; 63 63 + $found = true; 64 64 + $pos = $n; 65 65 + } 66 66 + } else { 67 67 + 68 68 + // We render a "|" for any threads which have a commit that we haven't 69 69 + // seen yet, this is later drawn as a vertical line. 70 70 + $line .= '|'; 71 71 + } 72 72 + } 73 73 + 74 74 + // If we didn't find the thread this commit goes on, start a new thread. 75 75 + // We use "o" to mark the commit for the rendering engine, or "^" to 76 76 + // indicate that there's nothing after it so the line from the commit 77 77 + // upward should not be drawn. 78 78 + 79 79 + if (!$found) { 80 80 + if ($this->getIsHead()) { 81 81 + $line .= '^'; 82 82 + } else { 83 83 + $line .= 'o'; 84 84 + foreach ($graph as $k => $meta) { 85 85 + // Go back across all the lines we've already drawn and add a 86 86 + // "|" to the end, since this is connected to some future commit 87 87 + // we don't know about. 88 88 + for ($jj = strlen($meta['line']); $jj <= $count; $jj++) { 89 89 + $graph[$k]['line'] .= '|'; 90 90 + } 91 91 + } 92 92 + } 93 93 + } 94 94 + 95 95 + // Update the next commit on this thread to the commit's first parent. 96 96 + // This might have the effect of making a new thread. 97 97 + $threads[$pos] = head($parent_list); 98 98 + 99 99 + // If we made a new thread, increase the thread count. 100 100 + $count = max($pos + 1, $count); 101 101 + 102 102 + // Now, deal with splits (merges). I picked this terms opposite to the 103 103 + // underlying repository term to confuse you. 104 104 + foreach (array_slice($parent_list, 1) as $parent) { 105 105 + $found = false; 106 106 + 107 107 + // Try to find the other parent(s) in our existing threads. If we find 108 108 + // them, split to that thread. 109 109 + 110 110 + foreach ($threads as $idx => $thread_commit) { 111 111 + if ($thread_commit == $parent) { 112 112 + $found = true; 113 113 + $splits[] = $idx; 114 114 + } 115 115 + } 116 116 + 117 117 + // If we didn't find the parent, we don't know about it yet. Find the 118 118 + // first free thread and add it as the "next" commit in that thread. 119 119 + // This might create a new thread. 120 120 + 121 121 + if (!$found) { 122 122 + for ($n = 0; $n < $count; $n++) { 123 123 + if (empty($threads[$n])) { 124 124 + break; 125 125 + } 126 126 + } 127 127 + $threads[$n] = $parent; 128 128 + $splits[] = $n; 129 129 + $count = max($n + 1, $count); 130 130 + } 131 131 + } 132 132 + 133 133 + $graph[] = array( 134 134 + 'line' => $line, 135 135 + 'split' => $splits, 136 136 + 'join' => $joins, 137 137 + ); 138 138 + } 139 139 + 140 140 + // If this is the last page in history, replace the "o" with an "x" so we 141 141 + // do not draw a connecting line downward, and replace "^" with an "X" for 142 142 + // repositories with exactly one commit. 143 143 + if ($this->getIsTail() && $graph) { 144 144 + $last = array_pop($graph); 145 145 + $last['line'] = str_replace('o', 'x', $last['line']); 146 146 + $last['line'] = str_replace('^', 'X', $last['line']); 147 147 + $graph[] = $last; 148 148 + } 149 149 + 150 150 + // Render into tags for the behavior. 151 151 + 152 152 + foreach ($graph as $k => $meta) { 153 153 + $graph[$k] = javelin_tag( 154 154 + 'div', 155 155 + array( 156 156 + 'sigil' => 'commit-graph', 157 157 + 'meta' => $meta, 158 158 + ), 159 159 + ''); 160 160 + } 161 161 + 162 162 + Javelin::initBehavior( 163 163 + 'diffusion-commit-graph', 164 164 + array( 165 165 + 'count' => $count, 166 166 + )); 167 167 + 168 168 + return $graph; 169 169 + } 170 170 + 171 171 + }

+18 -1

src/view/phui/PHUITabView.php

reviewed

··· 6 6 private $key; 7 7 private $keyLocked; 8 8 private $contentID; 9 9 + private $color; 9 10 10 11 public function setKey($key) { 11 12 if ($this->keyLocked) { ··· 58 59 return $this->contentID; 59 60 } 60 61 62 62 + public function setColor($color) { 63 63 + $this->color = $color; 64 64 + return $this; 65 65 + } 66 66 + 67 67 + public function getColor() { 68 68 + return $this->color; 69 69 + } 70 70 + 61 71 public function newMenuItem() { 62 62 - return id(new PHUIListItemView()) 72 72 + $item = id(new PHUIListItemView()) 63 73 ->setName($this->getName()) 64 74 ->setKey($this->getKey()) 65 75 ->setType(PHUIListItemView::TYPE_LINK) ··· 69 79 array( 70 80 'tabKey' => $this->getKey(), 71 81 )); 82 82 + 83 83 + $color = $this->getColor(); 84 84 + if ($color !== null) { 85 85 + $item->setStatusColor($color); 86 86 + } 87 87 + 88 88 + return $item; 72 89 } 73 90 74 91 }