@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
Merge author and committer
Summary: These columns holds the same value in most cases which irritates me.
Test Plan: Displayed history with same author and committer, emulated different committer.
Reviewers: hsb, epriestley
Reviewed By: epriestley
CC: aran, epriestley
Differential Revision: https://secure.phabricator.com/D2671
+9
-9
+9
-9
src/applications/diffusion/view/DiffusionHistoryTableView.php
+9
-9
src/applications/diffusion/view/DiffusionHistoryTableView.php
···
98
98
$author = phutil_escape_html($history->getAuthorName());
99
99
}
100
100
101
-
if ($committer) {
101
+
$different_committer = false;
102
+
if ($committer_phid) {
103
+
$different_committer = ($committer_phid != $author_phid);
104
+
} else if ($committer != '') {
105
+
$different_committer = ($committer != $history->getAuthorName());
106
+
}
107
+
if ($different_committer) {
102
108
if ($committer_phid && isset($handles[$committer_phid])) {
103
109
$committer = $handles[$committer_phid]->renderLink();
104
110
} else {
105
111
$committer = phutil_escape_html($committer);
106
112
}
107
-
}
108
-
else {
109
-
$committer = $author;
113
+
$author .= '/'.$committer;
110
114
}
111
-
112
115
113
116
$commit = $history->getCommit();
114
117
if ($commit && !$commit->getIsUnparsed() && $data) {
···
135
138
$date,
136
139
$time,
137
140
$author,
138
-
$committer,
139
141
AphrontTableView::renderSingleDisplayLine(
140
142
phutil_escape_html($history->getSummary())),
141
143
// TODO: etc etc
···
151
153
'Change',
152
154
'Date',
153
155
'Time',
154
-
'Author',
155
-
'Committer',
156
+
'Author/Committer',
156
157
'Details',
157
158
));
158
159
$view->setColumnClasses(
···
163
164
'',
164
165
'',
165
166
'right',
166
-
'',
167
167
'',
168
168
'wide',
169
169
));