Modernize Diffusion "change" view

Summary:
  - Kicks it out to full width.
  - More useful header/crumbs/properties/actions (needs some more work).
  - Works for public repositories.
  - Fix a bug where the "rX" crumb would lose the branch you're on.

Test Plan: See screenshot.

Reviewers: btrahan

Reviewed By: btrahan

CC: aran

Differential Revision: https://secure.phabricator.com/D7063
This commit is contained in:
epriestley
2013-09-23 12:54:12 -07:00
parent e7fbfb1eac
commit b3fa9d0c2f
6 changed files with 108 additions and 19 deletions

View File

@@ -194,10 +194,14 @@ final class DifferentialChangesetListView extends AphrontView {
)); ));
} }
$header = null;
if ($this->getTitle() !== null) {
$header = id(new PHUIHeaderView())
->setHeader($this->getTitle());
}
return array( return array(
id(new PHUIHeaderView()) $header,
->setHeader($this->getTitle())
->render(),
phutil_tag( phutil_tag(
'div', 'div',
array( array(

View File

@@ -65,7 +65,7 @@ abstract class DiffusionBrowseController extends DiffusionController {
$header = id(new PHUIHeaderView()) $header = id(new PHUIHeaderView())
->setUser($viewer) ->setUser($viewer)
->setHeader($this->renderPathLinks($drequest)) ->setHeader($this->renderPathLinks($drequest, 'browse'))
->setPolicyObject($drequest->getRepository()); ->setPolicyObject($drequest->getRepository());
return $header; return $header;

View File

@@ -2,8 +2,13 @@
final class DiffusionChangeController extends DiffusionController { final class DiffusionChangeController extends DiffusionController {
public function shouldAllowPublic() {
return true;
}
public function processRequest() { public function processRequest() {
$drequest = $this->diffusionRequest; $drequest = $this->diffusionRequest;
$viewer = $this->getRequest()->getUser();
$content = array(); $content = array();
@@ -11,7 +16,8 @@ final class DiffusionChangeController extends DiffusionController {
'diffusion.diffquery', 'diffusion.diffquery',
array( array(
'commit' => $drequest->getCommit(), 'commit' => $drequest->getCommit(),
'path' => $drequest->getPath())); 'path' => $drequest->getPath(),
));
$drequest->setCommit($data['effectiveCommit']); $drequest->setCommit($data['effectiveCommit']);
$raw_changes = ArcanistDiffChange::newFromConduit($data['changes']); $raw_changes = ArcanistDiffChange::newFromConduit($data['changes']);
$diff = DifferentialDiff::newFromRawChanges($raw_changes); $diff = DifferentialDiff::newFromRawChanges($raw_changes);
@@ -31,7 +37,6 @@ final class DiffusionChangeController extends DiffusionController {
); );
$changeset_view = new DifferentialChangesetListView(); $changeset_view = new DifferentialChangesetListView();
$changeset_view->setTitle(DiffusionView::nameCommit($repository, $commit));
$changeset_view->setChangesets($changesets); $changeset_view->setChangesets($changesets);
$changeset_view->setVisibleChangesets($changesets); $changeset_view->setVisibleChangesets($changesets);
$changeset_view->setRenderingReferences( $changeset_view->setRenderingReferences(
@@ -45,13 +50,13 @@ final class DiffusionChangeController extends DiffusionController {
'view' => 'raw', 'view' => 'raw',
), ),
); );
$right_uri = $drequest->generateURI($raw_params); $right_uri = $drequest->generateURI($raw_params);
$raw_params['params']['before'] = $drequest->getRawCommit(); $raw_params['params']['before'] = $drequest->getRawCommit();
$left_uri = $drequest->generateURI($raw_params); $left_uri = $drequest->generateURI($raw_params);
$changeset_view->setRawFileURIs($left_uri, $right_uri); $changeset_view->setRawFileURIs($left_uri, $right_uri);
$changeset_view->setRenderURI( $changeset_view->setRenderURI('/diffusion/'.$callsign.'/diff/');
'/diffusion/'.$callsign.'/diff/');
$changeset_view->setWhitespace( $changeset_view->setWhitespace(
DifferentialChangesetParser::WHITESPACE_SHOW_ALL); DifferentialChangesetParser::WHITESPACE_SHOW_ALL);
$changeset_view->setUser($this->getRequest()->getUser()); $changeset_view->setUser($this->getRequest()->getUser());
@@ -61,22 +66,94 @@ final class DiffusionChangeController extends DiffusionController {
require_celerity_resource('differential-core-view-css'); require_celerity_resource('differential-core-view-css');
$content[] = $changeset_view->render(); $content[] = $changeset_view->render();
$nav = $this->buildSideNav('change', true);
$nav->appendChild($content);
$crumbs = $this->buildCrumbs( $crumbs = $this->buildCrumbs(
array( array(
'branch' => true, 'branch' => true,
'path' => true, 'path' => true,
'view' => 'change', 'view' => 'change',
)); ));
$nav->setCrumbs($crumbs);
$links = $this->renderPathLinks($drequest);
$header = id(new PHUIHeaderView())
->setHeader($links)
->setUser($viewer)
->setPolicyObject($drequest->getRepository());
$actions = $this->buildActionView($drequest);
$properties = $this->buildPropertyView($drequest);
return $this->buildApplicationPage( return $this->buildApplicationPage(
$nav, array(
$crumbs,
$header,
$actions,
$properties,
$content,
),
array( array(
'title' => pht('Change'), 'title' => pht('Change'),
'device' => true,
)); ));
} }
private function buildActionView(DiffusionRequest $drequest) {
$viewer = $this->getRequest()->getUser();
$view = id(new PhabricatorActionListView())
->setUser($viewer);
$history_uri = $drequest->generateURI(
array(
'action' => 'history',
));
$browse_uri = $drequest->generateURI(
array(
'action' => 'browse',
));
$view->addAction(
id(new PhabricatorActionView())
->setName(pht('View History'))
->setHref($history_uri)
->setIcon('history'));
$history_uri = $drequest->generateURI(
array(
'action' => 'browse',
));
$view->addAction(
id(new PhabricatorActionView())
->setName(pht('Browse Content'))
->setHref($browse_uri)
->setIcon('file'));
return $view;
}
protected function buildPropertyView(DiffusionRequest $drequest) {
$viewer = $this->getRequest()->getUser();
$view = id(new PhabricatorPropertyListView())
->setUser($viewer);
$stable_commit = $drequest->getStableCommitName();
$callsign = $drequest->getRepository()->getCallsign();
$view->addProperty(
pht('Commit'),
phutil_tag(
'a',
array(
'href' => $drequest->generateURI(
array(
'action' => 'commit',
'commit' => $stable_commit,
)),
),
$drequest->getRepository()->formatCommitName($stable_commit)));
return $view;
}
} }

View File

@@ -122,7 +122,12 @@ abstract class DiffusionController extends PhabricatorController {
$crumb_list[] = $crumb; $crumb_list[] = $crumb;
return $crumb_list; return $crumb_list;
} }
$crumb->setHref("/diffusion/{$callsign}/"); $crumb->setHref(
$drequest->generateURI(
array(
'action' => 'branch',
'path' => '/',
)));
$crumb_list[] = $crumb; $crumb_list[] = $crumb;
$raw_commit = $drequest->getRawCommit(); $raw_commit = $drequest->getRawCommit();
@@ -187,9 +192,7 @@ abstract class DiffusionController extends PhabricatorController {
break; break;
case 'change': case 'change':
$view_name = pht('Change'); $view_name = pht('Change');
$crumb_list[] = $crumb->setName( break;
hsprintf('%s (%s)', $path, $commit_link));
return $crumb_list;
} }
$uri_params = array( $uri_params = array(
@@ -199,7 +202,7 @@ abstract class DiffusionController extends PhabricatorController {
$crumb = id(new PhabricatorCrumbView()) $crumb = id(new PhabricatorCrumbView())
->setName($view_name); ->setName($view_name);
if ($view == 'browse') { if ($view == 'browse' || $view == 'change') {
$crumb_list[] = $crumb; $crumb_list[] = $crumb;
return $crumb_list; return $crumb_list;
} }

View File

@@ -2,6 +2,10 @@
final class DiffusionDiffController extends DiffusionController { final class DiffusionDiffController extends DiffusionController {
public function shouldAllowPublic() {
return true;
}
public function willProcessRequest(array $data) { public function willProcessRequest(array $data) {
$data = $data + array( $data = $data + array(
'dblob' => $this->getRequest()->getStr('ref'), 'dblob' => $this->getRequest()->getStr('ref'),

View File

@@ -371,7 +371,8 @@ abstract class DiffusionRequest {
* and formatting to the URI. Parameters are: * and formatting to the URI. Parameters are:
* *
* - `action` One of `history`, `browse`, `change`, `lastmodified`, * - `action` One of `history`, `browse`, `change`, `lastmodified`,
* `branch` or `revision-ref`. The action specified by the URI. * `branch`, `tags`, `branches`, or `revision-ref`. The action specified
* by the URI.
* - `callsign` Repository callsign. * - `callsign` Repository callsign.
* - `branch` Optional if action is not `branch`, branch name. * - `branch` Optional if action is not `branch`, branch name.
* - `path` Optional, path to file. * - `path` Optional, path to file.