'.
- '
'.
- 'r'.$callsign.$commit->getCommitIdentifier().
- ' · '.
- phabricator_datetime($commit->getEpoch(), $user).
- '
'.
- '
Revision Detail
'.
- '
'.
- $property_table.
- '
'.
- '');
+ '
Revision Detail
'.
+ '
'.
+ $property_table.
+ '
'.
+ ''.
+ ''.
+ '
');
- $content[] = $detail_panel;
+ $content[] = $detail_panel;
+ }
$change_query = DiffusionPathChangeQuery::newFromDiffusionRequest(
$drequest);
@@ -103,6 +119,23 @@ class DiffusionCommitController extends DiffusionController {
phutil_escape_html($bad_commit['description']));
$content[] = $error_panel;
+ } else if ($is_foreign) {
+ // Don't render anything else.
+ } else if (!count($changes)) {
+ $no_changes = new AphrontErrorView();
+ $no_changes->setWidth(AphrontErrorView::WIDTH_WIDE);
+ $no_changes->setSeverity(AphrontErrorView::SEVERITY_WARNING);
+ $no_changes->setTitle('Not Yet Parsed');
+ // TODO: This can also happen with weird SVN changes that don't do
+ // anything (or only alter properties?), although the real no-changes case
+ // is extremely rare and might be impossible to produce organically. We
+ // should probably write some kind of "Nothing Happened!" change into the
+ // DB once we parse these changes so we can distinguish between
+ // "not parsed yet" and "no changes".
+ $no_changes->appendChild(
+ "This commit hasn't been fully parsed yet (or doesn't affect any ".
+ "paths).");
+ $content[] = $no_changes;
} else {
$change_panel = new AphrontPanelView();
$change_panel->setHeader("Changes (".number_format($count).")");
@@ -130,60 +163,52 @@ class DiffusionCommitController extends DiffusionController {
$content[] = $change_panel;
- if ($changes) {
- $changesets = DiffusionPathChange::convertToDifferentialChangesets(
- $changes);
+ $changesets = DiffusionPathChange::convertToDifferentialChangesets(
+ $changes);
- $vcs = $repository->getVersionControlSystem();
- switch ($vcs) {
- case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
- $vcs_supports_directory_changes = true;
- break;
- case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
- $vcs_supports_directory_changes = false;
- break;
- default:
- throw new Exception("Unknown VCS.");
- }
-
- $references = array();
- foreach ($changesets as $key => $changeset) {
- $file_type = $changeset->getFileType();
- if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
- if (!$vcs_supports_directory_changes) {
- unset($changesets[$key]);
- continue;
- }
- }
-
- $branch = $drequest->getBranchURIComponent(
- $drequest->getBranch());
- $filename = $changeset->getFilename();
- $commit = $drequest->getCommit();
- $reference = "{$branch}{$filename};{$commit}";
- $references[$key] = $reference;
- }
-
- $change_list = new DifferentialChangesetListView();
- $change_list->setChangesets($changesets);
- $change_list->setRenderingReferences($references);
- $change_list->setRenderURI('/diffusion/'.$callsign.'/diff/');
-
- // TODO: This is pretty awkward, unify the CSS between Diffusion and
- // Differential better.
- require_celerity_resource('differential-core-view-css');
- $change_list =
- '
'.
- $change_list->render().
- '
';
- } else {
- $change_list =
- '
'.
- '(no changes blah blah)'.
- '
';
+ $vcs = $repository->getVersionControlSystem();
+ switch ($vcs) {
+ case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
+ $vcs_supports_directory_changes = true;
+ break;
+ case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
+ $vcs_supports_directory_changes = false;
+ break;
+ default:
+ throw new Exception("Unknown VCS.");
}
+ $references = array();
+ foreach ($changesets as $key => $changeset) {
+ $file_type = $changeset->getFileType();
+ if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
+ if (!$vcs_supports_directory_changes) {
+ unset($changesets[$key]);
+ continue;
+ }
+ }
+
+ $branch = $drequest->getBranchURIComponent(
+ $drequest->getBranch());
+ $filename = $changeset->getFilename();
+ $commit = $drequest->getCommit();
+ $reference = "{$branch}{$filename};{$commit}";
+ $references[$key] = $reference;
+ }
+
+ $change_list = new DifferentialChangesetListView();
+ $change_list->setChangesets($changesets);
+ $change_list->setRenderingReferences($references);
+ $change_list->setRenderURI('/diffusion/'.$callsign.'/diff/');
+
+ // TODO: This is pretty awkward, unify the CSS between Diffusion and
+ // Differential better.
+ require_celerity_resource('differential-core-view-css');
+ $change_list =
+ '
'.
+ $change_list->render().
+ '
';
+
$content[] = $change_list;
}
diff --git a/src/applications/diffusion/query/browse/base/DiffusionBrowseQuery.php b/src/applications/diffusion/query/browse/base/DiffusionBrowseQuery.php
index 02c3283a87..cba77ec2b5 100644
--- a/src/applications/diffusion/query/browse/base/DiffusionBrowseQuery.php
+++ b/src/applications/diffusion/query/browse/base/DiffusionBrowseQuery.php
@@ -25,11 +25,12 @@ abstract class DiffusionBrowseQuery {
protected $deletedAtCommit;
protected $validityOnly;
- const REASON_IS_FILE = 'is-file';
- const REASON_IS_DELETED = 'is-deleted';
- const REASON_IS_NONEXISTENT = 'nonexistent';
- const REASON_BAD_COMMIT = 'bad-commit';
- const REASON_IS_EMPTY = 'empty';
+ const REASON_IS_FILE = 'is-file';
+ const REASON_IS_DELETED = 'is-deleted';
+ const REASON_IS_NONEXISTENT = 'nonexistent';
+ const REASON_BAD_COMMIT = 'bad-commit';
+ const REASON_IS_EMPTY = 'empty';
+ const REASON_IS_UNTRACKED_PARENT = 'untracked-parent';
final private function __construct() {
//
diff --git a/src/applications/diffusion/query/browse/svn/DiffusionSvnBrowseQuery.php b/src/applications/diffusion/query/browse/svn/DiffusionSvnBrowseQuery.php
index c47952118a..b513b50763 100644
--- a/src/applications/diffusion/query/browse/svn/DiffusionSvnBrowseQuery.php
+++ b/src/applications/diffusion/query/browse/svn/DiffusionSvnBrowseQuery.php
@@ -25,6 +25,15 @@ final class DiffusionSvnBrowseQuery extends DiffusionBrowseQuery {
$path = $drequest->getPath();
$commit = $drequest->getCommit();
+ $subpath = $repository->getDetail('svn-subpath');
+ if ($subpath && strncmp($subpath, $path, strlen($subpath))) {
+ // If we have a subpath and the path isn't a child of it, it (almost
+ // certainly) won't exist since we don't track commits which affect
+ // it. (Even if it exists, return a consistent result.)
+ $this->reason = self::REASON_IS_UNTRACKED_PARENT;
+ return array();
+ }
+
$conn_r = $repository->establishConnection('r');
$parent_path = dirname($path);
diff --git a/src/applications/diffusion/request/svn/DiffusionSvnRequest.php b/src/applications/diffusion/request/svn/DiffusionSvnRequest.php
index 577e36c64e..81c9c68bd1 100644
--- a/src/applications/diffusion/request/svn/DiffusionSvnRequest.php
+++ b/src/applications/diffusion/request/svn/DiffusionSvnRequest.php
@@ -20,6 +20,14 @@ class DiffusionSvnRequest extends DiffusionRequest {
protected function initializeFromAphrontRequestDictionary(array $data) {
parent::initializeFromAphrontRequestDictionary($data);
+
+ if ($this->path === null) {
+ $subpath = $this->repository->getDetail('svn-subpath');
+ if ($subpath) {
+ $this->path = $subpath;
+ }
+ }
+
if (!strncmp($this->path, ':', 1)) {
$this->path = substr($this->path, 1);
$this->path = ltrim($this->path, '/');