Page MenuHomePhabricator
Files F15414064

D10489.id25212.diff
No OneTemporary
Actions

D10489.id25212.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -321,6 +321,7 @@
'DifferentialReviewersField' => 'applications/differential/customfield/DifferentialReviewersField.php',
'DifferentialReviewersView' => 'applications/differential/view/DifferentialReviewersView.php',
'DifferentialRevision' => 'applications/differential/storage/DifferentialRevision.php',
+ 'DifferentialRevisionCloseDetailsController' => 'applications/differential/controller/DifferentialRevisionCloseDetailsController.php',
'DifferentialRevisionControlSystem' => 'applications/differential/constants/DifferentialRevisionControlSystem.php',
'DifferentialRevisionDetailView' => 'applications/differential/view/DifferentialRevisionDetailView.php',
'DifferentialRevisionEditController' => 'applications/differential/controller/DifferentialRevisionEditController.php',
@@ -3117,6 +3118,7 @@
'PhabricatorDestructibleInterface',
'PhabricatorProjectInterface',
),
+ 'DifferentialRevisionCloseDetailsController' => 'DifferentialController',
'DifferentialRevisionDetailView' => 'AphrontView',
'DifferentialRevisionEditController' => 'DifferentialController',
'DifferentialRevisionHasTaskEdgeType' => 'PhabricatorEdgeType',
diff --git a/src/applications/differential/application/PhabricatorDifferentialApplication.php b/src/applications/differential/application/PhabricatorDifferentialApplication.php
--- a/src/applications/differential/application/PhabricatorDifferentialApplication.php
+++ b/src/applications/differential/application/PhabricatorDifferentialApplication.php
@@ -67,6 +67,8 @@
=> 'DifferentialRevisionEditController',
'revision/land/(?:(?P<id>[1-9]\d*))/(?P<strategy>[^/]+)/'
=> 'DifferentialRevisionLandController',
+ 'revision/closedetails/(?P<phid>[^/]+)/'
+ => 'DifferentialRevisionCloseDetailsController',
'comment/' => array(
'preview/(?P<id>[1-9]\d*)/' => 'DifferentialCommentPreviewController',
'save/(?P<id>[1-9]\d*)/' => 'DifferentialCommentSaveController',
diff --git a/src/applications/differential/controller/DifferentialRevisionCloseDetailsController.php b/src/applications/differential/controller/DifferentialRevisionCloseDetailsController.php
new file mode 100644
--- /dev/null
+++ b/src/applications/differential/controller/DifferentialRevisionCloseDetailsController.php
@@ -0,0 +1,53 @@
+<?php
+
+final class DifferentialRevisionCloseDetailsController
+ extends DifferentialController {
+
+ private $phid;
+
+ public function willProcessRequest(array $data) {
+ $this->phid = idx($data, 'phid');
+ }
+
+ public function processRequest() {
+ $request = $this->getRequest();
+
+ $viewer = $request->getUser();
+ $xaction_phid = $this->phid;
+
+ $xaction = id(new PhabricatorObjectQuery())
+ ->withPHIDs(array($xaction_phid))
+ ->setViewer($viewer)
+ ->executeOne();
+ if (!$xaction) {
+ return new Aphront404Response();
+ }
+
+ $obj_phid = $xaction->getObjectPHID();
+ $obj_handle = id(new PhabricatorHandleQuery())
+ ->setViewer($viewer)
+ ->withPHIDs(array($obj_phid))
+ ->executeOne();
+
+ $tree_hash = $xaction->getMetadataValue('treeHash');
+ if ($tree_hash) {
+ $body_why = pht(
+ 'This commit has tree hash %s, which matches a commit in the active '.
+ 'diff for this revision.',
+ $tree_hash);
+ } else {
+ $body_why = pht(
+ 'This commit was made before this feature was built and thus '.
+ 'this information is unavailable.');
+ }
+
+ $dialog = id(new AphrontDialogView())
+ ->setUser($viewer)
+ ->setTitle(pht('Commit Close Explanation'))
+ ->appendParagraph($body_why)
+ ->addCancelButton($obj_handle->getURI());
+
+ return id(new AphrontDialogResponse())->setDialog($dialog);
+ }
+
+}
diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php
--- a/src/applications/differential/storage/DifferentialTransaction.php
+++ b/src/applications/differential/storage/DifferentialTransaction.php
@@ -271,18 +271,29 @@
} else {
$author_name = $this->getMetadataValue('authorName');
}
+ $details_href =
+ '/differential/revision/closedetails/'.$this->getPHID().'/';
+ $details_link = javelin_tag(
+ 'a',
+ array(
+ 'href' => $details_href,
+ 'sigil' => 'workflow',
+ ),
+ pht('Explain why'));
if ($committer_name && ($committer_name != $author_name)) {
return pht(
- 'Closed by commit %s (authored by %s, committed by %s).',
+ 'Closed by commit %s (authored by %s, committed by %s). (%s)',
$commit_name,
$author_name,
- $committer_name);
+ $committer_name,
+ $details_link);
} else {
return pht(
- 'Closed by commit %s (authored by %s).',
+ 'Closed by commit %s (authored by %s). (%s)',
$commit_name,
- $author_name);
+ $author_name,
+ $details_link);
}
break;
default:
diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
--- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
+++ b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
@@ -160,9 +160,13 @@
$commit_close_xaction->setMetadataValue(
'authorName',
$data->getAuthorName());
- $commit_close_xaction->setMetadataValue(
- 'commitHashes',
- $hashes);
+
+ $tree_hash = idx($hashes, 1);
+ if ($tree_hash) {
+ $commit_close_xaction->setMetadataValue(
+ 'treeHash',
+ $tree_hash->getHashValue());
+ }
$diff = $this->generateFinalDiff($revision, $acting_as_phid);

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 20, 10:55 PM (2 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7680580
Default Alt Text
D10489.id25212.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility