mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-10 00:42:41 +01:00
Add links to empty result in Diffusion
Summary: I think that these are the only links that are useful - commit which deleted the path and last version of the path. Test Plan: Display deleted path, click on links. Reviewers: epriestley Reviewed By: epriestley CC: aran, epriestley Differential Revision: https://secure.phabricator.com/D1536
This commit is contained in:
parent
29337a9b3a
commit
82c6f275bd
5 changed files with 122 additions and 61 deletions
|
@ -268,6 +268,7 @@ phutil_register_library_map(array(
|
|||
'DiffusionController' => 'applications/diffusion/controller/base',
|
||||
'DiffusionDiffController' => 'applications/diffusion/controller/diff',
|
||||
'DiffusionDiffQuery' => 'applications/diffusion/query/diff/base',
|
||||
'DiffusionEmptyResultView' => 'applications/diffusion/view/emptyresult',
|
||||
'DiffusionFileContent' => 'applications/diffusion/data/filecontent',
|
||||
'DiffusionFileContentQuery' => 'applications/diffusion/query/filecontent/base',
|
||||
'DiffusionGitBranchQuery' => 'applications/diffusion/query/branch/git',
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Copyright 2011 Facebook, Inc.
|
||||
* Copyright 2012 Facebook, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -35,66 +35,17 @@ class DiffusionBrowseController extends DiffusionController {
|
|||
|
||||
if (!$results) {
|
||||
|
||||
// TODO: Format all these commits into nice VCS-agnostic links, and
|
||||
// below.
|
||||
$commit = $drequest->getCommit();
|
||||
$callsign = $drequest->getRepository()->getCallsign();
|
||||
if ($commit) {
|
||||
$commit = "r{$callsign}{$commit}";
|
||||
} else {
|
||||
$commit = 'HEAD';
|
||||
if ($browse_query->getReasonForEmptyResultSet() ==
|
||||
DiffusionBrowseQuery::REASON_IS_FILE) {
|
||||
$controller = new DiffusionBrowseFileController($this->getRequest());
|
||||
$controller->setDiffusionRequest($drequest);
|
||||
return $this->delegateToController($controller);
|
||||
}
|
||||
|
||||
switch ($browse_query->getReasonForEmptyResultSet()) {
|
||||
case DiffusionBrowseQuery::REASON_IS_NONEXISTENT:
|
||||
$title = 'Path Does Not Exist';
|
||||
// TODO: Under git, this error message should be more specific. It
|
||||
// may exist on some other branch.
|
||||
$body = "This path does not exist anywhere.";
|
||||
$severity = AphrontErrorView::SEVERITY_ERROR;
|
||||
break;
|
||||
case DiffusionBrowseQuery::REASON_IS_EMPTY:
|
||||
$title = 'Empty Directory';
|
||||
$body = "This path was an empty directory at {$commit}.\n";
|
||||
$severity = AphrontErrorView::SEVERITY_NOTICE;
|
||||
break;
|
||||
case DiffusionBrowseQuery::REASON_IS_DELETED:
|
||||
$deleted = $browse_query->getDeletedAtCommit();
|
||||
$existed = $browse_query->getExistedAtCommit();
|
||||
|
||||
$deleted = "r{$callsign}{$deleted}";
|
||||
$existed = "r{$callsign}{$existed}";
|
||||
|
||||
$title = 'Path Was Deleted';
|
||||
$body = "This path does not exist at {$commit}. It was deleted in ".
|
||||
"{$deleted} and last existed at {$existed}.";
|
||||
$severity = AphrontErrorView::SEVERITY_WARNING;
|
||||
break;
|
||||
case DiffusionBrowseQuery::REASON_IS_FILE:
|
||||
$controller = new DiffusionBrowseFileController($this->getRequest());
|
||||
$controller->setDiffusionRequest($drequest);
|
||||
return $this->delegateToController($controller);
|
||||
break;
|
||||
case DiffusionBrowseQuery::REASON_IS_UNTRACKED_PARENT:
|
||||
$subdir = $drequest->getRepository()->getDetail('svn-subpath');
|
||||
$title = 'Directory Not Tracked';
|
||||
$body =
|
||||
"This repository is configured to track only one subdirectory ".
|
||||
"of the entire repository ('".phutil_escape_html($subdir)."'), ".
|
||||
"but you aren't looking at something in that subdirectory, so no ".
|
||||
"information is available.";
|
||||
$severity = AphrontErrorView::SEVERITY_WARNING;
|
||||
break;
|
||||
default:
|
||||
throw new Exception("Unknown failure reason!");
|
||||
}
|
||||
|
||||
$error_view = new AphrontErrorView();
|
||||
$error_view->setSeverity($severity);
|
||||
$error_view->setTitle($title);
|
||||
$error_view->appendChild('<p>'.$body.'</p>');
|
||||
|
||||
$content[] = $error_view;
|
||||
$empty_result = new DiffusionEmptyResultView();
|
||||
$empty_result->setDiffusionRequest($drequest);
|
||||
$empty_result->setBrowseQuery($browse_query);
|
||||
$content[] = $empty_result;
|
||||
|
||||
} else {
|
||||
|
||||
|
|
|
@ -10,11 +10,10 @@ phutil_require_module('phabricator', 'applications/diffusion/controller/base');
|
|||
phutil_require_module('phabricator', 'applications/diffusion/controller/file');
|
||||
phutil_require_module('phabricator', 'applications/diffusion/query/browse/base');
|
||||
phutil_require_module('phabricator', 'applications/diffusion/view/browsetable');
|
||||
phutil_require_module('phabricator', 'applications/diffusion/view/emptyresult');
|
||||
phutil_require_module('phabricator', 'applications/phid/handle/data');
|
||||
phutil_require_module('phabricator', 'view/form/error');
|
||||
phutil_require_module('phabricator', 'view/layout/panel');
|
||||
|
||||
phutil_require_module('phutil', 'markup');
|
||||
phutil_require_module('phutil', 'utils');
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,94 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Copyright 2012 Facebook, Inc.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
final class DiffusionEmptyResultView extends DiffusionView {
|
||||
|
||||
private $browseQuery;
|
||||
|
||||
public function setBrowseQuery($browse_query) {
|
||||
$this->browseQuery = $browse_query;
|
||||
}
|
||||
|
||||
public function render() {
|
||||
$drequest = $this->getDiffusionRequest();
|
||||
|
||||
$commit = $drequest->getCommit();
|
||||
$callsign = $drequest->getRepository()->getCallsign();
|
||||
if ($commit) {
|
||||
$commit = "r{$callsign}{$commit}";
|
||||
} else {
|
||||
$commit = 'HEAD';
|
||||
}
|
||||
|
||||
switch ($this->browseQuery->getReasonForEmptyResultSet()) {
|
||||
case DiffusionBrowseQuery::REASON_IS_NONEXISTENT:
|
||||
$title = 'Path Does Not Exist';
|
||||
// TODO: Under git, this error message should be more specific. It
|
||||
// may exist on some other branch.
|
||||
$body = "This path does not exist anywhere.";
|
||||
$severity = AphrontErrorView::SEVERITY_ERROR;
|
||||
break;
|
||||
case DiffusionBrowseQuery::REASON_IS_EMPTY:
|
||||
$title = 'Empty Directory';
|
||||
$body = "This path was an empty directory at {$commit}.\n";
|
||||
$severity = AphrontErrorView::SEVERITY_NOTICE;
|
||||
break;
|
||||
case DiffusionBrowseQuery::REASON_IS_DELETED:
|
||||
$deleted = $this->browseQuery->getDeletedAtCommit();
|
||||
$existed = $this->browseQuery->getExistedAtCommit();
|
||||
|
||||
$deleted = self::linkCommit($drequest->getRepository(), $deleted);
|
||||
|
||||
$browse = $this->linkBrowse(
|
||||
$drequest->getPath(),
|
||||
array(
|
||||
'text' => 'existed',
|
||||
'commit' => $existed,
|
||||
)
|
||||
);
|
||||
|
||||
$existed = "r{$callsign}{$existed}";
|
||||
|
||||
$title = 'Path Was Deleted';
|
||||
$body = "This path does not exist at {$commit}. It was deleted in ".
|
||||
"{$deleted} and last {$browse} at {$existed}.";
|
||||
$severity = AphrontErrorView::SEVERITY_WARNING;
|
||||
break;
|
||||
case DiffusionBrowseQuery::REASON_IS_UNTRACKED_PARENT:
|
||||
$subdir = $drequest->getRepository()->getDetail('svn-subpath');
|
||||
$title = 'Directory Not Tracked';
|
||||
$body =
|
||||
"This repository is configured to track only one subdirectory ".
|
||||
"of the entire repository ('".phutil_escape_html($subdir)."'), ".
|
||||
"but you aren't looking at something in that subdirectory, so no ".
|
||||
"information is available.";
|
||||
$severity = AphrontErrorView::SEVERITY_WARNING;
|
||||
break;
|
||||
default:
|
||||
throw new Exception("Unknown failure reason!");
|
||||
}
|
||||
|
||||
$error_view = new AphrontErrorView();
|
||||
$error_view->setSeverity($severity);
|
||||
$error_view->setTitle($title);
|
||||
$error_view->appendChild('<p>'.$body.'</p>');
|
||||
|
||||
return $error_view->render();
|
||||
}
|
||||
|
||||
}
|
16
src/applications/diffusion/view/emptyresult/__init__.php
Normal file
16
src/applications/diffusion/view/emptyresult/__init__.php
Normal file
|
@ -0,0 +1,16 @@
|
|||
<?php
|
||||
/**
|
||||
* This file is automatically generated. Lint this module to rebuild it.
|
||||
* @generated
|
||||
*/
|
||||
|
||||
|
||||
|
||||
phutil_require_module('phabricator', 'applications/diffusion/query/browse/base');
|
||||
phutil_require_module('phabricator', 'applications/diffusion/view/base');
|
||||
phutil_require_module('phabricator', 'view/form/error');
|
||||
|
||||
phutil_require_module('phutil', 'markup');
|
||||
|
||||
|
||||
phutil_require_source('DiffusionEmptyResultView.php');
|
Loading…
Reference in a new issue