2011-01-27 23:55:52 +01:00
|
|
|
<?php
|
|
|
|
|
|
|
|
/*
|
2012-01-05 23:41:11 +01:00
|
|
|
* Copyright 2012 Facebook, Inc.
|
2011-01-27 23:55:52 +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.
|
|
|
|
*/
|
|
|
|
|
2012-03-10 00:46:25 +01:00
|
|
|
final class DifferentialRevisionViewController extends DifferentialController {
|
2011-01-27 23:55:52 +01:00
|
|
|
|
|
|
|
private $revisionID;
|
|
|
|
|
2011-10-24 21:27:16 +02:00
|
|
|
public function shouldRequireLogin() {
|
|
|
|
return !$this->allowsAnonymousAccess();
|
|
|
|
}
|
|
|
|
|
2011-01-27 23:55:52 +01:00
|
|
|
public function willProcessRequest(array $data) {
|
|
|
|
$this->revisionID = $data['id'];
|
|
|
|
}
|
|
|
|
|
|
|
|
public function processRequest() {
|
|
|
|
|
|
|
|
$request = $this->getRequest();
|
2011-02-06 01:57:21 +01:00
|
|
|
$user = $request->getUser();
|
2011-10-24 21:27:16 +02:00
|
|
|
$viewer_is_anonymous = !$user->isLoggedIn();
|
2011-01-27 23:55:52 +01:00
|
|
|
|
|
|
|
$revision = id(new DifferentialRevision())->load($this->revisionID);
|
|
|
|
if (!$revision) {
|
|
|
|
return new Aphront404Response();
|
|
|
|
}
|
|
|
|
|
|
|
|
$revision->loadRelationships();
|
|
|
|
|
|
|
|
$diffs = $revision->loadDiffs();
|
|
|
|
|
2011-03-25 05:32:26 +01:00
|
|
|
if (!$diffs) {
|
|
|
|
throw new Exception(
|
|
|
|
"This revision has no diffs. Something has gone quite wrong.");
|
|
|
|
}
|
|
|
|
|
2011-02-04 00:41:58 +01:00
|
|
|
$diff_vs = $request->getInt('vs');
|
2011-04-11 21:32:08 +02:00
|
|
|
|
|
|
|
$target_id = $request->getInt('id');
|
2012-05-23 01:09:49 +02:00
|
|
|
$target = idx($diffs, $target_id, end($diffs));
|
2011-01-27 23:55:52 +01:00
|
|
|
|
2012-05-22 02:55:35 +02:00
|
|
|
$target_manual = $target;
|
|
|
|
if (!$target_id) {
|
2012-05-25 10:23:26 +02:00
|
|
|
foreach ($diffs as $diff) {
|
|
|
|
if ($diff->getCreationMethod() != 'commit') {
|
|
|
|
$target_manual = $diff;
|
|
|
|
}
|
|
|
|
}
|
2012-05-22 02:55:35 +02:00
|
|
|
}
|
|
|
|
|
2011-02-04 00:41:58 +01:00
|
|
|
if (empty($diffs[$diff_vs])) {
|
|
|
|
$diff_vs = null;
|
|
|
|
}
|
|
|
|
|
2012-06-28 19:12:20 +02:00
|
|
|
$arc_project = $target->loadArcanistProject();
|
|
|
|
$repository = ($arc_project ? $arc_project->loadRepository() : null);
|
|
|
|
|
|
|
|
list($changesets, $vs_map, $vs_changesets, $rendering_references) =
|
|
|
|
$this->loadChangesetsAndVsMap(
|
|
|
|
$target,
|
|
|
|
idx($diffs, $diff_vs),
|
|
|
|
$repository);
|
|
|
|
|
|
|
|
if ($request->getExists('download')) {
|
|
|
|
return $this->buildRawDiffResponse($changesets,
|
|
|
|
$vs_changesets,
|
|
|
|
$vs_map,
|
|
|
|
$repository);
|
|
|
|
}
|
|
|
|
|
2011-08-30 20:34:07 +02:00
|
|
|
list($aux_fields, $props) = $this->loadAuxiliaryFieldsAndProperties(
|
|
|
|
$revision,
|
2012-05-22 02:55:35 +02:00
|
|
|
$target_manual,
|
2011-08-30 20:34:07 +02:00
|
|
|
array(
|
|
|
|
'local:commits',
|
2012-05-29 20:23:23 +02:00
|
|
|
'arc:lint',
|
2012-03-13 01:06:55 +01:00
|
|
|
'arc:unit',
|
2011-08-30 20:34:07 +02:00
|
|
|
));
|
2011-08-14 20:29:56 +02:00
|
|
|
|
2011-01-27 23:55:52 +01:00
|
|
|
|
2011-01-30 19:37:36 +01:00
|
|
|
$comments = $revision->loadComments();
|
|
|
|
$comments = array_merge(
|
2012-05-25 10:23:26 +02:00
|
|
|
$this->getImplicitComments($revision, reset($diffs)),
|
2011-01-30 19:37:36 +01:00
|
|
|
$comments);
|
|
|
|
|
2011-03-08 07:01:33 +01:00
|
|
|
$all_changesets = $changesets;
|
|
|
|
$inlines = $this->loadInlineComments($comments, $all_changesets);
|
2011-02-03 04:38:43 +01:00
|
|
|
|
2011-01-27 23:55:52 +01:00
|
|
|
$object_phids = array_merge(
|
|
|
|
$revision->getReviewers(),
|
|
|
|
$revision->getCCPHIDs(),
|
2011-04-08 06:59:42 +02:00
|
|
|
$revision->loadCommitPHIDs(),
|
2011-01-27 23:55:52 +01:00
|
|
|
array(
|
2011-01-30 19:37:36 +01:00
|
|
|
$revision->getAuthorPHID(),
|
2011-02-06 01:57:21 +01:00
|
|
|
$user->getPHID(),
|
2011-01-30 19:37:36 +01:00
|
|
|
),
|
|
|
|
mpull($comments, 'getAuthorPHID'));
|
2011-06-01 20:19:55 +02:00
|
|
|
|
|
|
|
foreach ($comments as $comment) {
|
|
|
|
$metadata = $comment->getMetadata();
|
|
|
|
$added_reviewers = idx(
|
|
|
|
$metadata,
|
|
|
|
DifferentialComment::METADATA_ADDED_REVIEWERS);
|
|
|
|
if ($added_reviewers) {
|
|
|
|
foreach ($added_reviewers as $phid) {
|
|
|
|
$object_phids[] = $phid;
|
|
|
|
}
|
|
|
|
}
|
2011-06-24 21:21:48 +02:00
|
|
|
$added_ccs = idx(
|
|
|
|
$metadata,
|
|
|
|
DifferentialComment::METADATA_ADDED_CCS);
|
|
|
|
if ($added_ccs) {
|
|
|
|
foreach ($added_ccs as $phid) {
|
|
|
|
$object_phids[] = $phid;
|
|
|
|
}
|
|
|
|
}
|
2011-06-01 20:19:55 +02:00
|
|
|
}
|
|
|
|
|
2011-02-17 23:32:01 +01:00
|
|
|
foreach ($revision->getAttached() as $type => $phids) {
|
|
|
|
foreach ($phids as $phid => $info) {
|
|
|
|
$object_phids[] = $phid;
|
|
|
|
}
|
|
|
|
}
|
2011-08-14 21:33:54 +02:00
|
|
|
|
|
|
|
$aux_phids = array();
|
|
|
|
foreach ($aux_fields as $key => $aux_field) {
|
|
|
|
$aux_phids[$key] = $aux_field->getRequiredHandlePHIDsForRevisionView();
|
|
|
|
}
|
|
|
|
$object_phids = array_merge($object_phids, array_mergev($aux_phids));
|
2011-02-03 04:38:43 +01:00
|
|
|
$object_phids = array_unique($object_phids);
|
2011-01-27 23:55:52 +01:00
|
|
|
|
|
|
|
$handles = id(new PhabricatorObjectHandleData($object_phids))
|
|
|
|
->loadHandles();
|
|
|
|
|
2011-08-14 21:33:54 +02:00
|
|
|
foreach ($aux_fields as $key => $aux_field) {
|
|
|
|
// Make sure each field only has access to handles it specifically
|
|
|
|
// requested, not all handles. Otherwise you can get a field which works
|
|
|
|
// only in the presence of other fields.
|
|
|
|
$aux_field->setHandles(array_select_keys($handles, $aux_phids[$key]));
|
|
|
|
}
|
|
|
|
|
2012-01-17 01:54:05 +01:00
|
|
|
$reviewer_warning = null;
|
|
|
|
$has_live_reviewer = false;
|
|
|
|
foreach ($revision->getReviewers() as $reviewer) {
|
|
|
|
if (!$handles[$reviewer]->isDisabled()) {
|
|
|
|
$has_live_reviewer = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!$has_live_reviewer) {
|
|
|
|
$reviewer_warning = new AphrontErrorView();
|
|
|
|
$reviewer_warning->setSeverity(AphrontErrorView::SEVERITY_WARNING);
|
|
|
|
$reviewer_warning->setTitle('No Active Reviewers');
|
|
|
|
if ($revision->getReviewers()) {
|
|
|
|
$reviewer_warning->appendChild(
|
|
|
|
'<p>All specified reviewers are disabled. You may want to add '.
|
|
|
|
'some new reviewers.</p>');
|
|
|
|
} else {
|
|
|
|
$reviewer_warning->appendChild(
|
|
|
|
'<p>This revision has no specified reviewers. You may want to '.
|
|
|
|
'add some.</p>');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-06 01:43:28 +01:00
|
|
|
$request_uri = $request->getRequestURI();
|
|
|
|
|
|
|
|
$limit = 100;
|
|
|
|
$large = $request->getStr('large');
|
|
|
|
if (count($changesets) > $limit && !$large) {
|
|
|
|
$count = number_format(count($changesets));
|
|
|
|
$warning = new AphrontErrorView();
|
|
|
|
$warning->setTitle('Very Large Diff');
|
|
|
|
$warning->setSeverity(AphrontErrorView::SEVERITY_WARNING);
|
|
|
|
$warning->setWidth(AphrontErrorView::WIDTH_WIDE);
|
|
|
|
$warning->appendChild(
|
2012-05-29 20:23:23 +02:00
|
|
|
"<p>This diff is very large and affects {$count} files. Load ".
|
|
|
|
"each file individually. ".
|
2011-02-06 01:43:28 +01:00
|
|
|
"<strong>".
|
|
|
|
phutil_render_tag(
|
|
|
|
'a',
|
|
|
|
array(
|
2012-04-13 06:16:59 +02:00
|
|
|
'href' => $request_uri
|
|
|
|
->alter('large', 'true')
|
2012-08-22 00:01:20 +02:00
|
|
|
->setFragment('toc'),
|
2011-02-06 01:43:28 +01:00
|
|
|
),
|
2011-04-15 23:25:23 +02:00
|
|
|
'Show All Files Inline').
|
2011-02-06 01:43:28 +01:00
|
|
|
"</strong>");
|
|
|
|
$warning = $warning->render();
|
|
|
|
|
2012-08-07 05:42:43 +02:00
|
|
|
$my_inlines = id(new DifferentialInlineComment())->loadAllWhere(
|
|
|
|
'revisionID = %d AND commentID IS NULL AND authorPHID = %s AND '.
|
|
|
|
'changesetID IN (%Ld)',
|
|
|
|
$this->revisionID,
|
|
|
|
$user->getPHID(),
|
|
|
|
mpull($changesets, 'getID'));
|
|
|
|
|
2011-04-15 23:25:23 +02:00
|
|
|
$visible_changesets = array();
|
2012-08-07 05:42:43 +02:00
|
|
|
foreach ($inlines + $my_inlines as $inline) {
|
2012-05-29 20:23:23 +02:00
|
|
|
$changeset_id = $inline->getChangesetID();
|
|
|
|
if (isset($changesets[$changeset_id])) {
|
|
|
|
$visible_changesets[$changeset_id] = $changesets[$changeset_id];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!empty($props['arc:lint'])) {
|
|
|
|
$changeset_paths = mpull($changesets, null, 'getFilename');
|
|
|
|
foreach ($props['arc:lint'] as $lint) {
|
|
|
|
$changeset = idx($changeset_paths, $lint['path']);
|
|
|
|
if ($changeset) {
|
|
|
|
$visible_changesets[$changeset->getID()] = $changeset;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-06 01:43:28 +01:00
|
|
|
} else {
|
|
|
|
$warning = null;
|
|
|
|
$visible_changesets = $changesets;
|
|
|
|
}
|
|
|
|
|
2011-01-27 23:55:52 +01:00
|
|
|
$revision_detail = new DifferentialRevisionDetailView();
|
|
|
|
$revision_detail->setRevision($revision);
|
2011-08-10 22:46:01 +02:00
|
|
|
$revision_detail->setAuxiliaryFields($aux_fields);
|
2011-01-27 23:55:52 +01:00
|
|
|
|
2011-08-14 22:55:30 +02:00
|
|
|
$actions = $this->getRevisionActions($revision);
|
|
|
|
|
2011-04-13 00:57:29 +02:00
|
|
|
$custom_renderer_class = PhabricatorEnv::getEnvConfig(
|
|
|
|
'differential.revision-custom-detail-renderer');
|
|
|
|
if ($custom_renderer_class) {
|
2011-08-14 22:55:30 +02:00
|
|
|
|
2011-08-18 09:17:50 +02:00
|
|
|
// TODO: build a better version of the action links and deprecate the
|
|
|
|
// whole DifferentialRevisionDetailRenderer class.
|
2012-06-16 02:15:29 +02:00
|
|
|
$custom_renderer = newv($custom_renderer_class, array());
|
2012-08-16 00:31:39 +02:00
|
|
|
$custom_renderer->setDiff($target);
|
2012-06-16 02:15:29 +02:00
|
|
|
if ($diff_vs) {
|
|
|
|
$custom_renderer->setVSDiff($diffs[$diff_vs]);
|
|
|
|
}
|
2011-04-13 00:57:29 +02:00
|
|
|
$actions = array_merge(
|
|
|
|
$actions,
|
2012-05-22 02:55:35 +02:00
|
|
|
$custom_renderer->generateActionLinks($revision, $target_manual));
|
2011-04-13 00:57:29 +02:00
|
|
|
}
|
|
|
|
|
2011-04-28 06:16:35 +02:00
|
|
|
$whitespace = $request->getStr(
|
|
|
|
'whitespace',
|
Tie all the pieces for symbol cross-references together
Summary:
This makes symbol cross-references work in Differential. You need to do a little
legwork but I'll document that once the change has baked for a little while.
Basically:
- Projects are annotated with indexed languages, and "shared library" projects
(for example, symbols in Phabricator should be searched for in Arcanist and
libphutil).
- When we render a changeset, we check if its language is an indexed one. If
it is, we invoke the decorator Javascript.
- The Javascript takes you to a lookup page, which either gives you a list of
matching symbols (if several match) or redirects you instantly to the
definition.
Test Plan: Clicked class and function symbols in a diff, got jumped into
sensible sorts of places in Diffusion.
Reviewers: jungejason, nh, tuomaspelkonen, aran
Reviewed By: jungejason
CC: aran, jungejason
Differential Revision: 980
2011-10-03 01:02:56 +02:00
|
|
|
DifferentialChangesetParser::WHITESPACE_IGNORE_ALL);
|
2011-04-28 06:16:35 +02:00
|
|
|
|
2012-01-05 23:41:11 +01:00
|
|
|
if ($arc_project) {
|
Support symbol linking in Remarkup code blocks
Summary:
Trigger the crossreference behavior on code blocks. Limited to
Differential, where we know what the project is, but includes regular
comments, inline comments, and previews of both.
(Hopefully event handlers on deleted elements also get deleted, so we
don't leak memory? Also, caching is a problem, and I didn't find a way
to mark existing cache entries as stale, like
`DifferentialChangesetParser::CACHE_VERSION`...)
Test Plan:
Load Differential revision, make lots of comments, click on
things.
Reviewers: epriestley
Reviewed By: epriestley
CC: aran, Korvin
Maniphest Tasks: T1602
Differential Revision: https://secure.phabricator.com/D3283
2012-08-14 23:03:26 +02:00
|
|
|
list($symbol_indexes, $project_phids) = $this->buildSymbolIndexes(
|
2012-01-05 23:41:11 +01:00
|
|
|
$arc_project,
|
|
|
|
$visible_changesets);
|
|
|
|
} else {
|
|
|
|
$symbol_indexes = array();
|
Support symbol linking in Remarkup code blocks
Summary:
Trigger the crossreference behavior on code blocks. Limited to
Differential, where we know what the project is, but includes regular
comments, inline comments, and previews of both.
(Hopefully event handlers on deleted elements also get deleted, so we
don't leak memory? Also, caching is a problem, and I didn't find a way
to mark existing cache entries as stale, like
`DifferentialChangesetParser::CACHE_VERSION`...)
Test Plan:
Load Differential revision, make lots of comments, click on
things.
Reviewers: epriestley
Reviewed By: epriestley
CC: aran, Korvin
Maniphest Tasks: T1602
Differential Revision: https://secure.phabricator.com/D3283
2012-08-14 23:03:26 +02:00
|
|
|
$project_phids = null;
|
2012-01-05 23:41:11 +01:00
|
|
|
}
|
2011-01-27 23:55:52 +01:00
|
|
|
|
Tie all the pieces for symbol cross-references together
Summary:
This makes symbol cross-references work in Differential. You need to do a little
legwork but I'll document that once the change has baked for a little while.
Basically:
- Projects are annotated with indexed languages, and "shared library" projects
(for example, symbols in Phabricator should be searched for in Arcanist and
libphutil).
- When we render a changeset, we check if its language is an indexed one. If
it is, we invoke the decorator Javascript.
- The Javascript takes you to a lookup page, which either gives you a list of
matching symbols (if several match) or redirects you instantly to the
definition.
Test Plan: Clicked class and function symbols in a diff, got jumped into
sensible sorts of places in Diffusion.
Reviewers: jungejason, nh, tuomaspelkonen, aran
Reviewed By: jungejason
CC: aran, jungejason
Differential Revision: 980
2011-10-03 01:02:56 +02:00
|
|
|
$revision_detail->setActions($actions);
|
2011-04-13 03:17:43 +02:00
|
|
|
$revision_detail->setUser($user);
|
|
|
|
|
2011-01-30 19:37:36 +01:00
|
|
|
$comment_view = new DifferentialRevisionCommentListView();
|
|
|
|
$comment_view->setComments($comments);
|
|
|
|
$comment_view->setHandles($handles);
|
2011-02-03 04:38:43 +01:00
|
|
|
$comment_view->setInlineComments($inlines);
|
2011-03-08 07:01:33 +01:00
|
|
|
$comment_view->setChangesets($all_changesets);
|
2011-02-06 01:57:21 +01:00
|
|
|
$comment_view->setUser($user);
|
2011-04-15 02:22:57 +02:00
|
|
|
$comment_view->setTargetDiff($target);
|
2012-01-06 16:36:55 +01:00
|
|
|
$comment_view->setVersusDiffID($diff_vs);
|
2011-01-30 19:37:36 +01:00
|
|
|
|
Support symbol linking in Remarkup code blocks
Summary:
Trigger the crossreference behavior on code blocks. Limited to
Differential, where we know what the project is, but includes regular
comments, inline comments, and previews of both.
(Hopefully event handlers on deleted elements also get deleted, so we
don't leak memory? Also, caching is a problem, and I didn't find a way
to mark existing cache entries as stale, like
`DifferentialChangesetParser::CACHE_VERSION`...)
Test Plan:
Load Differential revision, make lots of comments, click on
things.
Reviewers: epriestley
Reviewed By: epriestley
CC: aran, Korvin
Maniphest Tasks: T1602
Differential Revision: https://secure.phabricator.com/D3283
2012-08-14 23:03:26 +02:00
|
|
|
if ($arc_project) {
|
|
|
|
Javelin::initBehavior(
|
|
|
|
'repository-crossreference',
|
|
|
|
array(
|
|
|
|
'section' => $comment_view->getID(),
|
|
|
|
'projects' => $project_phids,
|
|
|
|
));
|
|
|
|
}
|
|
|
|
|
2011-04-28 01:19:31 +02:00
|
|
|
$changeset_view = new DifferentialChangesetListView();
|
2012-05-01 21:09:50 +02:00
|
|
|
$changeset_view->setChangesets($changesets);
|
|
|
|
$changeset_view->setVisibleChangesets($visible_changesets);
|
Add inline comments to Diffusion/Audit
Summary:
- Add inline comments to Audits, like Differential.
- Creates new storage for the comments in the Audits database.
- Creates a new PhabricatorAuditInlineComment class, similar to DifferentialInlineComment.
- Defines an Interface which Differential and Audit comments conform to.
- Makes consumers of DifferentialInlineComments consume objects which implement that interface instead.
- Adds save
NOTE: Some features are still missing! Wanted to cut this off before it got crazy:
- Inline comments aren't shown in the main comment list.
- Inline comments aren't shown in the emails.
- Inline comments aren't previewed.
I'll followup with those but this was getting pretty big.
@vrana, does the SQL change look correct?
Test Plan:
- Created, edited, deleted, replied to, reloaded and saved inline comments in Diffusion, on the left and right side of diffs.
- Created, edited, deleted, replied to, reloaded and saved inline comments in Differentila, on the left and right side of primary and diff-versus-diff diffs.
Reviewers: btrahan, vrana
Reviewed By: btrahan
CC: aran, epriestley
Maniphest Tasks: T904
Differential Revision: https://secure.phabricator.com/D1898
2012-03-14 20:56:01 +01:00
|
|
|
|
|
|
|
if (!$viewer_is_anonymous) {
|
|
|
|
$changeset_view->setInlineCommentControllerURI(
|
|
|
|
'/differential/comment/inline/edit/'.$revision->getID().'/');
|
|
|
|
}
|
|
|
|
|
2012-03-20 03:57:41 +01:00
|
|
|
$changeset_view->setStandaloneURI('/differential/changeset/');
|
|
|
|
$changeset_view->setRawFileURIs(
|
|
|
|
'/differential/changeset/?view=old',
|
|
|
|
'/differential/changeset/?view=new');
|
|
|
|
|
2012-01-16 20:08:54 +01:00
|
|
|
$changeset_view->setUser($user);
|
2012-01-05 23:41:11 +01:00
|
|
|
$changeset_view->setDiff($target);
|
Move "Rendering References" to the DifferentialChangesetParser level
Summary:
Separates changeset IDs from rendering. Now each changeset has a "rendering
reference" which is basically a description of what the ajax endpoint should
render. For Differential, it's in the form "id/vs". For Diffusion,
"branch/path;commit".
I believe this fixes pretty much all of the bugs related to "show more" breaking
in various obscure ways, although I never got a great repro for T153.
Test Plan:
Clicked "show more" in diffusion change and commit views and differential diff,
diff-of-diff, standalone-diff, standalone-diff-of-diff views. Verified refs and
'whitespace' were always sent correctly.
Made inline comments on diffs and diffs-of-diffs. Used "Reply".
Reviewed By: tuomaspelkonen
Reviewers: tuomaspelkonen, jungejason, aran
CC: aran, tuomaspelkonen, epriestley
Differential Revision: 274
2011-05-12 06:46:29 +02:00
|
|
|
$changeset_view->setRenderingReferences($rendering_references);
|
Resolve great internal confusion about left vs right inline comments
Summary:
This code was just all kinds of wrong, but got all the common cases anyone cares
about correct.
- In edit-inline-comments.js, if isOnRight() is true, use data.right, not
data.left (derp).
- Set data.left correctly, not to the same value as data.right (derp derp).
- Set "isNewFile" based on $is_new, not $on_right (derp derp derp).
Test Plan:
- Added JS debugging code to print "OLD" vs "NEW" and "LEFT" vs "RIGHT".
Clicked the left and right sides of diff-vs-base and diff-vs-diff diffs,
verified output was accurate in all cases.
- Added comments to the left-display-side of a diff-of-diffs, saved them, they
showed up where I put them.
Reviewers: btrahan, vrana
Reviewed By: btrahan
CC: aran, epriestley
Maniphest Tasks: T543
Differential Revision: https://secure.phabricator.com/D1567
2012-02-04 00:26:47 +01:00
|
|
|
$changeset_view->setVsMap($vs_map);
|
2011-04-28 06:16:35 +02:00
|
|
|
$changeset_view->setWhitespace($whitespace);
|
2012-01-05 23:41:11 +01:00
|
|
|
if ($repository) {
|
2012-06-12 01:22:08 +02:00
|
|
|
$changeset_view->setRepository($repository);
|
2012-01-05 23:41:11 +01:00
|
|
|
}
|
Tie all the pieces for symbol cross-references together
Summary:
This makes symbol cross-references work in Differential. You need to do a little
legwork but I'll document that once the change has baked for a little while.
Basically:
- Projects are annotated with indexed languages, and "shared library" projects
(for example, symbols in Phabricator should be searched for in Arcanist and
libphutil).
- When we render a changeset, we check if its language is an indexed one. If
it is, we invoke the decorator Javascript.
- The Javascript takes you to a lookup page, which either gives you a list of
matching symbols (if several match) or redirects you instantly to the
definition.
Test Plan: Clicked class and function symbols in a diff, got jumped into
sensible sorts of places in Diffusion.
Reviewers: jungejason, nh, tuomaspelkonen, aran
Reviewed By: jungejason
CC: aran, jungejason
Differential Revision: 980
2011-10-03 01:02:56 +02:00
|
|
|
$changeset_view->setSymbolIndexes($symbol_indexes);
|
2011-04-28 01:19:31 +02:00
|
|
|
|
2011-01-30 19:37:36 +01:00
|
|
|
$diff_history = new DifferentialRevisionUpdateHistoryView();
|
|
|
|
$diff_history->setDiffs($diffs);
|
2011-02-03 22:20:43 +01:00
|
|
|
$diff_history->setSelectedVersusDiffID($diff_vs);
|
|
|
|
$diff_history->setSelectedDiffID($target->getID());
|
2011-04-28 06:16:35 +02:00
|
|
|
$diff_history->setSelectedWhitespace($whitespace);
|
2011-12-04 01:36:19 +01:00
|
|
|
$diff_history->setUser($user);
|
2011-01-30 19:37:36 +01:00
|
|
|
|
2011-08-30 20:34:07 +02:00
|
|
|
$local_view = new DifferentialLocalCommitsView();
|
|
|
|
$local_view->setUser($user);
|
|
|
|
$local_view->setLocalCommits(idx($props, 'local:commits'));
|
|
|
|
|
2012-04-10 22:34:31 +02:00
|
|
|
if ($repository) {
|
|
|
|
$other_revisions = $this->loadOtherRevisions(
|
|
|
|
$changesets,
|
|
|
|
$target,
|
|
|
|
$repository);
|
|
|
|
} else {
|
|
|
|
$other_revisions = array();
|
|
|
|
}
|
2012-03-30 19:13:08 +02:00
|
|
|
|
|
|
|
$other_view = null;
|
|
|
|
if ($other_revisions) {
|
|
|
|
$other_view = $this->renderOtherRevisions($other_revisions);
|
|
|
|
}
|
|
|
|
|
2011-01-30 19:37:36 +01:00
|
|
|
$toc_view = new DifferentialDiffTableOfContentsView();
|
|
|
|
$toc_view->setChangesets($changesets);
|
2012-03-15 18:45:35 +01:00
|
|
|
$toc_view->setVisibleChangesets($visible_changesets);
|
2012-05-01 21:09:50 +02:00
|
|
|
$toc_view->setRenderingReferences($rendering_references);
|
2012-03-13 01:06:55 +01:00
|
|
|
$toc_view->setUnitTestData(idx($props, 'arc:unit', array()));
|
2012-03-01 08:16:45 +01:00
|
|
|
if ($repository) {
|
|
|
|
$toc_view->setRepository($repository);
|
|
|
|
}
|
|
|
|
$toc_view->setDiff($target);
|
|
|
|
$toc_view->setUser($user);
|
2011-04-15 23:25:23 +02:00
|
|
|
$toc_view->setRevisionID($revision->getID());
|
2011-04-28 06:16:35 +02:00
|
|
|
$toc_view->setWhitespace($whitespace);
|
2011-01-30 19:37:36 +01:00
|
|
|
|
2012-05-10 00:56:37 +02:00
|
|
|
$comment_form = null;
|
2011-10-24 21:27:16 +02:00
|
|
|
if (!$viewer_is_anonymous) {
|
|
|
|
$draft = id(new PhabricatorDraft())->loadOneWhere(
|
|
|
|
'authorPHID = %s AND draftKey = %s',
|
|
|
|
$user->getPHID(),
|
|
|
|
'differential-comment-'.$revision->getID());
|
|
|
|
if ($draft) {
|
|
|
|
$draft = $draft->getDraft();
|
|
|
|
} else {
|
|
|
|
$draft = null;
|
|
|
|
}
|
2011-02-06 01:57:21 +01:00
|
|
|
|
2011-10-24 21:27:16 +02:00
|
|
|
$comment_form = new DifferentialAddCommentView();
|
|
|
|
$comment_form->setRevision($revision);
|
2012-03-27 07:16:46 +02:00
|
|
|
$comment_form->setAuxFields($aux_fields);
|
2011-10-24 21:27:16 +02:00
|
|
|
$comment_form->setActions($this->getRevisionCommentActions($revision));
|
|
|
|
$comment_form->setActionURI('/differential/comment/save/');
|
|
|
|
$comment_form->setUser($user);
|
|
|
|
$comment_form->setDraft($draft);
|
|
|
|
}
|
Differential Updates View
Summary:
This adds a new view to differential called Updates.
The high-level goal of Updates is to enabled differential to be
effectively used without email notifications. I've tried doing things
like automatically deleting differential emails where I'm in the 'to'
line since they show up on the main diffential page but then there's
always the chance an important diff flies by without me seeing it. Also,
sometimes someone comments on a diff post-commit but differential
doesn't surface those diffs.
I re-created a test db on my devserver using mysqldump to get data on
revs > 230000 so I would have some test data. We need to add a simple
viewtime table but I didn't want to do that in production. Here's the
table:
CREATE TABLE differential_viewtime (
viewerPHID varchar(64) not null,
objectPHID varchar(64) not null,
viewTime int unsigned not null,
PRIMARY KEY (viewerPHID, objectPHID)
);
Issues:
-Once we turn this on, all diffs will be 'unviewed'. What do you think
about a 'Clear All' button or something?
-Maybe we should add a pager
This feature would be insanely useful, let me know what you think.
Test Plan:
Loaded Updates in my sandbox
http://phabricator.dev1577.snc6.facebook.com/differential/filter/updates/
Clicked a diff, then went back, made sure diff disappeared from Updates
list
Reviewed By: tuomaspelkonen
Reviewers: epriestley, jungejason, tuomaspelkonen
Commenters: epriestley
CC: epriestley, elynde, tuomaspelkonen
Differential Revision: 169
2011-04-27 10:27:06 +02:00
|
|
|
|
2011-07-08 22:00:30 +02:00
|
|
|
$pane_id = celerity_generate_unique_node_id();
|
|
|
|
Javelin::initBehavior(
|
|
|
|
'differential-keyboard-navigation',
|
|
|
|
array(
|
|
|
|
'haunt' => $pane_id,
|
|
|
|
));
|
2012-04-17 03:53:38 +02:00
|
|
|
Javelin::initBehavior('differential-user-select');
|
2011-07-08 22:00:30 +02:00
|
|
|
|
2011-10-24 21:27:16 +02:00
|
|
|
$page_pane = id(new DifferentialPrimaryPaneView())
|
|
|
|
->setLineWidthFromChangesets($changesets)
|
|
|
|
->setID($pane_id)
|
|
|
|
->appendChild(
|
|
|
|
$comment_view->render().
|
|
|
|
$diff_history->render().
|
|
|
|
$warning.
|
|
|
|
$local_view->render().
|
|
|
|
$toc_view->render().
|
2012-03-30 19:13:08 +02:00
|
|
|
$other_view.
|
2011-10-24 21:27:16 +02:00
|
|
|
$changeset_view->render());
|
|
|
|
if ($comment_form) {
|
|
|
|
$page_pane->appendChild($comment_form->render());
|
|
|
|
}
|
2012-06-09 03:45:26 +02:00
|
|
|
|
|
|
|
PhabricatorFeedStoryNotification::updateObjectNotificationViews(
|
|
|
|
$user, $revision->getPHID());
|
|
|
|
|
2012-08-22 00:01:20 +02:00
|
|
|
$top_anchor = id(new PhabricatorAnchorView())
|
|
|
|
->setAnchorName('top')
|
|
|
|
->setNavigationMarker(true);
|
|
|
|
|
|
|
|
$nav = $this->buildSideNavView($revision, $changesets);
|
|
|
|
$nav->selectFilter('');
|
|
|
|
$nav->appendChild(
|
2012-03-30 23:12:10 +02:00
|
|
|
array(
|
|
|
|
$reviewer_warning,
|
2012-08-22 00:01:20 +02:00
|
|
|
$top_anchor,
|
2012-03-30 23:12:10 +02:00
|
|
|
$revision_detail,
|
|
|
|
$page_pane,
|
2012-08-22 00:01:20 +02:00
|
|
|
));
|
|
|
|
|
|
|
|
return $this->buildApplicationPage(
|
|
|
|
$nav,
|
2011-01-27 23:55:52 +01:00
|
|
|
array(
|
2011-06-14 21:53:52 +02:00
|
|
|
'title' => 'D'.$revision->getID().' '.$revision->getTitle(),
|
2011-01-27 23:55:52 +01:00
|
|
|
));
|
|
|
|
}
|
|
|
|
|
2012-05-24 23:21:50 +02:00
|
|
|
private function getImplicitComments(
|
|
|
|
DifferentialRevision $revision,
|
|
|
|
DifferentialDiff $diff) {
|
2012-05-23 23:57:54 +02:00
|
|
|
|
2012-06-02 02:42:05 +02:00
|
|
|
$author_phid = nonempty(
|
|
|
|
$diff->getAuthorPHID(),
|
|
|
|
$revision->getAuthorPHID());
|
|
|
|
|
2011-01-30 19:37:36 +01:00
|
|
|
$template = new DifferentialComment();
|
2012-06-02 02:42:05 +02:00
|
|
|
$template->setAuthorPHID($author_phid);
|
2011-01-30 19:37:36 +01:00
|
|
|
$template->setRevisionID($revision->getID());
|
|
|
|
$template->setDateCreated($revision->getDateCreated());
|
|
|
|
|
|
|
|
$comments = array();
|
|
|
|
|
|
|
|
if (strlen($revision->getSummary())) {
|
|
|
|
$summary_comment = clone $template;
|
|
|
|
$summary_comment->setContent($revision->getSummary());
|
|
|
|
$summary_comment->setAction(DifferentialAction::ACTION_SUMMARIZE);
|
|
|
|
$comments[] = $summary_comment;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strlen($revision->getTestPlan())) {
|
|
|
|
$testplan_comment = clone $template;
|
|
|
|
$testplan_comment->setContent($revision->getTestPlan());
|
|
|
|
$testplan_comment->setAction(DifferentialAction::ACTION_TESTPLAN);
|
|
|
|
$comments[] = $testplan_comment;
|
|
|
|
}
|
|
|
|
|
|
|
|
return $comments;
|
|
|
|
}
|
|
|
|
|
2011-01-27 23:55:52 +01:00
|
|
|
private function getRevisionActions(DifferentialRevision $revision) {
|
2012-03-28 01:22:40 +02:00
|
|
|
$user = $this->getRequest()->getUser();
|
|
|
|
$viewer_phid = $user->getPHID();
|
2011-01-30 19:37:36 +01:00
|
|
|
$viewer_is_owner = ($revision->getAuthorPHID() == $viewer_phid);
|
2011-01-27 23:55:52 +01:00
|
|
|
$viewer_is_reviewer = in_array($viewer_phid, $revision->getReviewers());
|
|
|
|
$viewer_is_cc = in_array($viewer_phid, $revision->getCCPHIDs());
|
2011-10-24 21:27:16 +02:00
|
|
|
$viewer_is_anonymous = !$this->getRequest()->getUser()->isLoggedIn();
|
2011-01-27 23:55:52 +01:00
|
|
|
$status = $revision->getStatus();
|
|
|
|
$revision_id = $revision->getID();
|
|
|
|
$revision_phid = $revision->getPHID();
|
|
|
|
|
|
|
|
$links = array();
|
|
|
|
|
|
|
|
if ($viewer_is_owner) {
|
|
|
|
$links[] = array(
|
|
|
|
'class' => 'revision-edit',
|
|
|
|
'href' => "/differential/revision/edit/{$revision_id}/",
|
|
|
|
'name' => 'Edit Revision',
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2011-10-24 21:27:16 +02:00
|
|
|
if (!$viewer_is_anonymous) {
|
2012-03-28 01:22:40 +02:00
|
|
|
|
|
|
|
require_celerity_resource('phabricator-flag-css');
|
|
|
|
|
|
|
|
$flag = PhabricatorFlagQuery::loadUserFlag($user, $revision_phid);
|
|
|
|
if ($flag) {
|
|
|
|
$class = PhabricatorFlagColor::getCSSClass($flag->getColor());
|
|
|
|
$color = PhabricatorFlagColor::getColorName($flag->getColor());
|
|
|
|
$links[] = array(
|
|
|
|
'class' => 'flag-clear '.$class,
|
|
|
|
'href' => '/flag/delete/'.$flag->getID().'/',
|
|
|
|
'name' => phutil_escape_html('Remove '.$color.' Flag'),
|
|
|
|
'sigil' => 'workflow',
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
$links[] = array(
|
|
|
|
'class' => 'flag-add phabricator-flag-ghost',
|
|
|
|
'href' => '/flag/edit/'.$revision_phid.'/',
|
|
|
|
'name' => 'Flag Revision',
|
|
|
|
'sigil' => 'workflow',
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2011-10-24 21:27:16 +02:00
|
|
|
if (!$viewer_is_owner && !$viewer_is_reviewer) {
|
|
|
|
$action = $viewer_is_cc ? 'rem' : 'add';
|
|
|
|
$links[] = array(
|
|
|
|
'class' => $viewer_is_cc ? 'subscribe-rem' : 'subscribe-add',
|
|
|
|
'href' => "/differential/subscribe/{$action}/{$revision_id}/",
|
|
|
|
'name' => $viewer_is_cc ? 'Unsubscribe' : 'Subscribe',
|
|
|
|
'instant' => true,
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
$links[] = array(
|
|
|
|
'class' => 'subscribe-rem unavailable',
|
|
|
|
'name' => 'Automatically Subscribed',
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
require_celerity_resource('phabricator-object-selector-css');
|
|
|
|
require_celerity_resource('javelin-behavior-phabricator-object-selector');
|
|
|
|
|
2011-01-27 23:55:52 +01:00
|
|
|
$links[] = array(
|
2011-10-24 21:27:16 +02:00
|
|
|
'class' => 'action-dependencies',
|
|
|
|
'name' => 'Edit Dependencies',
|
|
|
|
'href' => "/search/attach/{$revision_phid}/DREV/dependencies/",
|
|
|
|
'sigil' => 'workflow',
|
2011-01-27 23:55:52 +01:00
|
|
|
);
|
|
|
|
|
2011-10-24 21:27:16 +02:00
|
|
|
if (PhabricatorEnv::getEnvConfig('maniphest.enabled')) {
|
|
|
|
$links[] = array(
|
|
|
|
'class' => 'attach-maniphest',
|
|
|
|
'name' => 'Edit Maniphest Tasks',
|
|
|
|
'href' => "/search/attach/{$revision_phid}/TASK/",
|
|
|
|
'sigil' => 'workflow',
|
|
|
|
);
|
|
|
|
}
|
2011-02-17 23:32:01 +01:00
|
|
|
|
2012-03-30 23:12:10 +02:00
|
|
|
if ($user->getIsAdmin()) {
|
|
|
|
$links[] = array(
|
|
|
|
'class' => 'transcripts-metamta',
|
|
|
|
'name' => 'MetaMTA Transcripts',
|
|
|
|
'href' => "/mail/?phid={$revision_phid}",
|
|
|
|
);
|
|
|
|
}
|
2011-07-05 22:18:47 +02:00
|
|
|
|
2011-04-13 21:12:02 +02:00
|
|
|
$links[] = array(
|
2011-10-24 21:27:16 +02:00
|
|
|
'class' => 'transcripts-herald',
|
|
|
|
'name' => 'Herald Transcripts',
|
|
|
|
'href' => "/herald/transcript/?phid={$revision_phid}",
|
2011-04-13 21:12:02 +02:00
|
|
|
);
|
|
|
|
}
|
2011-02-17 23:32:01 +01:00
|
|
|
|
2012-06-28 19:12:20 +02:00
|
|
|
$request_uri = $this->getRequest()->getRequestURI();
|
|
|
|
$links[] = array(
|
|
|
|
'class' => 'action-download',
|
|
|
|
'name' => 'Download Raw Diff',
|
|
|
|
'href' => $request_uri->alter('download', 'true')
|
|
|
|
);
|
|
|
|
|
2011-01-27 23:55:52 +01:00
|
|
|
return $links;
|
|
|
|
}
|
|
|
|
|
2011-01-30 20:02:22 +01:00
|
|
|
private function getRevisionCommentActions(DifferentialRevision $revision) {
|
|
|
|
|
|
|
|
$actions = array(
|
|
|
|
DifferentialAction::ACTION_COMMENT => true,
|
|
|
|
);
|
|
|
|
|
2011-10-25 23:03:34 +02:00
|
|
|
$viewer = $this->getRequest()->getUser();
|
|
|
|
$viewer_phid = $viewer->getPHID();
|
2011-01-30 20:02:22 +01:00
|
|
|
$viewer_is_owner = ($viewer_phid == $revision->getAuthorPHID());
|
2011-04-11 19:38:10 +02:00
|
|
|
$viewer_is_reviewer = in_array($viewer_phid, $revision->getReviewers());
|
2011-10-19 08:35:45 +02:00
|
|
|
$viewer_did_accept = ($viewer_phid === $revision->loadReviewedBy());
|
2012-04-17 23:59:31 +02:00
|
|
|
$status = $revision->getStatus();
|
2011-01-30 20:02:22 +01:00
|
|
|
|
2012-07-03 09:38:49 +02:00
|
|
|
$allow_self_accept = PhabricatorEnv::getEnvConfig(
|
|
|
|
'differential.allow-self-accept', false);
|
|
|
|
|
2011-01-30 20:02:22 +01:00
|
|
|
if ($viewer_is_owner) {
|
2012-04-17 23:59:31 +02:00
|
|
|
switch ($status) {
|
2012-01-10 20:39:11 +01:00
|
|
|
case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
|
2012-07-03 09:38:49 +02:00
|
|
|
$actions[DifferentialAction::ACTION_ACCEPT] = $allow_self_accept;
|
2011-01-30 20:02:22 +01:00
|
|
|
$actions[DifferentialAction::ACTION_ABANDON] = true;
|
2011-04-14 01:10:54 +02:00
|
|
|
$actions[DifferentialAction::ACTION_RETHINK] = true;
|
2011-01-30 20:02:22 +01:00
|
|
|
break;
|
2012-01-10 20:39:11 +01:00
|
|
|
case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
|
2012-07-03 09:38:49 +02:00
|
|
|
$actions[DifferentialAction::ACTION_ACCEPT] = $allow_self_accept;
|
2011-04-14 01:10:54 +02:00
|
|
|
$actions[DifferentialAction::ACTION_ABANDON] = true;
|
|
|
|
$actions[DifferentialAction::ACTION_REQUEST] = true;
|
|
|
|
break;
|
2012-01-10 20:39:11 +01:00
|
|
|
case ArcanistDifferentialRevisionStatus::ACCEPTED:
|
2011-01-30 20:02:22 +01:00
|
|
|
$actions[DifferentialAction::ACTION_ABANDON] = true;
|
|
|
|
$actions[DifferentialAction::ACTION_REQUEST] = true;
|
2011-04-14 01:10:54 +02:00
|
|
|
$actions[DifferentialAction::ACTION_RETHINK] = true;
|
2012-04-24 02:40:57 +02:00
|
|
|
$actions[DifferentialAction::ACTION_CLOSE] = true;
|
2011-01-30 20:02:22 +01:00
|
|
|
break;
|
2012-04-24 02:40:57 +02:00
|
|
|
case ArcanistDifferentialRevisionStatus::CLOSED:
|
2011-01-30 20:02:22 +01:00
|
|
|
break;
|
2012-01-10 20:39:11 +01:00
|
|
|
case ArcanistDifferentialRevisionStatus::ABANDONED:
|
2011-01-30 20:02:22 +01:00
|
|
|
$actions[DifferentialAction::ACTION_RECLAIM] = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
2012-04-17 23:59:31 +02:00
|
|
|
switch ($status) {
|
2012-01-10 20:39:11 +01:00
|
|
|
case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
|
2011-01-30 20:02:22 +01:00
|
|
|
$actions[DifferentialAction::ACTION_ACCEPT] = true;
|
|
|
|
$actions[DifferentialAction::ACTION_REJECT] = true;
|
2011-04-11 19:38:10 +02:00
|
|
|
$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
|
2011-01-30 20:02:22 +01:00
|
|
|
break;
|
2012-01-10 20:39:11 +01:00
|
|
|
case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
|
2011-01-30 20:02:22 +01:00
|
|
|
$actions[DifferentialAction::ACTION_ACCEPT] = true;
|
2011-04-11 19:38:10 +02:00
|
|
|
$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
|
2011-01-30 20:02:22 +01:00
|
|
|
break;
|
2012-01-10 20:39:11 +01:00
|
|
|
case ArcanistDifferentialRevisionStatus::ACCEPTED:
|
2011-01-30 20:02:22 +01:00
|
|
|
$actions[DifferentialAction::ACTION_REJECT] = true;
|
2011-10-19 08:35:45 +02:00
|
|
|
$actions[DifferentialAction::ACTION_RESIGN] =
|
|
|
|
$viewer_is_reviewer && !$viewer_did_accept;
|
2011-01-30 20:02:22 +01:00
|
|
|
break;
|
2012-04-24 02:40:57 +02:00
|
|
|
case ArcanistDifferentialRevisionStatus::CLOSED:
|
2012-01-10 20:39:11 +01:00
|
|
|
case ArcanistDifferentialRevisionStatus::ABANDONED:
|
2011-01-30 20:02:22 +01:00
|
|
|
break;
|
|
|
|
}
|
2012-04-24 02:40:57 +02:00
|
|
|
if ($status != ArcanistDifferentialRevisionStatus::CLOSED) {
|
2012-04-17 23:59:31 +02:00
|
|
|
$actions[DifferentialAction::ACTION_CLAIM] = true;
|
|
|
|
}
|
2011-01-30 20:02:22 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
$actions[DifferentialAction::ACTION_ADDREVIEWERS] = true;
|
2011-06-24 21:21:48 +02:00
|
|
|
$actions[DifferentialAction::ACTION_ADDCCS] = true;
|
2011-01-30 20:02:22 +01:00
|
|
|
|
2011-10-27 21:32:02 +02:00
|
|
|
$actions = array_keys(array_filter($actions));
|
|
|
|
$actions_dict = array();
|
|
|
|
foreach ($actions as $action) {
|
|
|
|
$actions_dict[$action] = DifferentialAction::getActionVerb($action);
|
|
|
|
}
|
|
|
|
|
|
|
|
return $actions_dict;
|
2011-01-30 20:02:22 +01:00
|
|
|
}
|
|
|
|
|
2011-02-03 04:38:43 +01:00
|
|
|
private function loadInlineComments(array $comments, array &$changesets) {
|
2012-04-04 22:13:08 +02:00
|
|
|
assert_instances_of($comments, 'DifferentialComment');
|
|
|
|
assert_instances_of($changesets, 'DifferentialChangeset');
|
2011-02-03 04:38:43 +01:00
|
|
|
|
|
|
|
$inline_comments = array();
|
|
|
|
|
|
|
|
$comment_ids = array_filter(mpull($comments, 'getID'));
|
|
|
|
if (!$comment_ids) {
|
|
|
|
return $inline_comments;
|
|
|
|
}
|
|
|
|
|
|
|
|
$inline_comments = id(new DifferentialInlineComment())
|
|
|
|
->loadAllWhere(
|
|
|
|
'commentID in (%Ld)',
|
|
|
|
$comment_ids);
|
|
|
|
|
|
|
|
$load_changesets = array();
|
|
|
|
foreach ($inline_comments as $inline) {
|
|
|
|
$changeset_id = $inline->getChangesetID();
|
|
|
|
if (isset($changesets[$changeset_id])) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
$load_changesets[$changeset_id] = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
$more_changesets = array();
|
|
|
|
if ($load_changesets) {
|
|
|
|
$changeset_ids = array_keys($load_changesets);
|
|
|
|
$more_changesets += id(new DifferentialChangeset())
|
|
|
|
->loadAllWhere(
|
|
|
|
'id IN (%Ld)',
|
|
|
|
$changeset_ids);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($more_changesets) {
|
|
|
|
$changesets += $more_changesets;
|
|
|
|
$changesets = msort($changesets, 'getSortKey');
|
|
|
|
}
|
|
|
|
|
|
|
|
return $inline_comments;
|
|
|
|
}
|
|
|
|
|
2012-04-04 22:13:08 +02:00
|
|
|
private function loadChangesetsAndVsMap(
|
2012-05-23 01:09:49 +02:00
|
|
|
DifferentialDiff $target,
|
|
|
|
DifferentialDiff $diff_vs = null,
|
|
|
|
PhabricatorRepository $repository = null) {
|
2012-04-04 22:13:08 +02:00
|
|
|
|
2011-02-04 00:41:58 +01:00
|
|
|
$load_ids = array();
|
|
|
|
if ($diff_vs) {
|
2012-05-23 01:09:49 +02:00
|
|
|
$load_ids[] = $diff_vs->getID();
|
2011-02-04 00:41:58 +01:00
|
|
|
}
|
|
|
|
$load_ids[] = $target->getID();
|
|
|
|
|
|
|
|
$raw_changesets = id(new DifferentialChangeset())
|
|
|
|
->loadAllWhere(
|
|
|
|
'diffID IN (%Ld)',
|
|
|
|
$load_ids);
|
|
|
|
$changeset_groups = mgroup($raw_changesets, 'getDiffID');
|
|
|
|
|
|
|
|
$changesets = idx($changeset_groups, $target->getID(), array());
|
|
|
|
$changesets = mpull($changesets, null, 'getID');
|
|
|
|
|
2012-06-28 19:12:20 +02:00
|
|
|
$refs = array();
|
|
|
|
$vs_map = array();
|
|
|
|
$vs_changesets = array();
|
2011-02-04 00:41:58 +01:00
|
|
|
if ($diff_vs) {
|
2012-06-28 19:12:20 +02:00
|
|
|
$vs_id = $diff_vs->getID();
|
|
|
|
$vs_changesets_path_map = array();
|
2012-05-23 01:09:49 +02:00
|
|
|
foreach (idx($changeset_groups, $vs_id, array()) as $changeset) {
|
|
|
|
$path = $changeset->getAbsoluteRepositoryPath($repository, $diff_vs);
|
2012-06-28 19:12:20 +02:00
|
|
|
$vs_changesets_path_map[$path] = $changeset;
|
|
|
|
$vs_changesets[$changeset->getID()] = $changeset;
|
2012-05-23 01:09:49 +02:00
|
|
|
}
|
2011-02-04 00:41:58 +01:00
|
|
|
foreach ($changesets as $key => $changeset) {
|
2012-06-28 19:12:20 +02:00
|
|
|
$path = $changeset->getAbsoluteRepositoryPath($repository, $target);
|
|
|
|
if (isset($vs_changesets_path_map[$path])) {
|
|
|
|
$vs_map[$changeset->getID()] =
|
|
|
|
$vs_changesets_path_map[$path]->getID();
|
Move "Rendering References" to the DifferentialChangesetParser level
Summary:
Separates changeset IDs from rendering. Now each changeset has a "rendering
reference" which is basically a description of what the ajax endpoint should
render. For Differential, it's in the form "id/vs". For Diffusion,
"branch/path;commit".
I believe this fixes pretty much all of the bugs related to "show more" breaking
in various obscure ways, although I never got a great repro for T153.
Test Plan:
Clicked "show more" in diffusion change and commit views and differential diff,
diff-of-diff, standalone-diff, standalone-diff-of-diff views. Verified refs and
'whitespace' were always sent correctly.
Made inline comments on diffs and diffs-of-diffs. Used "Reply".
Reviewed By: tuomaspelkonen
Reviewers: tuomaspelkonen, jungejason, aran
CC: aran, tuomaspelkonen, epriestley
Differential Revision: 274
2011-05-12 06:46:29 +02:00
|
|
|
$refs[$changeset->getID()] =
|
2012-06-28 19:12:20 +02:00
|
|
|
$changeset->getID().'/'.$vs_changesets_path_map[$path]->getID();
|
|
|
|
unset($vs_changesets_path_map[$path]);
|
Move "Rendering References" to the DifferentialChangesetParser level
Summary:
Separates changeset IDs from rendering. Now each changeset has a "rendering
reference" which is basically a description of what the ajax endpoint should
render. For Differential, it's in the form "id/vs". For Diffusion,
"branch/path;commit".
I believe this fixes pretty much all of the bugs related to "show more" breaking
in various obscure ways, although I never got a great repro for T153.
Test Plan:
Clicked "show more" in diffusion change and commit views and differential diff,
diff-of-diff, standalone-diff, standalone-diff-of-diff views. Verified refs and
'whitespace' were always sent correctly.
Made inline comments on diffs and diffs-of-diffs. Used "Reply".
Reviewed By: tuomaspelkonen
Reviewers: tuomaspelkonen, jungejason, aran
CC: aran, tuomaspelkonen, epriestley
Differential Revision: 274
2011-05-12 06:46:29 +02:00
|
|
|
} else {
|
|
|
|
$refs[$changeset->getID()] = $changeset->getID();
|
2011-02-04 00:41:58 +01:00
|
|
|
}
|
|
|
|
}
|
2012-06-28 19:12:20 +02:00
|
|
|
foreach ($vs_changesets_path_map as $path => $changeset) {
|
2011-02-04 00:41:58 +01:00
|
|
|
$changesets[$changeset->getID()] = $changeset;
|
2012-06-28 19:12:20 +02:00
|
|
|
$vs_map[$changeset->getID()] = -1;
|
|
|
|
$refs[$changeset->getID()] = $changeset->getID().'/-1';
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
foreach ($changesets as $changeset) {
|
|
|
|
$refs[$changeset->getID()] = $changeset->getID();
|
2011-02-04 00:41:58 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
$changesets = msort($changesets, 'getSortKey');
|
|
|
|
|
2012-06-28 19:12:20 +02:00
|
|
|
return array($changesets, $vs_map, $vs_changesets, $refs);
|
2011-02-04 00:41:58 +01:00
|
|
|
}
|
|
|
|
|
2011-08-30 20:34:07 +02:00
|
|
|
private function loadAuxiliaryFieldsAndProperties(
|
2011-08-14 22:55:30 +02:00
|
|
|
DifferentialRevision $revision,
|
2011-08-30 20:34:07 +02:00
|
|
|
DifferentialDiff $diff,
|
|
|
|
array $special_properties) {
|
|
|
|
|
2011-08-10 22:46:01 +02:00
|
|
|
$aux_fields = DifferentialFieldSelector::newSelector()
|
|
|
|
->getFieldSpecifications();
|
|
|
|
foreach ($aux_fields as $key => $aux_field) {
|
|
|
|
if (!$aux_field->shouldAppearOnRevisionView()) {
|
|
|
|
unset($aux_fields[$key]);
|
2012-04-19 09:17:58 +02:00
|
|
|
} else {
|
|
|
|
$aux_field->setUser($this->getRequest()->getUser());
|
2011-08-10 22:46:01 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-14 22:55:30 +02:00
|
|
|
$aux_fields = DifferentialAuxiliaryField::loadFromStorage(
|
2011-08-10 22:46:01 +02:00
|
|
|
$revision,
|
|
|
|
$aux_fields);
|
2011-08-14 22:55:30 +02:00
|
|
|
|
|
|
|
$aux_props = array();
|
|
|
|
foreach ($aux_fields as $key => $aux_field) {
|
|
|
|
$aux_field->setDiff($diff);
|
|
|
|
$aux_props[$key] = $aux_field->getRequiredDiffProperties();
|
|
|
|
}
|
|
|
|
|
|
|
|
$required_properties = array_mergev($aux_props);
|
2011-08-30 20:34:07 +02:00
|
|
|
$required_properties = array_merge(
|
|
|
|
$required_properties,
|
|
|
|
$special_properties);
|
|
|
|
|
2011-08-14 22:55:30 +02:00
|
|
|
$property_map = array();
|
|
|
|
if ($required_properties) {
|
|
|
|
$properties = id(new DifferentialDiffProperty())->loadAllWhere(
|
|
|
|
'diffID = %d AND name IN (%Ls)',
|
|
|
|
$diff->getID(),
|
|
|
|
$required_properties);
|
|
|
|
$property_map = mpull($properties, 'getData', 'getName');
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach ($aux_fields as $key => $aux_field) {
|
|
|
|
// Give each field only the properties it specifically required, and
|
|
|
|
// set 'null' for each requested key which we didn't actually load a
|
|
|
|
// value for (otherwise, getDiffProperty() will throw).
|
|
|
|
if ($aux_props[$key]) {
|
|
|
|
$props = array_select_keys($property_map, $aux_props[$key]) +
|
|
|
|
array_fill_keys($aux_props[$key], null);
|
|
|
|
} else {
|
|
|
|
$props = array();
|
|
|
|
}
|
|
|
|
|
|
|
|
$aux_field->setDiffProperties($props);
|
|
|
|
}
|
|
|
|
|
2011-08-30 20:34:07 +02:00
|
|
|
return array(
|
|
|
|
$aux_fields,
|
|
|
|
array_select_keys(
|
|
|
|
$property_map,
|
|
|
|
$special_properties));
|
2011-08-10 22:46:01 +02:00
|
|
|
}
|
|
|
|
|
Tie all the pieces for symbol cross-references together
Summary:
This makes symbol cross-references work in Differential. You need to do a little
legwork but I'll document that once the change has baked for a little while.
Basically:
- Projects are annotated with indexed languages, and "shared library" projects
(for example, symbols in Phabricator should be searched for in Arcanist and
libphutil).
- When we render a changeset, we check if its language is an indexed one. If
it is, we invoke the decorator Javascript.
- The Javascript takes you to a lookup page, which either gives you a list of
matching symbols (if several match) or redirects you instantly to the
definition.
Test Plan: Clicked class and function symbols in a diff, got jumped into
sensible sorts of places in Diffusion.
Reviewers: jungejason, nh, tuomaspelkonen, aran
Reviewed By: jungejason
CC: aran, jungejason
Differential Revision: 980
2011-10-03 01:02:56 +02:00
|
|
|
private function buildSymbolIndexes(
|
2012-01-05 23:41:11 +01:00
|
|
|
PhabricatorRepositoryArcanistProject $arc_project,
|
Tie all the pieces for symbol cross-references together
Summary:
This makes symbol cross-references work in Differential. You need to do a little
legwork but I'll document that once the change has baked for a little while.
Basically:
- Projects are annotated with indexed languages, and "shared library" projects
(for example, symbols in Phabricator should be searched for in Arcanist and
libphutil).
- When we render a changeset, we check if its language is an indexed one. If
it is, we invoke the decorator Javascript.
- The Javascript takes you to a lookup page, which either gives you a list of
matching symbols (if several match) or redirects you instantly to the
definition.
Test Plan: Clicked class and function symbols in a diff, got jumped into
sensible sorts of places in Diffusion.
Reviewers: jungejason, nh, tuomaspelkonen, aran
Reviewed By: jungejason
CC: aran, jungejason
Differential Revision: 980
2011-10-03 01:02:56 +02:00
|
|
|
array $visible_changesets) {
|
2012-04-04 22:13:08 +02:00
|
|
|
assert_instances_of($visible_changesets, 'DifferentialChangeset');
|
Tie all the pieces for symbol cross-references together
Summary:
This makes symbol cross-references work in Differential. You need to do a little
legwork but I'll document that once the change has baked for a little while.
Basically:
- Projects are annotated with indexed languages, and "shared library" projects
(for example, symbols in Phabricator should be searched for in Arcanist and
libphutil).
- When we render a changeset, we check if its language is an indexed one. If
it is, we invoke the decorator Javascript.
- The Javascript takes you to a lookup page, which either gives you a list of
matching symbols (if several match) or redirects you instantly to the
definition.
Test Plan: Clicked class and function symbols in a diff, got jumped into
sensible sorts of places in Diffusion.
Reviewers: jungejason, nh, tuomaspelkonen, aran
Reviewed By: jungejason
CC: aran, jungejason
Differential Revision: 980
2011-10-03 01:02:56 +02:00
|
|
|
|
|
|
|
$engine = PhabricatorSyntaxHighlighter::newEngine();
|
|
|
|
|
|
|
|
$langs = $arc_project->getSymbolIndexLanguages();
|
|
|
|
if (!$langs) {
|
Support symbol linking in Remarkup code blocks
Summary:
Trigger the crossreference behavior on code blocks. Limited to
Differential, where we know what the project is, but includes regular
comments, inline comments, and previews of both.
(Hopefully event handlers on deleted elements also get deleted, so we
don't leak memory? Also, caching is a problem, and I didn't find a way
to mark existing cache entries as stale, like
`DifferentialChangesetParser::CACHE_VERSION`...)
Test Plan:
Load Differential revision, make lots of comments, click on
things.
Reviewers: epriestley
Reviewed By: epriestley
CC: aran, Korvin
Maniphest Tasks: T1602
Differential Revision: https://secure.phabricator.com/D3283
2012-08-14 23:03:26 +02:00
|
|
|
return array(array(), array());
|
Tie all the pieces for symbol cross-references together
Summary:
This makes symbol cross-references work in Differential. You need to do a little
legwork but I'll document that once the change has baked for a little while.
Basically:
- Projects are annotated with indexed languages, and "shared library" projects
(for example, symbols in Phabricator should be searched for in Arcanist and
libphutil).
- When we render a changeset, we check if its language is an indexed one. If
it is, we invoke the decorator Javascript.
- The Javascript takes you to a lookup page, which either gives you a list of
matching symbols (if several match) or redirects you instantly to the
definition.
Test Plan: Clicked class and function symbols in a diff, got jumped into
sensible sorts of places in Diffusion.
Reviewers: jungejason, nh, tuomaspelkonen, aran
Reviewed By: jungejason
CC: aran, jungejason
Differential Revision: 980
2011-10-03 01:02:56 +02:00
|
|
|
}
|
|
|
|
|
2012-01-05 23:41:11 +01:00
|
|
|
$symbol_indexes = array();
|
|
|
|
|
Tie all the pieces for symbol cross-references together
Summary:
This makes symbol cross-references work in Differential. You need to do a little
legwork but I'll document that once the change has baked for a little while.
Basically:
- Projects are annotated with indexed languages, and "shared library" projects
(for example, symbols in Phabricator should be searched for in Arcanist and
libphutil).
- When we render a changeset, we check if its language is an indexed one. If
it is, we invoke the decorator Javascript.
- The Javascript takes you to a lookup page, which either gives you a list of
matching symbols (if several match) or redirects you instantly to the
definition.
Test Plan: Clicked class and function symbols in a diff, got jumped into
sensible sorts of places in Diffusion.
Reviewers: jungejason, nh, tuomaspelkonen, aran
Reviewed By: jungejason
CC: aran, jungejason
Differential Revision: 980
2011-10-03 01:02:56 +02:00
|
|
|
$project_phids = array_merge(
|
|
|
|
array($arc_project->getPHID()),
|
|
|
|
nonempty($arc_project->getSymbolIndexProjects(), array()));
|
|
|
|
|
|
|
|
$indexed_langs = array_fill_keys($langs, true);
|
|
|
|
foreach ($visible_changesets as $key => $changeset) {
|
2012-01-17 08:05:44 +01:00
|
|
|
$lang = $engine->getLanguageFromFilename($changeset->getFilename());
|
Tie all the pieces for symbol cross-references together
Summary:
This makes symbol cross-references work in Differential. You need to do a little
legwork but I'll document that once the change has baked for a little while.
Basically:
- Projects are annotated with indexed languages, and "shared library" projects
(for example, symbols in Phabricator should be searched for in Arcanist and
libphutil).
- When we render a changeset, we check if its language is an indexed one. If
it is, we invoke the decorator Javascript.
- The Javascript takes you to a lookup page, which either gives you a list of
matching symbols (if several match) or redirects you instantly to the
definition.
Test Plan: Clicked class and function symbols in a diff, got jumped into
sensible sorts of places in Diffusion.
Reviewers: jungejason, nh, tuomaspelkonen, aran
Reviewed By: jungejason
CC: aran, jungejason
Differential Revision: 980
2011-10-03 01:02:56 +02:00
|
|
|
if (isset($indexed_langs[$lang])) {
|
|
|
|
$symbol_indexes[$key] = array(
|
|
|
|
'lang' => $lang,
|
|
|
|
'projects' => $project_phids,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Support symbol linking in Remarkup code blocks
Summary:
Trigger the crossreference behavior on code blocks. Limited to
Differential, where we know what the project is, but includes regular
comments, inline comments, and previews of both.
(Hopefully event handlers on deleted elements also get deleted, so we
don't leak memory? Also, caching is a problem, and I didn't find a way
to mark existing cache entries as stale, like
`DifferentialChangesetParser::CACHE_VERSION`...)
Test Plan:
Load Differential revision, make lots of comments, click on
things.
Reviewers: epriestley
Reviewed By: epriestley
CC: aran, Korvin
Maniphest Tasks: T1602
Differential Revision: https://secure.phabricator.com/D3283
2012-08-14 23:03:26 +02:00
|
|
|
return array($symbol_indexes, $project_phids);
|
Tie all the pieces for symbol cross-references together
Summary:
This makes symbol cross-references work in Differential. You need to do a little
legwork but I'll document that once the change has baked for a little while.
Basically:
- Projects are annotated with indexed languages, and "shared library" projects
(for example, symbols in Phabricator should be searched for in Arcanist and
libphutil).
- When we render a changeset, we check if its language is an indexed one. If
it is, we invoke the decorator Javascript.
- The Javascript takes you to a lookup page, which either gives you a list of
matching symbols (if several match) or redirects you instantly to the
definition.
Test Plan: Clicked class and function symbols in a diff, got jumped into
sensible sorts of places in Diffusion.
Reviewers: jungejason, nh, tuomaspelkonen, aran
Reviewed By: jungejason
CC: aran, jungejason
Differential Revision: 980
2011-10-03 01:02:56 +02:00
|
|
|
}
|
|
|
|
|
2012-04-10 08:42:12 +02:00
|
|
|
private function loadOtherRevisions(
|
|
|
|
array $changesets,
|
|
|
|
DifferentialDiff $target,
|
|
|
|
PhabricatorRepository $repository) {
|
|
|
|
assert_instances_of($changesets, 'DifferentialChangeset');
|
|
|
|
|
2012-03-30 19:13:08 +02:00
|
|
|
$paths = array();
|
|
|
|
foreach ($changesets as $changeset) {
|
|
|
|
$paths[] = $changeset->getAbsoluteRepositoryPath(
|
2012-04-10 08:42:12 +02:00
|
|
|
$repository,
|
|
|
|
$target);
|
2012-03-30 19:13:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!$paths) {
|
|
|
|
return array();
|
|
|
|
}
|
|
|
|
|
|
|
|
$path_map = id(new DiffusionPathIDQuery($paths))->loadPathIDs();
|
|
|
|
|
|
|
|
if (!$path_map) {
|
|
|
|
return array();
|
|
|
|
}
|
|
|
|
|
|
|
|
$query = id(new DifferentialRevisionQuery())
|
|
|
|
->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
|
|
|
|
->setOrder(DifferentialRevisionQuery::ORDER_PATH_MODIFIED)
|
|
|
|
->setLimit(10)
|
|
|
|
->needRelationships(true);
|
|
|
|
|
|
|
|
foreach ($path_map as $path => $path_id) {
|
|
|
|
$query->withPath($repository->getID(), $path_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
$results = $query->execute();
|
|
|
|
|
|
|
|
// Strip out *this* revision.
|
|
|
|
foreach ($results as $key => $result) {
|
|
|
|
if ($result->getID() == $this->revisionID) {
|
|
|
|
unset($results[$key]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return $results;
|
|
|
|
}
|
|
|
|
|
|
|
|
private function renderOtherRevisions(array $revisions) {
|
2012-04-04 22:13:08 +02:00
|
|
|
assert_instances_of($revisions, 'DifferentialRevision');
|
|
|
|
|
2012-03-30 19:13:08 +02:00
|
|
|
$view = id(new DifferentialRevisionListView())
|
|
|
|
->setRevisions($revisions)
|
|
|
|
->setFields(DifferentialRevisionListView::getDefaultFields())
|
2012-08-17 21:46:26 +02:00
|
|
|
->setUser($this->getRequest()->getUser())
|
|
|
|
->loadAssets();
|
2012-03-30 19:13:08 +02:00
|
|
|
|
|
|
|
$phids = $view->getRequiredHandlePHIDs();
|
|
|
|
$handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
|
|
|
|
$view->setHandles($handles);
|
|
|
|
|
|
|
|
return
|
|
|
|
'<div class="differential-panel">'.
|
|
|
|
'<h1>Open Revisions Affecting These Files</h1>'.
|
|
|
|
$view->render().
|
|
|
|
'</div>';
|
|
|
|
}
|
2011-08-14 22:55:30 +02:00
|
|
|
|
2012-06-28 19:12:20 +02:00
|
|
|
/**
|
|
|
|
* Straight copy of the loadFileByPhid method in
|
|
|
|
* @{class:DifferentialReviewRequestMail}.
|
|
|
|
*
|
|
|
|
* This is because of the code similarity between the buildPatch method in
|
|
|
|
* @{class:DifferentialReviewRequestMail} and @{method:buildRawDiffResponse}
|
|
|
|
* in this class. Both of these methods end up using call_user_func and this
|
|
|
|
* piece of code is the lucky function.
|
|
|
|
*
|
|
|
|
* @return mixed (@{class:PhabricatorFile} if found, null if not)
|
|
|
|
*/
|
|
|
|
public function loadFileByPHID($phid) {
|
|
|
|
$file = id(new PhabricatorFile())->loadOneWhere(
|
|
|
|
'phid = %s',
|
|
|
|
$phid);
|
|
|
|
if (!$file) {
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
return $file->loadFileData();
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Note this code is somewhat similar to the buildPatch method in
|
|
|
|
* @{class:DifferentialReviewRequestMail}.
|
|
|
|
*
|
|
|
|
* @return @{class:AphrontRedirectResponse}
|
|
|
|
*/
|
|
|
|
private function buildRawDiffResponse(
|
|
|
|
array $changesets,
|
|
|
|
array $vs_changesets,
|
|
|
|
array $vs_map,
|
|
|
|
PhabricatorRepository $repository = null) {
|
|
|
|
|
|
|
|
assert_instances_of($changesets, 'DifferentialChangeset');
|
|
|
|
assert_instances_of($vs_changesets, 'DifferentialChangeset');
|
|
|
|
|
|
|
|
$engine = new PhabricatorDifferenceEngine();
|
|
|
|
$generated_changesets = array();
|
|
|
|
foreach ($changesets as $changeset) {
|
|
|
|
$changeset->attachHunks($changeset->loadHunks());
|
2012-08-18 11:15:02 +02:00
|
|
|
$right = $changeset->makeNewFile();
|
|
|
|
$choice = $changeset;
|
2012-06-28 19:12:20 +02:00
|
|
|
$vs = idx($vs_map, $changeset->getID());
|
2012-08-18 11:15:02 +02:00
|
|
|
if ($vs == -1) {
|
|
|
|
$left = $right;
|
|
|
|
$right = $changeset->makeOldFile();
|
|
|
|
} else if ($vs) {
|
2012-06-28 19:12:20 +02:00
|
|
|
$choice = $vs_changeset = $vs_changesets[$vs];
|
|
|
|
$vs_changeset->attachHunks($vs_changeset->loadHunks());
|
2012-08-18 11:15:02 +02:00
|
|
|
$left = $vs_changeset->makeNewFile();
|
2012-06-28 19:12:20 +02:00
|
|
|
} else {
|
2012-08-18 11:15:02 +02:00
|
|
|
$left = $changeset->makeOldFile();
|
2012-06-28 19:12:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
$synthetic = $engine->generateChangesetFromFileContent(
|
|
|
|
$left,
|
|
|
|
$right);
|
|
|
|
|
|
|
|
if (!$synthetic->getAffectedLineCount()) {
|
|
|
|
$filetype = $choice->getFileType();
|
|
|
|
if ($filetype == DifferentialChangeType::FILE_TEXT ||
|
|
|
|
$filetype == DifferentialChangeType::FILE_SYMLINK) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
$choice->attachHunks($synthetic->getHunks());
|
|
|
|
|
|
|
|
$generated_changesets[] = $choice;
|
|
|
|
}
|
|
|
|
|
|
|
|
$diff = new DifferentialDiff();
|
|
|
|
$diff->attachChangesets($generated_changesets);
|
|
|
|
$diff_dict = $diff->getDiffDict();
|
|
|
|
|
|
|
|
$changes = array();
|
|
|
|
foreach ($diff_dict['changes'] as $changedict) {
|
|
|
|
$changes[] = ArcanistDiffChange::newFromDictionary($changedict);
|
|
|
|
}
|
|
|
|
$bundle = ArcanistBundle::newFromChanges($changes);
|
|
|
|
|
|
|
|
$bundle->setLoadFileDataCallback(array($this, 'loadFileByPHID'));
|
|
|
|
|
|
|
|
$vcs = $repository ? $repository->getVersionControlSystem() : null;
|
|
|
|
switch ($vcs) {
|
|
|
|
case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
|
2012-07-09 19:38:25 +02:00
|
|
|
case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
|
2012-06-28 19:12:20 +02:00
|
|
|
$raw_diff = $bundle->toGitPatch();
|
|
|
|
break;
|
|
|
|
case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
|
|
|
|
default:
|
|
|
|
$raw_diff = $bundle->toUnifiedDiff();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-07-09 19:38:25 +02:00
|
|
|
$request_uri = $this->getRequest()->getRequestURI();
|
2012-06-28 19:12:20 +02:00
|
|
|
|
2012-07-09 19:38:25 +02:00
|
|
|
// this ends up being something like
|
|
|
|
// D123.diff
|
|
|
|
// or the verbose
|
|
|
|
// D123.vs123.id123.whitespaceignore-all.diff
|
|
|
|
// lame but nice to include these options
|
|
|
|
$file_name = ltrim($request_uri->getPath(), '/').'.';
|
|
|
|
foreach ($request_uri->getQueryParams() as $key => $value) {
|
|
|
|
if ($key == 'download') {
|
|
|
|
continue;
|
2012-06-28 19:12:20 +02:00
|
|
|
}
|
2012-07-09 19:38:25 +02:00
|
|
|
$file_name .= $key.$value.'.';
|
2012-06-28 19:12:20 +02:00
|
|
|
}
|
2012-07-09 19:38:25 +02:00
|
|
|
$file_name .= 'diff';
|
|
|
|
|
|
|
|
$file = PhabricatorFile::buildFromFileDataOrHash(
|
|
|
|
$raw_diff,
|
|
|
|
array(
|
|
|
|
'name' => $file_name,
|
|
|
|
));
|
2012-06-28 19:12:20 +02:00
|
|
|
|
|
|
|
return id(new AphrontRedirectResponse())->setURI($file->getBestURI());
|
|
|
|
|
|
|
|
}
|
2012-08-22 00:01:20 +02:00
|
|
|
|
|
|
|
private function buildSideNavView(
|
|
|
|
DifferentialRevision $revision,
|
|
|
|
array $changesets) {
|
|
|
|
|
|
|
|
$nav = new AphrontSideNavFilterView();
|
|
|
|
$nav->setBaseURI(new PhutilURI('/D'.$revision->getID()));
|
|
|
|
$nav->setFlexible(true);
|
|
|
|
|
|
|
|
$nav->addFilter('top', 'D'.$revision->getID(), '#top',
|
|
|
|
$relative = false,
|
|
|
|
'phabricator-active-nav-focus');
|
|
|
|
|
|
|
|
$tree = new PhutilFileTree();
|
|
|
|
foreach ($changesets as $changeset) {
|
|
|
|
$tree->addPath($changeset->getFilename(), $changeset);
|
|
|
|
}
|
|
|
|
|
|
|
|
require_celerity_resource('phabricator-filetree-view-css');
|
|
|
|
|
|
|
|
$filetree = array();
|
|
|
|
|
|
|
|
$path = $tree;
|
|
|
|
while (($path = $path->getNextNode())) {
|
|
|
|
$data = $path->getData();
|
|
|
|
|
|
|
|
$name = $path->getName();
|
|
|
|
$style = 'padding-left: '.(2 + (3 * $path->getDepth())).'px';
|
|
|
|
|
|
|
|
$href = null;
|
|
|
|
if ($data) {
|
|
|
|
$href = '#'.$data->getAnchorName();
|
|
|
|
$icon = 'phabricator-filetree-icon-file';
|
|
|
|
} else {
|
|
|
|
$name .= '/';
|
|
|
|
$icon = 'phabricator-filetree-icon-dir';
|
|
|
|
}
|
|
|
|
|
|
|
|
$icon = phutil_render_tag(
|
|
|
|
'span',
|
|
|
|
array(
|
|
|
|
'class' => 'phabricator-filetree-icon '.$icon,
|
|
|
|
),
|
|
|
|
'');
|
|
|
|
|
|
|
|
$name_element = phutil_render_tag(
|
|
|
|
'span',
|
|
|
|
array(
|
|
|
|
'class' => 'phabricator-filetree-name',
|
|
|
|
),
|
|
|
|
phutil_escape_html($name));
|
|
|
|
|
|
|
|
$filetree[] = javelin_render_tag(
|
|
|
|
$href ? 'a' : 'span',
|
|
|
|
array(
|
|
|
|
'href' => $href,
|
|
|
|
'style' => $style,
|
|
|
|
'title' => $name,
|
|
|
|
'class' => 'phabricator-filetree-item',
|
|
|
|
),
|
|
|
|
$icon.$name_element);
|
|
|
|
}
|
|
|
|
$tree->destroy();
|
|
|
|
|
|
|
|
$filetree =
|
|
|
|
'<div class="phabricator-filetree">'.
|
|
|
|
implode("\n", $filetree).
|
|
|
|
'</div>';
|
|
|
|
$nav->addFilter('toc', 'Table of Contents', '#toc');
|
|
|
|
$nav->addCustomBlock($filetree);
|
|
|
|
$nav->addFilter('comment', 'Add Comment', '#comment');
|
|
|
|
$nav->setActive(true);
|
|
|
|
|
|
|
|
return $nav;
|
|
|
|
}
|
2011-01-27 23:55:52 +01:00
|
|
|
}
|