revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-19 03:50:54 +01:00
Code Issues Releases Wiki Activity

Allow differential.query to find accepted and committed revisions; fix a fatal

Browse source 
Summary:
  - Expose existing 'committed' filter.
  - Add an 'accepted' filter.
  - Fix a fatal where $repository may not be defined (for diffs not linked to a
repository).

Test Plan: Ran accepted / committed queries. Viewed a previously fataling diff.

Reviewers: btrahan, vrana, Makinde

Reviewed By: Makinde

CC: Koolvin, aran, epriestley

Differential Revision: https://secure.phabricator.com/D1490
This commit is contained in:
epriestley 2012-01-25 14:50:34 -08:00
parent 5b463e634c
commit dbd91d6818
4 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/applications/conduit/method/differential/query/ConduitAPI_differential_query_Method.php
View file

@ -32,6 +32,8 @@ class ConduitAPI_differential_query_Method extends ConduitAPIMethod {
$status_types = array( $status_types = array(
DifferentialRevisionQuery::STATUS_ANY, DifferentialRevisionQuery::STATUS_ANY,
DifferentialRevisionQuery::STATUS_OPEN, DifferentialRevisionQuery::STATUS_OPEN,
DifferentialRevisionQuery::STATUS_ACCEPTED,
DifferentialRevisionQuery::STATUS_COMMITTED,
); );
$status_types = implode(', ', $status_types); $status_types = implode(', ', $status_types);

17
src/applications/differential/query/revision/DifferentialRevisionQuery.php
View file

@ -34,10 +34,11 @@ final class DifferentialRevisionQuery {
private $pathIDs = array(); private $pathIDs = array();
private $status = 'status-any'; private $status = 'status-any';
const STATUS_ANY = 'status-any'; const STATUS_ANY = 'status-any';
const STATUS_OPEN = 'status-open'; const STATUS_OPEN = 'status-open';
const STATUS_COMMITTED = 'status-committed'; const STATUS_ACCEPTED = 'status-accepted';
const STATUS_COMMITTED = 'status-committed';
private $authors = array(); private $authors = array();
private $ccs = array(); private $ccs = array();
@ -640,6 +641,14 @@ final class DifferentialRevisionQuery {
ArcanistDifferentialRevisionStatus::ACCEPTED, ArcanistDifferentialRevisionStatus::ACCEPTED,
)); ));
break; break;
case self::STATUS_ACCEPTED:
$where[] = qsprintf(
$conn_r,
'status IN (%Ld)',
array(
ArcanistDifferentialRevisionStatus::ACCEPTED,
));
break;
case self::STATUS_COMMITTED: case self::STATUS_COMMITTED:
$where[] = qsprintf( $where[] = qsprintf(
$conn_r, $conn_r,

2
src/applications/differential/view/changesetlistview/DifferentialChangesetListView.php
View file

@ -139,7 +139,7 @@ class DifferentialChangesetListView extends AphrontView {
$meta['rightURI'] = (string)$detail_uri->alter('view', 'new'); $meta['rightURI'] = (string)$detail_uri->alter('view', 'new');
} }
if ($this->user) { if ($this->user && $repository) {
$path = ltrim( $path = ltrim(
$changeset->getAbsoluteRepositoryPath($this->diff, $repository), $changeset->getAbsoluteRepositoryPath($this->diff, $repository),
'/'); '/');

2
src/applications/herald/engine/engine/HeraldEngine.php
View file

@ -180,8 +180,6 @@ class HeraldEngine {
implode(', ', $sql)); implode(', ', $sql));
} }
} }
die("DERP");
} }
public function getTranscript() { public function getTranscript() {