@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
Use ChangesetListView in Phriction
Summary: Ref T2009. Upgrade this from DetailView to ListView so we get "Highlight As", "View Unified", etc., and respect the unified diff prefernce.
Test Plan: Viewed diffs in Phriction.
Reviewers: btrahan
Reviewed By: btrahan
Subscribers: epriestley
Maniphest Tasks: T2009
Differential Revision: https://secure.phabricator.com/D12013
+17
-19
+17
-19
src/applications/phriction/controller/PhrictionDiffController.php
+17
-19
src/applications/phriction/controller/PhrictionDiffController.php
···
72
72
73
73
$whitespace_mode = DifferentialChangesetParser::WHITESPACE_SHOW_ALL;
74
74
75
-
$parser = new DifferentialChangesetParser();
76
-
$parser->setUser($user);
77
-
$parser->setChangeset($changeset);
78
-
$parser->setRenderingReference("{$l},{$r}");
75
+
$parser = id(new DifferentialChangesetParser())
76
+
->setUser($user)
77
+
->setChangeset($changeset)
78
+
->setRenderingReference("{$l},{$r}");
79
+
80
+
$parser->readParametersFromRequest($request);
79
81
$parser->setWhitespaceMode($whitespace_mode);
80
82
81
83
$engine = new PhabricatorMarkupEngine();
···
87
89
list($range_s, $range_e, $mask) =
88
90
DifferentialChangesetParser::parseRangeSpecification($spec);
89
91
90
-
$output = $parser->render($range_s, $range_e, $mask);
92
+
$parser->setRange($range_s, $range_e);
93
+
$parser->setMask($mask);
91
94
92
95
if ($request->isAjax()) {
93
96
return id(new PhabricatorChangesetResponse())
94
-
->setRenderedChangeset($output);
97
+
->setRenderedChangeset($parser->renderChangeset());
95
98
}
96
99
97
-
$output = id(new DifferentialChangesetDetailView())
100
+
$changes = id(new DifferentialChangesetListView())
98
101
->setUser($this->getViewer())
99
-
->setChangeset($changeset)
100
-
->setRenderingRef("{$l},{$r}")
102
+
->setChangesets(array($changeset))
103
+
->setVisibleChangesets(array($changeset))
104
+
->setRenderingReferences(array("{$l},{$r}"))
101
105
->setRenderURI('/phriction/diff/'.$document->getID().'/')
102
-
->appendChild($output);
106
+
->setTitle(pht('Changes'))
107
+
->setParser($parser);
103
108
104
-
require_celerity_resource('differential-changeset-view-css');
105
-
require_celerity_resource('syntax-highlighting-css');
106
109
require_celerity_resource('phriction-document-css');
107
-
108
-
Javelin::initBehavior('differential-populate', array(
109
-
'changesetViewIDs' => array($output->getID()),
110
-
));
111
110
112
111
$slug = $document->getSlug();
113
112
···
198
197
'<table class="phriction-revert-table">'.
199
198
'<tr><td>%s</td><td>%s</td>'.
200
199
'</table>'.
201
-
'%s'.
202
200
'</div>',
203
201
$comparison_table->render(),
204
202
$navigation_table,
205
203
$revert_l,
206
-
$revert_r,
207
-
$output);
204
+
$revert_r);
208
205
209
206
210
207
$object_box = id(new PHUIObjectBoxView())
···
215
212
array(
216
213
$crumbs,
217
214
$object_box,
215
+
$changes,
218
216
),
219
217
array(
220
218
'title' => pht('Document History'),