2011-03-08 02:25:47 +01:00
|
|
|
<?php
|
|
|
|
|
|
|
|
/*
|
Fix many encoding and architecture problems in Diffusion request and URI handling
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
2012-03-20 03:52:14 +01:00
|
|
|
* Copyright 2012 Facebook, Inc.
|
2011-03-08 02:25:47 +01:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2011-03-13 01:17:34 +01:00
|
|
|
final class DiffusionBrowseTableView extends DiffusionView {
|
2011-03-08 02:25:47 +01:00
|
|
|
|
2011-03-09 02:31:44 +01:00
|
|
|
private $paths;
|
2011-04-03 01:39:23 +02:00
|
|
|
private $handles = array();
|
2011-03-08 02:25:47 +01:00
|
|
|
|
|
|
|
public function setPaths(array $paths) {
|
|
|
|
$this->paths = $paths;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2011-04-03 01:39:23 +02:00
|
|
|
public function setHandles(array $handles) {
|
2012-04-04 01:22:31 +02:00
|
|
|
assert_instances_of($handles, 'PhabricatorObjectHandle');
|
2011-04-03 01:39:23 +02:00
|
|
|
$this->handles = $handles;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2011-03-31 08:27:06 +02:00
|
|
|
public static function renderLastModifiedColumns(
|
|
|
|
PhabricatorRepository $repository,
|
2011-04-03 01:39:23 +02:00
|
|
|
array $handles,
|
2011-03-31 08:27:06 +02:00
|
|
|
PhabricatorRepositoryCommit $commit = null,
|
|
|
|
PhabricatorRepositoryCommitData $data = null) {
|
2012-04-04 01:22:31 +02:00
|
|
|
assert_instances_of($handles, 'PhabricatorObjectHandle');
|
2011-03-31 08:27:06 +02:00
|
|
|
|
|
|
|
if ($commit) {
|
|
|
|
$epoch = $commit->getEpoch();
|
|
|
|
$modified = DiffusionView::linkCommit(
|
|
|
|
$repository,
|
|
|
|
$commit->getCommitIdentifier());
|
|
|
|
$date = date('M j, Y', $epoch);
|
|
|
|
$time = date('g:i A', $epoch);
|
|
|
|
} else {
|
|
|
|
$modified = '';
|
|
|
|
$date = '';
|
|
|
|
$time = '';
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($data) {
|
2011-04-03 01:39:23 +02:00
|
|
|
$author_phid = $data->getCommitDetail('authorPHID');
|
|
|
|
if ($author_phid && isset($handles[$author_phid])) {
|
|
|
|
$author = $handles[$author_phid]->renderLink();
|
|
|
|
} else {
|
|
|
|
$author = phutil_escape_html($data->getAuthorName());
|
|
|
|
}
|
2011-07-31 17:38:06 +02:00
|
|
|
$details = AphrontTableView::renderSingleDisplayLine(
|
|
|
|
phutil_escape_html($data->getSummary()));
|
2011-03-31 08:27:06 +02:00
|
|
|
} else {
|
|
|
|
$author = '';
|
|
|
|
$details = '';
|
|
|
|
}
|
|
|
|
|
|
|
|
return array(
|
|
|
|
'commit' => $modified,
|
|
|
|
'date' => $date,
|
|
|
|
'time' => $time,
|
|
|
|
'author' => $author,
|
|
|
|
'details' => $details,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2011-03-08 02:25:47 +01:00
|
|
|
public function render() {
|
2011-03-13 01:17:34 +01:00
|
|
|
$request = $this->getDiffusionRequest();
|
2011-03-31 07:41:31 +02:00
|
|
|
$repository = $request->getRepository();
|
2011-03-13 01:17:34 +01:00
|
|
|
|
|
|
|
$base_path = trim($request->getPath(), '/');
|
|
|
|
if ($base_path) {
|
|
|
|
$base_path = $base_path.'/';
|
|
|
|
}
|
|
|
|
|
2011-03-31 08:27:06 +02:00
|
|
|
$need_pull = array();
|
2011-03-08 02:25:47 +01:00
|
|
|
$rows = array();
|
|
|
|
foreach ($this->paths as $path) {
|
2011-03-13 01:17:34 +01:00
|
|
|
|
2012-04-25 19:27:56 +02:00
|
|
|
$dir_slash = null;
|
Improve Diffusion behavior for externals
Summary:
- Feature request from Airtime that I missed in the feedback notes, came up yesterday.
- Identify git submodules as "FILE_SUBMODULE", not "FILE_NORMAL".
- Link git submodules to an external resolver endpoint, which tries to find commits in tracked repositories.
- Identify git symlinks as "FILE_SYMLINK", not "FILE_NORMAL".
- Add folder, file, symlink and externals icons.
Test Plan:
- externals/javelin is now identified as a submoudule and links to Javelin, not identified as a file and links to error.
- bin/phd is now identified as a symlink.
- Interfaces have pretty icons.
Reviewers: btrahan, cpiro, ddfisher, keebuhm, allenjohnashton
Reviewed By: btrahan
CC: aran, epriestley
Differential Revision: https://secure.phabricator.com/D1975
2012-03-21 22:01:20 +01:00
|
|
|
$file_type = $path->getFileType();
|
|
|
|
if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
|
2011-03-13 01:17:34 +01:00
|
|
|
$browse_text = $path->getPath().'/';
|
|
|
|
$dir_slash = '/';
|
2011-03-31 07:41:31 +02:00
|
|
|
|
|
|
|
$browse_link = '<strong>'.$this->linkBrowse(
|
|
|
|
$base_path.$path->getPath().$dir_slash,
|
|
|
|
array(
|
Improve Diffusion behavior for externals
Summary:
- Feature request from Airtime that I missed in the feedback notes, came up yesterday.
- Identify git submodules as "FILE_SUBMODULE", not "FILE_NORMAL".
- Link git submodules to an external resolver endpoint, which tries to find commits in tracked repositories.
- Identify git symlinks as "FILE_SYMLINK", not "FILE_NORMAL".
- Add folder, file, symlink and externals icons.
Test Plan:
- externals/javelin is now identified as a submoudule and links to Javelin, not identified as a file and links to error.
- bin/phd is now identified as a symlink.
- Interfaces have pretty icons.
Reviewers: btrahan, cpiro, ddfisher, keebuhm, allenjohnashton
Reviewed By: btrahan
CC: aran, epriestley
Differential Revision: https://secure.phabricator.com/D1975
2012-03-21 22:01:20 +01:00
|
|
|
'html' => $this->renderPathIcon(
|
|
|
|
'dir',
|
|
|
|
$browse_text),
|
2011-03-31 07:41:31 +02:00
|
|
|
)).'</strong>';
|
Improve Diffusion behavior for externals
Summary:
- Feature request from Airtime that I missed in the feedback notes, came up yesterday.
- Identify git submodules as "FILE_SUBMODULE", not "FILE_NORMAL".
- Link git submodules to an external resolver endpoint, which tries to find commits in tracked repositories.
- Identify git symlinks as "FILE_SYMLINK", not "FILE_NORMAL".
- Add folder, file, symlink and externals icons.
Test Plan:
- externals/javelin is now identified as a submoudule and links to Javelin, not identified as a file and links to error.
- bin/phd is now identified as a symlink.
- Interfaces have pretty icons.
Reviewers: btrahan, cpiro, ddfisher, keebuhm, allenjohnashton
Reviewed By: btrahan
CC: aran, epriestley
Differential Revision: https://secure.phabricator.com/D1975
2012-03-21 22:01:20 +01:00
|
|
|
} else if ($file_type == DifferentialChangeType::FILE_SUBMODULE) {
|
|
|
|
$browse_text = $path->getPath().'/';
|
|
|
|
$browse_link =
|
|
|
|
'<strong>'.
|
|
|
|
$this->linkExternal(
|
|
|
|
$path->getHash(),
|
|
|
|
$path->getExternalURI(),
|
|
|
|
$this->renderPathIcon(
|
|
|
|
'ext',
|
|
|
|
$browse_text)).
|
|
|
|
'</strong>';
|
2011-03-13 01:17:34 +01:00
|
|
|
} else {
|
Improve Diffusion behavior for externals
Summary:
- Feature request from Airtime that I missed in the feedback notes, came up yesterday.
- Identify git submodules as "FILE_SUBMODULE", not "FILE_NORMAL".
- Link git submodules to an external resolver endpoint, which tries to find commits in tracked repositories.
- Identify git symlinks as "FILE_SYMLINK", not "FILE_NORMAL".
- Add folder, file, symlink and externals icons.
Test Plan:
- externals/javelin is now identified as a submoudule and links to Javelin, not identified as a file and links to error.
- bin/phd is now identified as a symlink.
- Interfaces have pretty icons.
Reviewers: btrahan, cpiro, ddfisher, keebuhm, allenjohnashton
Reviewed By: btrahan
CC: aran, epriestley
Differential Revision: https://secure.phabricator.com/D1975
2012-03-21 22:01:20 +01:00
|
|
|
if ($file_type == DifferentialChangeType::FILE_SYMLINK) {
|
|
|
|
$type = 'link';
|
|
|
|
} else {
|
|
|
|
$type = 'file';
|
|
|
|
}
|
2011-03-13 01:17:34 +01:00
|
|
|
$browse_text = $path->getPath();
|
2011-03-31 07:41:31 +02:00
|
|
|
$browse_link = $this->linkBrowse(
|
2012-04-25 19:27:56 +02:00
|
|
|
$base_path.$path->getPath(),
|
2011-03-31 07:41:31 +02:00
|
|
|
array(
|
Improve Diffusion behavior for externals
Summary:
- Feature request from Airtime that I missed in the feedback notes, came up yesterday.
- Identify git submodules as "FILE_SUBMODULE", not "FILE_NORMAL".
- Link git submodules to an external resolver endpoint, which tries to find commits in tracked repositories.
- Identify git symlinks as "FILE_SYMLINK", not "FILE_NORMAL".
- Add folder, file, symlink and externals icons.
Test Plan:
- externals/javelin is now identified as a submoudule and links to Javelin, not identified as a file and links to error.
- bin/phd is now identified as a symlink.
- Interfaces have pretty icons.
Reviewers: btrahan, cpiro, ddfisher, keebuhm, allenjohnashton
Reviewed By: btrahan
CC: aran, epriestley
Differential Revision: https://secure.phabricator.com/D1975
2012-03-21 22:01:20 +01:00
|
|
|
'html' => $this->renderPathIcon($type, $browse_text),
|
2011-03-31 07:41:31 +02:00
|
|
|
));
|
|
|
|
}
|
|
|
|
|
|
|
|
$commit = $path->getLastModifiedCommit();
|
|
|
|
if ($commit) {
|
2011-03-31 08:27:06 +02:00
|
|
|
$dict = self::renderLastModifiedColumns(
|
2011-03-31 07:41:31 +02:00
|
|
|
$repository,
|
2011-04-03 01:39:23 +02:00
|
|
|
$this->handles,
|
2011-03-31 08:27:06 +02:00
|
|
|
$commit,
|
|
|
|
$path->getLastCommitData());
|
2011-03-31 07:41:31 +02:00
|
|
|
} else {
|
2011-03-31 08:27:06 +02:00
|
|
|
$dict = array(
|
|
|
|
'commit' => celerity_generate_unique_node_id(),
|
|
|
|
'date' => celerity_generate_unique_node_id(),
|
|
|
|
'time' => celerity_generate_unique_node_id(),
|
|
|
|
'author' => celerity_generate_unique_node_id(),
|
|
|
|
'details' => celerity_generate_unique_node_id(),
|
|
|
|
);
|
Fix many encoding and architecture problems in Diffusion request and URI handling
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
2012-03-20 03:52:14 +01:00
|
|
|
|
|
|
|
$uri = (string)$request->generateURI(
|
|
|
|
array(
|
|
|
|
'action' => 'lastmodified',
|
|
|
|
'path' => $base_path.$path->getPath(),
|
|
|
|
));
|
|
|
|
|
2011-03-31 08:27:06 +02:00
|
|
|
$need_pull[$uri] = $dict;
|
|
|
|
foreach ($dict as $k => $uniq) {
|
|
|
|
$dict[$k] = '<span id="'.$uniq.'"></span>';
|
|
|
|
}
|
2011-03-13 01:17:34 +01:00
|
|
|
}
|
|
|
|
|
2011-03-08 02:25:47 +01:00
|
|
|
$rows[] = array(
|
2011-03-13 01:17:34 +01:00
|
|
|
$this->linkHistory($base_path.$path->getPath().$dir_slash),
|
2011-03-31 07:41:31 +02:00
|
|
|
$browse_link,
|
2011-03-31 08:27:06 +02:00
|
|
|
$dict['commit'],
|
|
|
|
$dict['date'],
|
|
|
|
$dict['time'],
|
|
|
|
$dict['author'],
|
|
|
|
$dict['details'],
|
2011-03-08 02:25:47 +01:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2011-03-31 08:27:06 +02:00
|
|
|
if ($need_pull) {
|
|
|
|
Javelin::initBehavior('diffusion-pull-lastmodified', $need_pull);
|
|
|
|
}
|
|
|
|
|
2011-03-08 02:25:47 +01:00
|
|
|
$view = new AphrontTableView($rows);
|
|
|
|
$view->setHeaders(
|
|
|
|
array(
|
2011-03-13 01:17:34 +01:00
|
|
|
'History',
|
2011-03-08 02:25:47 +01:00
|
|
|
'Path',
|
2011-03-31 07:41:31 +02:00
|
|
|
'Modified',
|
|
|
|
'Date',
|
|
|
|
'Time',
|
|
|
|
'Author',
|
|
|
|
'Details',
|
2011-03-08 02:25:47 +01:00
|
|
|
));
|
2011-03-13 01:17:34 +01:00
|
|
|
$view->setColumnClasses(
|
|
|
|
array(
|
|
|
|
'',
|
2011-03-31 07:41:31 +02:00
|
|
|
'',
|
|
|
|
'',
|
|
|
|
'',
|
|
|
|
'right',
|
|
|
|
'',
|
|
|
|
'wide',
|
2011-03-13 01:17:34 +01:00
|
|
|
));
|
2011-03-08 02:25:47 +01:00
|
|
|
return $view->render();
|
|
|
|
}
|
|
|
|
|
Improve Diffusion behavior for externals
Summary:
- Feature request from Airtime that I missed in the feedback notes, came up yesterday.
- Identify git submodules as "FILE_SUBMODULE", not "FILE_NORMAL".
- Link git submodules to an external resolver endpoint, which tries to find commits in tracked repositories.
- Identify git symlinks as "FILE_SYMLINK", not "FILE_NORMAL".
- Add folder, file, symlink and externals icons.
Test Plan:
- externals/javelin is now identified as a submoudule and links to Javelin, not identified as a file and links to error.
- bin/phd is now identified as a symlink.
- Interfaces have pretty icons.
Reviewers: btrahan, cpiro, ddfisher, keebuhm, allenjohnashton
Reviewed By: btrahan
CC: aran, epriestley
Differential Revision: https://secure.phabricator.com/D1975
2012-03-21 22:01:20 +01:00
|
|
|
private function renderPathIcon($type, $text) {
|
|
|
|
|
|
|
|
require_celerity_resource('diffusion-icons-css');
|
|
|
|
|
|
|
|
return phutil_render_tag(
|
|
|
|
'span',
|
|
|
|
array(
|
|
|
|
'class' => 'diffusion-path-icon diffusion-path-icon-'.$type,
|
|
|
|
),
|
|
|
|
phutil_escape_html($text));
|
|
|
|
}
|
|
|
|
|
2011-03-08 02:25:47 +01:00
|
|
|
}
|