Skip to content

Added direct opption to issue:apply command. #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hansfn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added direct opption to issue:apply command. #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/Cli/Command/Issue/Apply.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use mglaman\DrupalOrg\RawResponse;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Process\Process;

Expand All @@ -24,6 +25,7 @@ protected function configure()
$this
->setName('issue:apply')
->addArgument('nid', InputArgument::REQUIRED, 'The issue node ID')
->addOption('direct', 'd', InputOption::VALUE_NONE, 'Apply the patch directly without creating issue branch')
->setDescription('Applies the latest patch from an issue.')
->setHelp(implode(PHP_EOL, [
'This command applies the latest patch from an issue.',
Expand All @@ -38,6 +40,7 @@ protected function configure()
protected function execute(InputInterface $input, OutputInterface $output)
{
$nid = $this->stdIn->getArgument('nid');
$direct = $this->stdIn->getOption('direct');
$issue = $this->getNode($nid);

$patchFileUrl = $this->getPatchFileUrl($issue);
Expand All @@ -46,7 +49,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
file_put_contents($patchFileName, $patchFileContents);

if ($this->repository) {
$exitCode = $this->applyWithGit($issue, $patchFileName);
if ($direct) {
$exitCode = $this->applyWithGit($issue, $patchFileName);
} else {
$exitCode = $this->branchAndApplyWithGit($issue, $patchFileName);
}
} elseif (shell_exec("command -v patch; echo $?") == 0) {
$exitCode = $this->applyWithPatch($patchFileName);
} else {
Expand All @@ -59,6 +66,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
}

protected function applyWithGit($issue, $patchFileName)
{
$applyPatchProcess = $this->runProcess(sprintf('git apply -v --index %s', $patchFileName));
if ($applyPatchProcess->getExitCode() != 0) {
$this->stdOut->writeln('<error>Failed to apply the patch</error>');
$this->stdOut->writeln($applyPatchProcess->getOutput());
return 1;
}
}

protected function branchAndApplyWithGit($issue, $patchFileName)
{
// Validate the issue versions branch, create or checkout issue branch.
$issueBranchCommand = $this->getApplication()->find('issue:branch');
Expand Down