Page MenuHomePhabricator
Files F77316

D7455.diff
All Users
Actions

D7455.diff
View Options

diff --git a/src/applications/diffusion/controller/DiffusionBranchTableController.php b/src/applications/diffusion/controller/DiffusionBranchTableController.php
--- a/src/applications/diffusion/controller/DiffusionBranchTableController.php
+++ b/src/applications/diffusion/controller/DiffusionBranchTableController.php
@@ -55,7 +55,7 @@
$crumbs = $this->buildCrumbs(
array(
- 'branches' => true,
+ 'branches' => true,
));
return $this->buildApplicationPage(
diff --git a/src/applications/diffusion/controller/DiffusionTagListController.php b/src/applications/diffusion/controller/DiffusionTagListController.php
--- a/src/applications/diffusion/controller/DiffusionTagListController.php
+++ b/src/applications/diffusion/controller/DiffusionTagListController.php
@@ -9,7 +9,7 @@
public function processRequest() {
$drequest = $this->getDiffusionRequest();
$request = $this->getRequest();
- $user = $request->getUser();
+ $viewer = $request->getUser();
$repository = $drequest->getRepository();
@@ -42,25 +42,22 @@
$content = null;
if (!$tags) {
- $content = new AphrontErrorView();
- $content->setTitle(pht('No Tags'));
- if ($is_commit) {
- $content->appendChild(pht('This commit has no tags.'));
- } else {
- $content->appendChild(pht('This repository has no tags.'));
- }
- $content->setSeverity(AphrontErrorView::SEVERITY_NODATA);
+ $content = $this->renderStatusMessage(
+ pht('No Tags'),
+ $is_commit
+ ? pht('This commit has no tags.')
+ : pht('This repository has no tags.'));
} else {
- $commits = id(new PhabricatorAuditCommitQuery())
- ->withIdentifiers(
- $drequest->getRepository()->getID(),
- mpull($tags, 'getCommitIdentifier'))
+ $commits = id(new DiffusionCommitQuery())
+ ->setViewer($viewer)
+ ->withRepositoryIDs(array($repository->getID()))
+ ->withIdentifiers(mpull($tags, 'getCommitIdentifier'))
->needCommitData(true)
->execute();
$view = id(new DiffusionTagListView())
->setTags($tags)
- ->setUser($user)
+ ->setUser($viewer)
->setCommits($commits)
->setDiffusionRequest($drequest);
@@ -78,8 +75,8 @@
$crumbs = $this->buildCrumbs(
array(
- 'tags' => true,
- 'commit' => $drequest->getRawCommit(),
+ 'tags' => true,
+ 'commit' => $drequest->getRawCommit(),
));
return $this->buildApplicationPage(
@@ -89,7 +86,7 @@
),
array(
'title' => array(
- 'Tags',
+ pht('Tags'),
$repository->getCallsign().' Repository',
),
));
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
@@ -112,8 +112,12 @@
$author = hsprintf('%s/%s', $author, $committer);
}
+ // We can show details once the message and change have been imported.
+ $partial_import = PhabricatorRepositoryCommit::IMPORTED_MESSAGE |
+ PhabricatorRepositoryCommit::IMPORTED_CHANGE;
+
$commit = $history->getCommit();
- if ($commit && $commit->isImported() && $data) {
+ if ($commit && $commit->isPartiallyImported($partial_import) && $data) {
$change = $this->linkChange(
$history->getChangeType(),
$history->getFileType(),
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -36,6 +36,10 @@
return $this->assertAttached($this->repository);
}
+ public function isPartiallyImported($mask) {
+ return (($mask & $this->getImportStatus()) == $mask);
+ }
+
public function isImported() {
return ($this->getImportStatus() == self::IMPORTED_ALL);
}
@@ -218,7 +222,9 @@
'mailKey' => $this->getMailKey(),
'authorPHID' => $this->getAuthorPHID(),
'auditStatus' => $this->getAuditStatus(),
- 'summary' => $this->getSummary());
+ 'summary' => $this->getSummary(),
+ 'importStatus' => $this->getImportStatus(),
+ );
}
public static function newFromDictionary(array $dict) {

File Metadata

Mime Type
text/x-diff
Storage Engine
amazon-s3
Storage Format
Raw Data
Storage Handle
phabricator/ib/up/ki7rlktic7gv4hix
Default Alt Text
D7455.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility