Page MenuHomePhabricator
Files F15455861

D14974.id36176.diff
No OneTemporary
Actions

D14974.id36176.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
'differential.pkg.css' => '2de124c9',
'differential.pkg.js' => '64e69521',
'diffusion.pkg.css' => 'f45955ed',
- 'diffusion.pkg.js' => 'ca1c8b5a',
+ 'diffusion.pkg.js' => '0b45285e',
'maniphest.pkg.css' => '4845691a',
'maniphest.pkg.js' => '949a7498',
'rsrc/css/aphront/aphront-bars.css' => '231ac33c',
@@ -391,7 +391,7 @@
'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => 'b42eddc7',
'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'd835b03a',
'rsrc/js/application/diffusion/behavior-commit-branches.js' => 'bdaf4d04',
- 'rsrc/js/application/diffusion/behavior-commit-graph.js' => '9007c197',
+ 'rsrc/js/application/diffusion/behavior-commit-graph.js' => 'd184b844',
'rsrc/js/application/diffusion/behavior-jump-to.js' => '73d09eef',
'rsrc/js/application/diffusion/behavior-load-blame.js' => '42126667',
'rsrc/js/application/diffusion/behavior-locate-file.js' => '6d3e1947',
@@ -598,7 +598,7 @@
'javelin-behavior-differential-toggle-files' => 'ca3f91eb',
'javelin-behavior-differential-user-select' => 'a8d8459d',
'javelin-behavior-diffusion-commit-branches' => 'bdaf4d04',
- 'javelin-behavior-diffusion-commit-graph' => '9007c197',
+ 'javelin-behavior-diffusion-commit-graph' => 'd184b844',
'javelin-behavior-diffusion-jump-to' => '73d09eef',
'javelin-behavior-diffusion-locate-file' => '6d3e1947',
'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
@@ -1523,11 +1523,6 @@
'javelin-dom',
'javelin-workflow',
),
- '9007c197' => array(
- 'javelin-behavior',
- 'javelin-dom',
- 'javelin-stratcom',
- ),
'901935ef' => array(
'javelin-behavior',
'javelin-dom',
@@ -1853,6 +1848,11 @@
'javelin-workflow',
'phabricator-drag-and-drop-file-upload',
),
+ 'd184b844' => array(
+ 'javelin-behavior',
+ 'javelin-dom',
+ 'javelin-stratcom',
+ ),
'd19198c8' => array(
'javelin-install',
'javelin-dom',
diff --git a/src/applications/diffusion/controller/DiffusionHistoryController.php b/src/applications/diffusion/controller/DiffusionHistoryController.php
--- a/src/applications/diffusion/controller/DiffusionHistoryController.php
+++ b/src/applications/diffusion/controller/DiffusionHistoryController.php
@@ -52,6 +52,7 @@
if ($show_graph) {
$history_table->setParents($history_results['parents']);
$history_table->setIsHead(!$pager->getOffset());
+ $history_table->setIsTail(!$pager->getHasMorePages());
}
$history_panel = new PHUIObjectBoxView();
diff --git a/src/applications/diffusion/view/DiffusionHistoryTableView.php b/src/applications/diffusion/view/DiffusionHistoryTableView.php
--- a/src/applications/diffusion/view/DiffusionHistoryTableView.php
+++ b/src/applications/diffusion/view/DiffusionHistoryTableView.php
@@ -6,6 +6,7 @@
private $revisions = array();
private $handles = array();
private $isHead;
+ private $isTail;
private $parents;
public function setHistory(array $history) {
@@ -60,6 +61,11 @@
return $this;
}
+ public function setIsTail($is_tail) {
+ $this->isTail = $is_tail;
+ return $this;
+ }
+
public function render() {
$drequest = $this->getDiffusionRequest();
@@ -344,6 +350,14 @@
);
}
+ // If this is the last page in history, replace the "o" with an "x" so we
+ // do not draw a connecting line downward.
+ if ($this->isTail && $graph) {
+ $last = array_pop($graph);
+ $last['line'] = str_replace('o', 'x', $last['line']);
+ $graph[] = $last;
+ }
+
// Render into tags for the behavior.
foreach ($graph as $k => $meta) {
diff --git a/src/view/phui/PHUIPagerView.php b/src/view/phui/PHUIPagerView.php
--- a/src/view/phui/PHUIPagerView.php
+++ b/src/view/phui/PHUIPagerView.php
@@ -58,6 +58,10 @@
return $this->hasMorePages;
}
+ public function getHasMorePages() {
+ return $this->hasMorePages;
+ }
+
public function setSurroundingPages($pages) {
$this->surroundingPages = max(0, $pages);
return $this;
diff --git a/webroot/rsrc/js/application/diffusion/behavior-commit-graph.js b/webroot/rsrc/js/application/diffusion/behavior-commit-graph.js
--- a/webroot/rsrc/js/application/diffusion/behavior-commit-graph.js
+++ b/webroot/rsrc/js/application/diffusion/behavior-commit-graph.js
@@ -52,7 +52,7 @@
return (col * cell) + (cell / 2);
};
- var h = 30;
+ var h = 32;
var w = cell * config.count;
var canvas = JX.$N('canvas', {width: w, height: h});
@@ -117,16 +117,13 @@
case 'o':
case '^':
case '|':
- if (c == 'o' || c == '^') {
- origin = xpos(jj);
- }
-
+ case 'x':
cxt.beginPath();
cxt.moveTo(xpos(jj), (c == '^' ? h/2 : 0));
- cxt.lineTo(xpos(jj), h);
+ cxt.lineTo(xpos(jj), (c == 'x' ? h/2 : h));
lstroke(jj);
- if (c == 'o' || c == '^') {
+ if (c == 'o' || c == '^' || c == 'x') {
cxt.beginPath();
cxt.arc(xpos(jj), h/2, 3, 0, 2 * Math.PI, true);
fstroke(jj);

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 31, 5:21 AM (2 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7656711
Default Alt Text
D14974.id36176.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility