Page MenuHomestyx hydra
Files F207609

No OneTemporary
Actions

View Options

diff --git a/scripts/repository/reconcile.php b/scripts/repository/reconcile.php
new file mode 100755
index 0000000000..6e45f034a2
--- /dev/null
+++ b/scripts/repository/reconcile.php
@@ -0,0 +1,165 @@
+#!/usr/bin/env php
+<?php
+
+/*
+ * Copyright 2012 Facebook, Inc.
+ *
+ * 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.
+ */
+
+$root = dirname(dirname(dirname(__FILE__)));
+require_once $root.'/scripts/__init_script__.php';
+
+$args = new PhutilArgumentParser($argv);
+$args->setTagline('reconcile Phabricator state after repository changes');
+$args->setSynopsis(<<<EOSYNOPSIS
+**reconcile.php** __repository_callsign__
+ Reconcile the state of Phabricator's caches with the actual state
+ of the repository.
+
+ This is an administrative/maintenace operation and not generally
+ necessary, but if repository history has changed or been rewritten
+ (for example, if the repository was stored from a backup)
+ Phabricator may think commits which are no longer present in the
+ repository still exist.
+
+ This will delete all evidence of commits which Phabricator can't
+ find in the actual repository.
+
+EOSYNOPSIS
+ );
+$args->parseStandardArguments();
+$args->parse(
+ array(
+ array(
+ 'name' => 'more',
+ 'wildcard' => true,
+ ),
+ ));
+
+$more = $args->getArg('more');
+if (count($more) !== 1) {
+ $args->printHelpAndExit();
+}
+$callsign = reset($more);
+
+
+$repository = id(new PhabricatorRepository())->loadOneWhere(
+ 'callsign = %s',
+ $callsign);
+if (!$repository) {
+ throw new Exception("No repository exists with callsign '{$callsign}'!");
+}
+
+switch ($repository->getVersionControlSystem()) {
+ case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
+ break;
+ case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
+ case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
+ default:
+ throw new Exception("For now, you can only reconcile git repositories.");
+}
+
+echo "Loading commits...\n";
+$all_commits = id(new PhabricatorRepositoryCommit())->loadAllWhere(
+ 'repositoryID = %d',
+ $repository->getID());
+
+echo "Updating repository..\n";
+try {
+ // Sanity-check the repository working copy and make sure we're up to date.
+ $repository->execxLocalCommand('fetch --all');
+} catch (Exception $ex) {
+ echo "Unable to `git fetch` the working copy to update it. Reconciliation ".
+ "requires an up-to-date working copy.\n";
+ throw $ex;
+}
+
+echo "Verifying commits (this may take some time if the repository is large)";
+$futures = array();
+foreach ($all_commits as $id => $commit) {
+ $futures[$id] = $repository->getLocalCommandFuture(
+ 'rev-parse --verify %s',
+ $commit->getCommitIdentifier());
+}
+
+$bad = array();
+foreach (Futures($futures)->limit(8) as $id => $future) {
+ list($err) = $future->resolve();
+ if ($err) {
+ $bad[$id] = $all_commits[$id];
+ echo "#";
+ } else {
+ echo ".";
+ }
+}
+echo "\nDone.\n";
+
+if (!count($bad)) {
+ echo "No bad commits found!\n";
+} else {
+ echo "Found ".count($bad)." bad commits:\n\n";
+ echo ' '.implode("\n ", mpull($bad, 'getCommitIdentifier'));
+ $ok = phutil_console_confirm("Do you want to delete these commits?");
+ if (!$ok) {
+ echo "OK, aborting.\n";
+ exit(1);
+ }
+
+ echo "Deleting commits";
+ foreach ($bad as $commit) {
+ echo ".";
+ $commit->delete();
+ }
+ echo "\nDone.\n";
+}
+
+//// Clean Up Links ////////////////////////////////////////////////////////
+
+$table = new PhabricatorRepositoryCommit();
+
+$valid_phids = queryfx_all(
+ $table->establishConnection('r'),
+ 'SELECT phid FROM %T',
+ $table->getTableName());
+$valid_phids = ipull($valid_phids, null, 'phid');
+
+//////// Differential <-> Diffusion Links //////////////////////////////////
+
+$dx_conn = id(new DifferentialRevision())->establishConnection('w');
+$dx_table = DifferentialRevision::TABLE_COMMIT;
+$dx_phids = queryfx_all(
+ $dx_conn,
+ 'SELECT commitPHID FROM %T',
+ $dx_table);
+
+$bad_phids = array();
+foreach ($dx_phids as $dx_phid) {
+ if (empty($valid_phids[$dx_phid['commitPHID']])) {
+ $bad_phids[] = $dx_phid['commitPHID'];
+ }
+}
+
+if ($bad_phids) {
+ echo "Deleting ".count($bad_phids)." bad Diffusion links...\n";
+ queryfx(
+ $dx_conn,
+ 'DELETE FROM %T WHERE commitPHID IN (%Ls)',
+ $dx_table,
+ $bad_phids);
+ echo "Done.\n";
+} else {
+ echo "Diffusion links are clean.\n";
+}
+
+// TODO: There are some links in owners that we should probably clean up too.
diff --git a/src/applications/repository/storage/commit/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/commit/PhabricatorRepositoryCommit.php
index 67daa340e5..9984f64a89 100644
--- a/src/applications/repository/storage/commit/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/commit/PhabricatorRepositoryCommit.php
@@ -1,52 +1,74 @@
<?php
/*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
*
* 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.
*/
class PhabricatorRepositoryCommit extends PhabricatorRepositoryDAO {
protected $repositoryID;
protected $phid;
protected $commitIdentifier;
protected $epoch;
private $commitData;
public function getConfiguration() {
return array(
self::CONFIG_AUX_PHID => true,
self::CONFIG_TIMESTAMPS => false,
) + parent::getConfiguration();
}
public function generatePHID() {
return PhabricatorPHID::generateNewPHID(
PhabricatorPHIDConstants::PHID_TYPE_CMIT);
}
+ public function loadCommitData() {
+ if (!$this->getID()) {
+ return null;
+ }
+ return id(new PhabricatorRepositoryCommitData())->loadOneWhere(
+ 'commitID = %d',
+ $this->getID());
+ }
+
public function attachCommitData(PhabricatorRepositoryCommitData $data) {
$this->commitData = $data;
return $this;
}
public function getCommitData() {
if (!$this->commitData) {
throw new Exception("Attach commit data with attachCommitData() first!");
}
return $this->commitData;
}
+ public function delete() {
+ $data = $this->loadCommitData();
+ $this->openTransaction();
+
+ if ($data) {
+ $data->delete();
+ }
+ $result = parent::delete();
+
+ $this->saveTransaction();
+ return $result;
+ }
+
}
diff --git a/src/applications/repository/storage/commit/__init__.php b/src/applications/repository/storage/commit/__init__.php
index 9d410d797e..64ca0a27b8 100644
--- a/src/applications/repository/storage/commit/__init__.php
+++ b/src/applications/repository/storage/commit/__init__.php
@@ -1,14 +1,17 @@
<?php
/**
* This file is automatically generated. Lint this module to rebuild it.
* @generated
*/
phutil_require_module('phabricator', 'applications/phid/constants');
phutil_require_module('phabricator', 'applications/phid/storage/phid');
phutil_require_module('phabricator', 'applications/repository/storage/base');
+phutil_require_module('phabricator', 'applications/repository/storage/commitdata');
+
+phutil_require_module('phutil', 'utils');
phutil_require_source('PhabricatorRepositoryCommit.php');

File Metadata

Mime Type
text/x-diff
Expires
Wed, Jul 2, 7:39 PM (20 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
165123
Default Alt Text
(8 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)