Page MenuHomePhabricator
Files F15338446

D15989.id.diff
No OneTemporary
Actions

D15989.id.diff
View Options

diff --git a/src/applications/differential/controller/DifferentialRevisionCloseDetailsController.php b/src/applications/differential/controller/DifferentialRevisionCloseDetailsController.php
--- a/src/applications/differential/controller/DifferentialRevisionCloseDetailsController.php
+++ b/src/applications/differential/controller/DifferentialRevisionCloseDetailsController.php
@@ -93,7 +93,7 @@
'href' => $obj_handle->getURI(),
),
$obj_handle->getName());
- $body_why = pht(
+ $body_why[] = pht(
'This commit and the active diff of %s had the same %s hash '.
'(%s) so we linked this commit to %s.',
$diff_link,
diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelCommitFieldsQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelCommitFieldsQuery.php
--- a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelCommitFieldsQuery.php
+++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelCommitFieldsQuery.php
@@ -67,19 +67,23 @@
->withCommitHashes($hash_list)
->execute();
- if (!empty($revisions)) {
+ if ($revisions) {
$revision = $this->pickBestRevision($revisions);
+
$fields['revisionID'] = $revision->getID();
$revision_hashes = $revision->getHashes();
+
$revision_hashes = DiffusionCommitHash::convertArrayToObjects(
$revision_hashes);
- $revision_hashes = mpull($revision_hashes, 'getHashType');
+ $revision_hashes = mpull($revision_hashes, null, 'getHashType');
+
// sort the hashes in the order the mighty
// @{class:ArcanstDifferentialRevisionHash} does; probably unnecessary
// but should future proof things nicely.
$revision_hashes = array_select_keys(
$revision_hashes,
ArcanistDifferentialRevisionHash::getTypes());
+
foreach ($hashes as $hash) {
$revision_hash = idx($revision_hashes, $hash->getHashType());
if (!$revision_hash) {

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 10, 10:59 AM (1 d, 14 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7223137
Default Alt Text
D15989.id.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility