@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Fix tag content display in Git
Summary: Fixes the junk I broke in D7484. Before that, tag content was a side effect of resolving the ref name. Now, fetch it explicitly in `diffusion.tagsquery`.
Test Plan: Looked at a tag, saw the annotation/message.
Reviewers: btrahan
Reviewed By: btrahan
CC: aran
Differential Revision: https://secure.phabricator.com/D7485
+134
-48
+18
-6
src/applications/diffusion/controller/DiffusionBrowseController.php
+18
-6
src/applications/diffusion/controller/DiffusionBrowseController.php
···
146
146
),
147
147
$drequest->getRepository()->formatCommitName($stable_commit)));
148
148
149
-
if ($drequest->getTagContent()) {
150
-
$view->addProperty(
151
-
pht('Tag'),
152
-
$drequest->getSymbolicCommit());
149
+
if ($drequest->getCommitType() == 'tag') {
150
+
$symbolic = $drequest->getSymbolicCommit();
151
+
$view->addProperty(pht('Tag'), $symbolic);
153
152
154
-
$view->addSectionHeader(pht('Tag Content'));
155
-
$view->addTextContent($this->markupText($drequest->getTagContent()));
153
+
$tags = $this->callConduitWithDiffusionRequest(
154
+
'diffusion.tagsquery',
155
+
array(
156
+
'names' => array($symbolic),
157
+
'needMessages' => true,
158
+
));
159
+
$tags = DiffusionRepositoryTag::newFromConduit($tags);
160
+
161
+
$tags = mpull($tags, null, 'getName');
162
+
$tag = idx($tags, $symbolic);
163
+
164
+
if ($tag && strlen($tag->getMessage())) {
165
+
$view->addSectionHeader(pht('Tag Content'));
166
+
$view->addTextContent($this->markupText($tag->getMessage()));
167
+
}
156
168
}
157
169
158
170
return $view;
+30
-3
src/applications/diffusion/data/DiffusionRepositoryTag.php
+30
-3
src/applications/diffusion/data/DiffusionRepositoryTag.php
···
9
9
private $description;
10
10
private $type;
11
11
12
+
private $message = false;
13
+
12
14
public function setType($type) {
13
15
$this->type = $type;
14
16
return $this;
···
63
65
return $this->author;
64
66
}
65
67
68
+
public function attachMessage($message) {
69
+
$this->message = $message;
70
+
return $this;
71
+
}
72
+
73
+
public function getMessage() {
74
+
if ($this->message === false) {
75
+
throw new Exception("Message is not attached!");
76
+
}
77
+
return $this->message;
78
+
}
79
+
66
80
public function toDictionary() {
67
-
return array(
81
+
$dict = array(
68
82
'author' => $this->getAuthor(),
69
83
'epoch' => $this->getEpoch(),
70
84
'commitIdentifier' => $this->getCommitIdentifier(),
71
85
'name' => $this->getName(),
72
86
'description' => $this->getDescription(),
73
-
'type' => $this->getType());
87
+
'type' => $this->getType(),
88
+
);
89
+
90
+
if ($this->message !== false) {
91
+
$dict['message'] = $this->message;
92
+
}
93
+
94
+
return $dict;
74
95
}
75
96
76
97
public static function newFromConduit(array $dicts) {
77
98
$tags = array();
78
99
foreach ($dicts as $dict) {
79
-
$tags[] = id(new DiffusionRepositoryTag())
100
+
$tag = id(new DiffusionRepositoryTag())
80
101
->setAuthor($dict['author'])
81
102
->setEpoch($dict['epoch'])
82
103
->setCommitIdentifier($dict['commitIdentifier'])
83
104
->setName($dict['name'])
84
105
->setDescription($dict['description'])
85
106
->setType($dict['type']);
107
+
108
+
if (array_key_exists('message', $dict)) {
109
+
$tag->attachMessage($dict['message']);
110
+
}
111
+
112
+
$tags[] = $tag;
86
113
}
87
114
return $tags;
88
115
}
+4
src/applications/diffusion/request/DiffusionRequest.php
+4
src/applications/diffusion/request/DiffusionRequest.php