mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-04 04:32:43 +01:00
30ae22bfcf
Summary: Diffusion request/uri handling is currently a big, hastily ported mess. In particular, it has: - Tons and tons of duplicated code. - Bugs with handling unusual branch and file names. - An excessively large (and yet insufficiently expressive) API on DiffusionRequest, including a nonsensical concrete base class. - Other tools were doing hacky things like passing ":" branch names. This diff attempts to fix these issues. - Make the base class abstract (it was concrete ONLY for "/diffusion/"). - Move all URI generation to DiffusionRequest. Make the core static. Add unit tests. - Delete the 300 copies of URI generation code throughout Diffusion. - Move all URI parsing to DiffusionRequest. Make the core static. Add unit tests. - Add an appropriate static initializer for other callers. - Convert all code calling `newFromAphrontRequestDictionary` outside of Diffusion to the new `newFromDictionary` API. - Refactor static initializers to be sensibly-sized. - Refactor derived DiffusionRequest classes to remove duplicated code. - Properly encode branch names (fixes branches with "/", see <https://github.com/facebook/phabricator/issues/100>). - Properly encode path names (fixes issues in D1742). - Properly escape delimiter characters ";" and "$" in path names so files like "$100" are not interpreted as "line 100". - Fix a couple warnings. - Fix a couple lint issues. - Fix a bug where we would not parse filenames with spaces in them correctly in the Git browse query. - Fix a bug where Git change queries would fail unnecessarily. - Provide or improve some documentation. This thing is pretty gigantic but also kind of hard to split up. If it's unreasonably difficult to review, let me know and I can take a stab at it though. This supplants D1742. Test Plan: - Used home, repository, branch, browse, change, history, diff (ajax), lastmodified (ajax) views of Diffusion. - Used Owners typeaheads and search. - Used diffusion.getrecentcommitsbypath method. - Pushed a change to an absurdly-named file on an absurdly-named branch, everything worked properly. {F9185} Reviewers: nh, vrana, btrahan Reviewed By: btrahan CC: aran, epriestley Differential Revision: https://secure.phabricator.com/D1921
119 lines
2.9 KiB
PHP
119 lines
2.9 KiB
PHP
<?php
|
|
|
|
/*
|
|
* Copyright 2012 Facebook, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
abstract class DiffusionView extends AphrontView {
|
|
|
|
private $diffusionRequest;
|
|
|
|
final public function setDiffusionRequest(DiffusionRequest $request) {
|
|
$this->diffusionRequest = $request;
|
|
return $this;
|
|
}
|
|
|
|
final public function getDiffusionRequest() {
|
|
return $this->diffusionRequest;
|
|
}
|
|
|
|
final public function linkChange($change_type, $file_type, $path = null,
|
|
$commit_identifier = null) {
|
|
|
|
$text = DifferentialChangeType::getFullNameForChangeType($change_type);
|
|
if ($change_type == DifferentialChangeType::TYPE_CHILD) {
|
|
// TODO: Don't link COPY_AWAY without a direct change.
|
|
return $text;
|
|
}
|
|
if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
|
|
return $text;
|
|
}
|
|
|
|
$href = $this->getDiffusionRequest()->generateURI(
|
|
array(
|
|
'action' => 'change',
|
|
'path' => $path,
|
|
'commit' => $commit_identifier,
|
|
));
|
|
|
|
return phutil_render_tag(
|
|
'a',
|
|
array(
|
|
'href' => $href,
|
|
),
|
|
$text);
|
|
}
|
|
|
|
final public function linkHistory($path) {
|
|
$href = $this->getDiffusionRequest()->generateURI(
|
|
array(
|
|
'action' => 'history',
|
|
'path' => $path,
|
|
));
|
|
|
|
return phutil_render_tag(
|
|
'a',
|
|
array(
|
|
'href' => $href,
|
|
),
|
|
'History');
|
|
}
|
|
|
|
final public function linkBrowse($path, array $details = array()) {
|
|
|
|
$href = $this->getDiffusionRequest()->generateURI(
|
|
array(
|
|
'action' => 'browse',
|
|
'path' => $path,
|
|
));
|
|
|
|
if (isset($details['text'])) {
|
|
$text = phutil_escape_html($details['text']);
|
|
} else {
|
|
$text = 'Browse';
|
|
}
|
|
|
|
return phutil_render_tag(
|
|
'a',
|
|
array(
|
|
'href' => $href,
|
|
),
|
|
$text);
|
|
}
|
|
|
|
final public static function linkCommit($repository, $commit) {
|
|
|
|
switch ($repository->getVersionControlSystem()) {
|
|
case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
|
|
case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
|
|
$commit_name = substr($commit, 0, 12);
|
|
break;
|
|
default:
|
|
$commit_name = $commit;
|
|
break;
|
|
}
|
|
|
|
$callsign = $repository->getCallsign();
|
|
$commit_name = "r{$callsign}{$commit_name}";
|
|
|
|
return phutil_render_tag(
|
|
'a',
|
|
array(
|
|
'href' => "/r{$callsign}{$commit}",
|
|
),
|
|
$commit_name);
|
|
}
|
|
|
|
}
|