2011-01-24 22:18:41 +01:00
|
|
|
<?php
|
|
|
|
|
|
|
|
/*
|
2012-01-06 05:29:16 +01:00
|
|
|
* Copyright 2012 Facebook, Inc.
|
2011-01-24 22:18:41 +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-13 19:18:11 +01:00
|
|
|
final class DifferentialChangesetDetailView extends AphrontView {
|
2011-01-24 22:18:41 +01:00
|
|
|
|
2011-01-25 20:57:47 +01:00
|
|
|
private $changeset;
|
|
|
|
private $buttons = array();
|
2011-04-15 23:25:23 +02:00
|
|
|
private $revisionID;
|
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 $symbolIndex;
|
2012-01-06 05:29:16 +01:00
|
|
|
private $id;
|
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
|
|
|
private $vsChangesetID;
|
2011-01-24 22:18:41 +01:00
|
|
|
|
2011-01-25 20:57:47 +01:00
|
|
|
public function setChangeset($changeset) {
|
|
|
|
$this->changeset = $changeset;
|
2011-01-24 22:18:41 +01:00
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2011-01-25 20:57:47 +01:00
|
|
|
public function addButton($button) {
|
|
|
|
$this->buttons[] = $button;
|
|
|
|
return $this;
|
|
|
|
}
|
2011-01-24 22:18:41 +01:00
|
|
|
|
2011-04-15 23:25:23 +02:00
|
|
|
public function setRevisionID($revision_id) {
|
|
|
|
$this->revisionID = $revision_id;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
public function setSymbolIndex($symbol_index) {
|
|
|
|
$this->symbolIndex = $symbol_index;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2012-01-06 05:29:16 +01:00
|
|
|
public function getID() {
|
|
|
|
if (!$this->id) {
|
|
|
|
$this->id = celerity_generate_unique_node_id();
|
|
|
|
}
|
|
|
|
return $this->id;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
public function setVsChangesetID($vs_changeset_id) {
|
|
|
|
$this->vsChangesetID = $vs_changeset_id;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getVsChangesetID() {
|
|
|
|
return $this->vsChangesetID;
|
|
|
|
}
|
|
|
|
|
2011-01-25 20:57:47 +01:00
|
|
|
public function render() {
|
|
|
|
require_celerity_resource('differential-changeset-view-css');
|
|
|
|
require_celerity_resource('syntax-highlighting-css');
|
2011-01-24 22:18:41 +01:00
|
|
|
|
Kind-of-terrible (?) oncopy handler
Summary: Works in Safari, Firefox, Chrome.
Test Plan: Copied some text, threw up a little in my mouth.
Reviewers: aran, tuomaspelkonen, tomo, rstout, btrahan
Reviewed By: aran
CC: aran, epriestley, ddfisher
Maniphest Tasks: T145, T995
Differential Revision: https://secure.phabricator.com/D244
2012-03-16 03:04:59 +01:00
|
|
|
Javelin::initBehavior('phabricator-oncopy', array());
|
|
|
|
|
2011-04-15 23:25:23 +02:00
|
|
|
if ($this->revisionID) {
|
|
|
|
$edit = true;
|
|
|
|
} else {
|
|
|
|
$edit = false;
|
|
|
|
}
|
2011-01-24 22:18:41 +01:00
|
|
|
|
2011-01-25 20:57:47 +01:00
|
|
|
$changeset = $this->changeset;
|
|
|
|
$class = 'differential-changeset';
|
|
|
|
if (!$edit) {
|
|
|
|
$class .= ' differential-changeset-immutable';
|
2011-01-24 22:18:41 +01:00
|
|
|
}
|
|
|
|
|
2011-05-06 21:58:53 +02:00
|
|
|
$buttons = null;
|
|
|
|
if ($this->buttons) {
|
|
|
|
$buttons =
|
|
|
|
'<div class="differential-changeset-buttons">'.
|
|
|
|
implode('', $this->buttons).
|
|
|
|
'</div>';
|
|
|
|
}
|
|
|
|
|
2012-01-06 05:29:16 +01:00
|
|
|
$id = $this->getID();
|
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 ($this->symbolIndex) {
|
|
|
|
Javelin::initBehavior(
|
|
|
|
'repository-crossreference',
|
|
|
|
array(
|
|
|
|
'container' => $id,
|
|
|
|
) + $this->symbolIndex);
|
|
|
|
}
|
|
|
|
|
2011-01-25 20:57:47 +01:00
|
|
|
$display_filename = $changeset->getDisplayFilename();
|
2012-02-23 21:26:14 +01:00
|
|
|
|
|
|
|
$buoyant_begin = $this->renderBuoyant($display_filename);
|
|
|
|
$buoyant_end = $this->renderBuoyant(null);
|
|
|
|
|
2011-01-25 20:57:47 +01:00
|
|
|
$output = javelin_render_tag(
|
|
|
|
'div',
|
|
|
|
array(
|
|
|
|
'sigil' => 'differential-changeset',
|
2011-02-02 01:42:36 +01:00
|
|
|
'meta' => array(
|
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
|
|
|
'left' => nonempty(
|
|
|
|
$this->getVsChangesetID(),
|
|
|
|
$this->changeset->getID()),
|
2011-02-02 01:42:36 +01:00
|
|
|
'right' => $this->changeset->getID(),
|
|
|
|
),
|
2011-01-25 20:57:47 +01:00
|
|
|
'class' => $class,
|
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
|
|
|
'id' => $id,
|
2011-01-25 20:57:47 +01:00
|
|
|
),
|
2012-02-23 21:26:14 +01:00
|
|
|
$buoyant_begin.
|
2011-02-05 01:18:08 +01:00
|
|
|
phutil_render_tag(
|
|
|
|
'a',
|
|
|
|
array(
|
|
|
|
'name' => $changeset->getAnchorName(),
|
|
|
|
),
|
|
|
|
'').
|
2011-05-06 21:58:53 +02:00
|
|
|
$buttons.
|
2011-01-25 20:57:47 +01:00
|
|
|
'<h1>'.phutil_escape_html($display_filename).'</h1>'.
|
|
|
|
'<div style="clear: both;"></div>'.
|
2012-02-23 21:26:14 +01:00
|
|
|
$this->renderChildren().
|
|
|
|
$buoyant_end);
|
|
|
|
|
2011-01-25 20:57:47 +01:00
|
|
|
|
|
|
|
return $output;
|
2011-01-24 22:18:41 +01:00
|
|
|
}
|
|
|
|
|
2012-02-23 21:26:14 +01:00
|
|
|
private function renderBuoyant($text) {
|
|
|
|
return javelin_render_tag(
|
|
|
|
'div',
|
|
|
|
array(
|
|
|
|
'sigil' => 'buoyant',
|
|
|
|
'meta' => array(
|
|
|
|
'text' => $text,
|
|
|
|
),
|
|
|
|
'style' => ($text === null)
|
|
|
|
// Current CSS spacing rules cause the "end" anchor to appear too
|
|
|
|
// late in the display document. Shift it up a bit so we drop the
|
|
|
|
// buoyant header sooner. This reduces confusion when using keystroke
|
|
|
|
// navigation.
|
|
|
|
? 'bottom: 60px; position: absolute;'
|
|
|
|
: null,
|
|
|
|
),
|
|
|
|
'');
|
|
|
|
}
|
2011-01-24 22:18:41 +01:00
|
|
|
}
|