Skip to content

add direct option to issue:apply - fixes #73 #77

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
malcomio wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add direct option to issue:apply - fixes #73 #77

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
73 changes: 42 additions & 31 deletions 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_OPTIONAL, 'Apply the patch directly on the current branch without committing', false)
->setDescription('Applies the latest patch from an issue.')
->setHelp(implode(PHP_EOL, [
'This command applies the latest patch from an issue.',
Expand All @@ -40,13 +42,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
$nid = $this->stdIn->getArgument('nid');
$issue = $this->getNode($nid);

$direct = $this->stdIn->getOption('direct') !== false;

$patchFileUrl = $this->getPatchFileUrl($issue);
$patchFileContents = file_get_contents($patchFileUrl);
$patchFileName = $this->getCleanIssueTitle($issue) . '.patch';
file_put_contents($patchFileName, $patchFileContents);

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

protected function applyWithGit($issue, $patchFileName)
protected function applyWithGit($issue, $patchFileName, $direct = FALSE)
{
// Validate the issue versions branch, create or checkout issue branch.
$issueBranchCommand = $this->getApplication()->find('issue:branch');
$issueBranchCommand->run($this->stdIn, $this->stdOut);

$branchName = $this->buildBranchName($issue);
$tempBranchName = $branchName . '-patch-temp';

// Check out the root development branch to create a temporary merge branch
// where we will apply the patch, and then three way merge to existing issue
// branch.
$issueVersionBranch = $this->getIssueVersionBranchName($issue);
$this->repository->checkout($issueVersionBranch);
$this->stdOut->writeln(sprintf('<comment>%s</comment>', "Creating temp branch $tempBranchName"));
$this->repository->createBranch($tempBranchName);
$this->repository->checkout($tempBranchName);

if (!$direct) {
// Validate the issue versions branch, create or checkout issue branch.
$issueBranchCommand = $this->getApplication()->find('issue:branch');
$this->stdIn->setOption('direct', null);
$issueBranchCommand->run($this->stdIn, $this->stdOut);

$branchName = $this->buildBranchName($issue);
$tempBranchName = $branchName . '-patch-temp';

// Check out the root development branch to create a temporary merge branch
// where we will apply the patch, and then three way merge to existing issue
// branch.
$issueVersionBranch = $this->getIssueVersionBranchName($issue);
$this->repository->checkout($issueVersionBranch);
$this->stdOut->writeln(sprintf('<comment>%s</comment>', "Creating temp branch $tempBranchName"));
$this->repository->createBranch($tempBranchName);
$this->repository->checkout($tempBranchName);
}

$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;
}
$this->stdOut->writeln(sprintf('<comment>%s</comment>', "Committing $patchFileName"));
$this->repository->commit($patchFileName);

// Check out existing issue branch for three way merge.
$this->stdOut->writeln(sprintf('<comment>%s</comment>', "Checking out $branchName and merging"));
$this->repository->checkout($branchName);
$merge = $this->runProcess(sprintf('git merge %s --strategy recursive -X theirs', $tempBranchName));

if ($merge->getExitCode() != 0) {
$this->stdOut->writeln('<error>Failed to apply the patch</error>');
$this->stdOut->writeln($merge->getOutput());
return 1;
$this->stdOut->writeln(sprintf('Applied patch %s', $patchFileName));
if (!$direct) {
$this->stdOut->writeln(sprintf('<comment>%s</comment>', "Committing $patchFileName"));
$this->repository->commit($patchFileName);

// Check out existing issue branch for three way merge.
$this->stdOut->writeln(sprintf('<comment>%s</comment>', "Checking out $branchName and merging"));
$this->repository->checkout($branchName);
$merge = $this->runProcess(sprintf('git merge %s --strategy recursive -X theirs', $tempBranchName));

if ($merge->getExitCode() != 0) {
$this->stdOut->writeln('<error>Failed to apply the patch</error>');
$this->stdOut->writeln($merge->getOutput());
return 1;
}

$this->runProcess(sprintf('git branch -D %s', $tempBranchName));
}

$this->runProcess(sprintf('git branch -D %s', $tempBranchName));
}

protected function applyWithPatch($patchFileName)
Expand Down