Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15452864
D9022.id21434.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
12 KB
Referenced Files
None
Subscribers
None
D9022.id21434.diff
View Options
diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
'core.pkg.css' => 'c00e58c8',
'core.pkg.js' => 'b2ed04a2',
'darkconsole.pkg.js' => 'ca8671ce',
- 'differential.pkg.css' => '4b8686e3',
+ 'differential.pkg.css' => '29b06beb',
'differential.pkg.js' => '05ad02d3',
'diffusion.pkg.css' => '3783278d',
'diffusion.pkg.js' => '5b4010f4',
@@ -54,7 +54,7 @@
'rsrc/css/application/countdown/timer.css' => '86b7b0a0',
'rsrc/css/application/diff/inline-comment-summary.css' => '8cfd34e8',
'rsrc/css/application/differential/add-comment.css' => 'c478bcaa',
- 'rsrc/css/application/differential/changeset-view.css' => '1570a1ff',
+ 'rsrc/css/application/differential/changeset-view.css' => '387c8610',
'rsrc/css/application/differential/core.css' => '7ac3cabc',
'rsrc/css/application/differential/results-table.css' => '239924f9',
'rsrc/css/application/differential/revision-comment.css' => '48186045',
@@ -511,7 +511,7 @@
'conpherence-notification-css' => '403cf598',
'conpherence-update-css' => '1099a660',
'conpherence-widget-pane-css' => 'bf275a6c',
- 'differential-changeset-view-css' => '1570a1ff',
+ 'differential-changeset-view-css' => '387c8610',
'differential-core-view-css' => '7ac3cabc',
'differential-inline-comment-editor' => 'f2441746',
'differential-results-table-css' => '239924f9',
diff --git a/resources/sql/autopatches/20140509.coverage.1.sql b/resources/sql/autopatches/20140509.coverage.1.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20140509.coverage.1.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_repository.repository_coverage (
+ id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ branchID INT UNSIGNED NOT NULL,
+ pathID INT UNSIGNED NOT NULL,
+ coverage LONGTEXT NOT NULL COLLATE latin1_bin,
+ KEY `key_path` (branchID, pathID)
+) ENGINE=InnoDB, COLLATE utf8_general_ci;
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -177,6 +177,7 @@
'ConduitAPI_diffusion_resolverefs_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_resolverefs_Method.php',
'ConduitAPI_diffusion_searchquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_searchquery_Method.php',
'ConduitAPI_diffusion_tagsquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_tagsquery_Method.php',
+ 'ConduitAPI_diffusion_updatecoverage_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_updatecoverage_Method.php',
'ConduitAPI_feed_Method' => 'applications/feed/conduit/ConduitAPI_feed_Method.php',
'ConduitAPI_feed_publish_Method' => 'applications/feed/conduit/ConduitAPI_feed_publish_Method.php',
'ConduitAPI_feed_query_Method' => 'applications/feed/conduit/ConduitAPI_feed_query_Method.php',
@@ -2804,6 +2805,7 @@
'ConduitAPI_diffusion_resolverefs_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
'ConduitAPI_diffusion_searchquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
'ConduitAPI_diffusion_tagsquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
+ 'ConduitAPI_diffusion_updatecoverage_Method' => 'ConduitAPI_diffusion_Method',
'ConduitAPI_feed_Method' => 'ConduitAPIMethod',
'ConduitAPI_feed_publish_Method' => 'ConduitAPI_feed_Method',
'ConduitAPI_feed_query_Method' => 'ConduitAPI_feed_Method',
diff --git a/src/applications/differential/parser/DifferentialChangesetParser.php b/src/applications/differential/parser/DifferentialChangesetParser.php
--- a/src/applications/differential/parser/DifferentialChangesetParser.php
+++ b/src/applications/differential/parser/DifferentialChangesetParser.php
@@ -235,6 +235,7 @@
$this->coverage = $coverage;
return $this;
}
+
private function getCoverage() {
return $this->coverage;
}
diff --git a/src/applications/diffusion/DiffusionLintSaveRunner.php b/src/applications/diffusion/DiffusionLintSaveRunner.php
--- a/src/applications/diffusion/DiffusionLintSaveRunner.php
+++ b/src/applications/diffusion/DiffusionLintSaveRunner.php
@@ -66,20 +66,14 @@
}
$branch_name = $api->getBranchName();
- $this->branch = new PhabricatorRepositoryBranch();
- $this->conn = $this->branch->establishConnection('w');
- $this->branch = $this->branch->loadOneWhere(
- 'repositoryID = %d AND name = %s',
+
+ $this->branch = PhabricatorRepositoryBranch::loadOrCreateBranch(
$project->getRepositoryID(),
$branch_name);
+ $this->conn = $this->branch->establishConnection('w');
$this->lintCommit = null;
- if (!$this->branch) {
- $this->branch = id(new PhabricatorRepositoryBranch())
- ->setRepositoryID($project->getRepositoryID())
- ->setName($branch_name)
- ->save();
- } else if (!$this->all) {
+ if (!$this->all) {
$this->lintCommit = $this->branch->getLintCommit();
}
@@ -95,6 +89,7 @@
}
}
+
if (!$this->lintCommit) {
$where = ($this->svnRoot
? qsprintf($this->conn, 'AND path LIKE %>', $this->svnRoot.'/')
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_updatecoverage_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_updatecoverage_Method.php
new file mode 100644
--- /dev/null
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_updatecoverage_Method.php
@@ -0,0 +1,83 @@
+<?php
+
+final class ConduitAPI_diffusion_updatecoverage_Method
+ extends ConduitAPI_diffusion_Method {
+
+ public function getMethodStatus() {
+ return self::METHOD_STATUS_UNSTABLE;
+ }
+
+ public function getMethodDescription() {
+ return pht('Publish coverage information for a repository.');
+ }
+
+ public function defineReturnType() {
+ return 'void';
+ }
+
+ public function defineParamTypes() {
+ return array(
+ 'repositoryPHID' => 'required phid',
+ 'branch' => 'optional string',
+ 'coverage' => 'required map<string, string>',
+ );
+ }
+
+ public function defineErrorTypes() {
+ return array();
+ }
+
+ protected function execute(ConduitAPIRequest $request) {
+ $viewer = $request->getUser();
+
+ $repository_phid = $request->getValue('repositoryPHID');
+ $repository = id(new PhabricatorRepositoryQuery())
+ ->setViewer($viewer)
+ ->withPHIDs(array($repository_phid))
+ ->executeOne();
+
+ if (!$repository) {
+ throw new Exception(pht('No such repository!'));
+ }
+
+ $branch = PhabricatorRepositoryBranch::loadOrCreateBranch(
+ $repository->getID(),
+ $request->getValue('branch'));
+
+ $coverage = $request->getValue('coverage');
+ $path_map = id(new DiffusionPathIDQuery(array_keys($coverage)))
+ ->loadPathIDs();
+
+ $conn = $repository->establishConnection('w');
+
+ $sql = array();
+ foreach ($coverage as $path => $coverage_info) {
+ $sql[] = qsprintf(
+ $conn,
+ '(%d, %d, %s)',
+ $branch->getID(),
+ $path_map[$path],
+ $coverage_info);
+ }
+
+ $table_name = 'repository_coverage';
+
+ $conn->openTransaction();
+ queryfx(
+ $conn,
+ 'DELETE FROM %T WHERE branchID = %d',
+ $table_name,
+ $branch->getID());
+
+ foreach (PhabricatorLiskDAO::chunkSQL($sql) as $chunk) {
+ queryfx(
+ $conn,
+ 'INSERT INTO %T (branchID, pathID, coverage) VALUES %Q',
+ $table_name,
+ $chunk);
+ }
+ $conn->saveTransaction();
+ }
+
+
+}
diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
@@ -4,6 +4,7 @@
private $lintCommit;
private $lintMessages;
+ private $coverage;
public function processRequest() {
$request = $this->getRequest();
@@ -68,6 +69,7 @@
}
$this->loadLintMessages();
+ $this->coverage = $drequest->loadCoverage();
$binary_uri = null;
if (ArcanistDiffUtils::isHeuristicBinaryFile($data)) {
@@ -791,6 +793,24 @@
phutil_safe_html(str_replace("\t", ' ', $line['data'])),
));
+ if ($this->coverage) {
+ require_celerity_resource('differential-changeset-view-css');
+ $cov_index = $line['line'] - 1;
+
+ if (isset($this->coverage[$cov_index])) {
+ $cov_class = $this->coverage[$cov_index];
+ } else {
+ $cov_class = 'N';
+ }
+
+ $blame[] = phutil_tag(
+ 'td',
+ array(
+ 'class' => 'cov cov-'.$cov_class,
+ ),
+ '');
+ }
+
$rows[] = phutil_tag(
'tr',
array(
diff --git a/src/applications/diffusion/controller/DiffusionDiffController.php b/src/applications/diffusion/controller/DiffusionDiffController.php
--- a/src/applications/diffusion/controller/DiffusionDiffController.php
+++ b/src/applications/diffusion/controller/DiffusionDiffController.php
@@ -68,6 +68,11 @@
array(
'action' => 'rendering-ref')));
+ $coverage = $drequest->loadCoverage();
+ if ($coverage) {
+ $parser->setCoverage($coverage);
+ }
+
$pquery = new DiffusionPathIDQuery(array($changeset->getFilename()));
$ids = $pquery->loadPathIDs();
$path_id = $ids[$changeset->getFilename()];
diff --git a/src/applications/diffusion/request/DiffusionRequest.php b/src/applications/diffusion/request/DiffusionRequest.php
--- a/src/applications/diffusion/request/DiffusionRequest.php
+++ b/src/applications/diffusion/request/DiffusionRequest.php
@@ -29,6 +29,7 @@
private $initFromConduit = true;
private $user;
+ private $branchObject = false;
abstract protected function getSupportsBranches();
abstract protected function didInitialize();
@@ -256,12 +257,41 @@
}
public function loadBranch() {
- return id(new PhabricatorRepositoryBranch())->loadOneWhere(
- 'repositoryID = %d AND name = %s',
- $this->getRepository()->getID(),
- $this->getArcanistBranch());
+ // TODO: Get rid of this and do real Queries on real objects.
+
+ if ($this->branchObject === false) {
+ $this->branchObject = PhabricatorRepositoryBranch::loadBranch(
+ $this->getRepository()->getID(),
+ $this->getArcanistBranch());
+ }
+
+ return $this->branchObject;
}
+ public function loadCoverage() {
+ // TODO: This should also die.
+ $branch = $this->loadBranch();
+ if (!$branch) {
+ return;
+ }
+
+ $path = $this->getPath();
+ $path_map = id(new DiffusionPathIDQuery(array($path)))->loadPathIDs();
+
+ $coverage_row = queryfx_one(
+ id(new PhabricatorRepository())->establishConnection('r'),
+ 'SELECT * FROM %T WHERE branchID = %d AND pathID = %d',
+ 'repository_coverage',
+ $branch->getID(),
+ $path_map[$path]);
+ if (!$coverage_row) {
+ return null;
+ }
+
+ return idx($coverage_row, 'coverage');
+ }
+
+
public function loadCommit() {
if (empty($this->repositoryCommit)) {
$repository = $this->getRepository();
diff --git a/src/applications/repository/storage/PhabricatorRepositoryBranch.php b/src/applications/repository/storage/PhabricatorRepositoryBranch.php
--- a/src/applications/repository/storage/PhabricatorRepositoryBranch.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryBranch.php
@@ -6,4 +6,23 @@
protected $name;
protected $lintCommit;
+ public static function loadBranch($repository_id, $branch_name) {
+ return id(new PhabricatorRepositoryBranch())->loadOneWhere(
+ 'repositoryID = %d AND name = %s',
+ $repository_id,
+ $branch_name);
+ }
+
+ public static function loadOrCreateBranch($repository_id, $branch_name) {
+ $branch = self::loadBranch($repository_id, $branch_name);
+ if ($branch) {
+ return $branch;
+ }
+
+ return id(new PhabricatorRepositoryBranch())
+ ->setRepositoryID($repository_id)
+ ->setName($branch_name)
+ ->save();
+ }
+
}
diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css
--- a/webroot/rsrc/css/application/differential/changeset-view.css
+++ b/webroot/rsrc/css/application/differential/changeset-view.css
@@ -136,6 +136,10 @@
padding: 0;
}
+.diffusion-source td.cov {
+ padding: 0 8px;
+}
+
td.cov-U {
background: #dd8866;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Mar 30, 7:49 AM (5 d, 17 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7706313
Default Alt Text
D9022.id21434.diff (12 KB)
Attached To
Mode
D9022: Provide a rough, unstable API for reporting coverage into Diffusion
Attached
Detach File
Event Timeline
Log In to Comment