Page MenuHomestyx hydra
Files F127391

No OneTemporary
Actions

View Options

diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementRebuildIdentitiesWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementRebuildIdentitiesWorkflow.php
index f7a0cf58f8..86cdcaa462 100644
--- a/src/applications/repository/management/PhabricatorRepositoryManagementRebuildIdentitiesWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementRebuildIdentitiesWorkflow.php
@@ -1,101 +1,125 @@
<?php
final class PhabricatorRepositoryManagementRebuildIdentitiesWorkflow
extends PhabricatorRepositoryManagementWorkflow {
protected function didConstruct() {
$this
->setName('rebuild-identities')
->setExamples(
'**rebuild-identities** [__options__] __repository__')
->setSynopsis(pht('Rebuild repository identities from commits.'))
->setArguments(
array(
array(
'name' => 'repositories',
'wildcard' => true,
),
array(
'name' => 'all',
'help' => pht('Rebuild identities across all repositories.'),
),
));
}
public function execute(PhutilArgumentParser $args) {
$console = PhutilConsole::getConsole();
$all = $args->getArg('all');
$repositories = $args->getArg('repositories');
if ($all xor empty($repositories)) {
throw new PhutilArgumentUsageException(
pht('Specify --all or a list of repositories, but not both.'));
}
$query = id(new DiffusionCommitQuery())
->setViewer(PhabricatorUser::getOmnipotentUser())
->needCommitData(true);
if ($repositories) {
$repos = $this->loadRepositories($args, 'repositories');
$query->withRepositoryIDs(mpull($repos, 'getID'));
}
$iterator = new PhabricatorQueryIterator($query);
foreach ($iterator as $commit) {
+ $needs_update = false;
+
$data = $commit->getCommitData();
$author_name = $data->getAuthorName();
- $author_identity = $this->getIdentityForCommit(
- $commit, $author_name);
- $commit->setAuthorIdentityPHID($author_identity->getPHID());
- $data->setCommitDetail(
- 'authorIdentityPHID', $author_identity->getPHID());
+ $author_identity = $this->getIdentityForCommit(
+ $commit,
+ $author_name);
+
+ $author_phid = $commit->getAuthorIdentityPHID();
+ $identity_phid = $author_identity->getPHID();
+ if ($author_phid !== $identity_phid) {
+ $commit->setAuthorIdentityPHID($identity_phid);
+ $data->setCommitDetail('authorIdentityPHID', $identity_phid);
+ $needs_update = true;
+ }
$committer_name = $data->getCommitDetail('committer', null);
- if ($committer_name) {
+ $committer_phid = $commit->getCommitterIdentityPHID();
+ if (strlen($committer_name)) {
$committer_identity = $this->getIdentityForCommit(
- $commit, $committer_name);
+ $commit,
+ $committer_name);
+ $identity_phid = $committer_identity->getPHID();
+ } else {
+ $identity_phid = null;
+ }
- $commit->setCommitterIdentityPHID($committer_identity->getPHID());
- $data->setCommitDetail(
- 'committerIdentityPHID', $committer_identity->getPHID());
+ if ($committer_phid !== $identity_phid) {
+ $commit->setCommitterIdentityPHID($identity_phid);
+ $data->setCommitDetail('committerIdentityPHID', $identity_phid);
+ $needs_update = true;
}
- $commit->save();
- $data->save();
+ if ($needs_update) {
+ $commit->save();
+ $data->save();
+ echo tsprintf(
+ "Rebuilt identities for %s.\n",
+ $commit->getDisplayName());
+ } else {
+ echo tsprintf(
+ "No changes for %s.\n",
+ $commit->getDisplayName());
+ }
}
}
private function getIdentityForCommit(
PhabricatorRepositoryCommit $commit, $identity_name) {
static $seen = array();
$identity_key = PhabricatorHash::digestForIndex($identity_name);
if (empty($seen[$identity_key])) {
try {
$user_phid = id(new DiffusionResolveUserQuery())
->withCommit($commit)
->withName($identity_name)
->execute();
$identity = id(new PhabricatorRepositoryIdentity())
->setAuthorPHID($commit->getPHID())
->setIdentityName($identity_name)
->setAutomaticGuessedUserPHID($user_phid)
->save();
} catch (AphrontDuplicateKeyQueryException $ex) {
// Somehow this identity already exists?
$identity = id(new PhabricatorRepositoryIdentityQuery())
->setViewer(PhabricatorUser::getOmnipotentUser())
->withIdentityNames(array($identity_name))
->executeOne();
}
$seen[$identity_key] = $identity;
}
return $seen[$identity_key];
}
}

File Metadata

Mime Type
text/x-diff
Expires
Mon, Apr 28, 11:30 AM (17 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
107948
Default Alt Text
(4 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!)