Page MenuHomeSealhub
Files F10360849

No OneTemporary
Actions

View Options

diff --git a/src/workflow/ArcanistUpgradeWorkflow.php b/src/workflow/ArcanistUpgradeWorkflow.php
index c9e0e858..50449ef7 100644
--- a/src/workflow/ArcanistUpgradeWorkflow.php
+++ b/src/workflow/ArcanistUpgradeWorkflow.php
@@ -1,89 +1,112 @@
<?php
/**
* Upgrade arcanist itself.
*/
final class ArcanistUpgradeWorkflow extends ArcanistWorkflow {
public function getWorkflowName() {
return 'upgrade';
}
public function getCommandSynopses() {
return phutil_console_format(<<<EOTEXT
**upgrade**
EOTEXT
);
}
public function getCommandHelp() {
return phutil_console_format(<<<EOTEXT
Supports: cli
Upgrade arcanist and libphutil to the latest versions.
EOTEXT
);
}
public function run() {
$roots = array(
'libphutil' => dirname(phutil_get_library_root('phutil')),
'arcanist' => dirname(phutil_get_library_root('arcanist')),
);
foreach ($roots as $lib => $root) {
echo phutil_console_format(
"%s\n",
pht('Upgrading %s...', $lib));
$working_copy = ArcanistWorkingCopyIdentity::newFromPath($root);
$configuration_manager = clone $this->getConfigurationManager();
$configuration_manager->setWorkingCopyIdentity($working_copy);
$repository = ArcanistRepositoryAPI::newAPIFromConfigurationManager(
$configuration_manager);
if (!Filesystem::pathExists($repository->getMetadataPath())) {
throw new ArcanistUsageException(
pht(
"%s must be in its git working copy to be automatically upgraded. ".
"This copy of %s (in '%s') is not in a git working copy.",
$lib,
$lib,
$root));
}
$this->setRepositoryAPI($repository);
- $this->requireCleanWorkingCopy();
+ // NOTE: Don't use requireCleanWorkingCopy() here because it tries to
+ // amend changes and generally move the workflow forward. We just want to
+ // abort if there are local changes and make the user sort things out.
+ $uncommitted = $repository->getUncommittedStatus();
+ if ($uncommitted) {
+ $message = pht(
+ 'You have uncommitted changes in the working copy for this '.
+ 'library:');
+
+ $list = id(new PhutilConsoleList())
+ ->setWrap(false)
+ ->addItems(array_keys($uncommitted));
+
+ id(new PhutilConsoleBlock())
+ ->addParagraph($message)
+ ->addList($list)
+ ->draw();
+
+ throw new ArcanistUsageException(
+ pht('`arc upgrade` can only upgrade clean working copies.'));
+ }
$branch_name = $repository->getBranchName();
if ($branch_name != 'master' && $branch_name != 'stable') {
throw new ArcanistUsageException(
pht(
"%s must be on either branch '%s' or '%s' to be automatically ".
"upgraded. ".
"This copy of %s (in '%s') is on branch '%s'.",
$lib,
'master',
'stable',
$lib,
$root,
$branch_name));
}
chdir($root);
+
try {
- phutil_passthru('git pull --rebase');
+ execx('git pull --rebase');
} catch (Exception $ex) {
- phutil_passthru('git rebase --abort');
+ // If we failed, try to go back to the old state, then throw the
+ // original exception.
+ exec_manual('git rebase --abort');
throw $ex;
}
}
echo phutil_console_format(
"**%s** %s\n",
pht('Updated!'),
pht('Your copy of arc is now up to date.'));
return 0;
}
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Nov 8, 09:27 (1 d, 8 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1034403
Default Alt Text
(3 KB)

Event Timeline