public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Make version guessing more deterministic if two branches appear to be the base of a feature branch (#12129)

pull/12103/head^2
Jordi Boggiano 2024-09-26 13:35:58 +02:00 committed by GitHub
parent 5742df97c2
commit d37dd5fff1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Composer/Package/Version/VersionGuesser.php
View File

@ -284,7 +284,7 @@ class VersionGuesser
} }
// sort local branches first then remote ones // sort local branches first then remote ones
// and sort numeric branches below named ones, to make sure if the branch has the same distance from main and 1.10 and 1.9 for example, main is picked // and sort numeric branches below named ones, to make sure if the branch has the same distance from main and 1.10 and 1.9 for example, 1.9 is picked
// and sort using natural sort so that 1.10 will appear before 1.9 // and sort using natural sort so that 1.10 will appear before 1.9
usort($branches, static function ($a, $b): int { usort($branches, static function ($a, $b): int {
$aRemote = 0 === strpos($a, 'remotes/'); $aRemote = 0 === strpos($a, 'remotes/');
@ -300,7 +300,8 @@ class VersionGuesser
$promises = []; $promises = [];
$this->process->setMaxJobs(30); $this->process->setMaxJobs(30);
try { try {
foreach ($branches as $candidate) { $lastIndex = -1;
foreach ($branches as $index => $candidate) {
$candidateVersion = Preg::replace('{^remotes/\S+/}', '', $candidate); $candidateVersion = Preg::replace('{^remotes/\S+/}', '', $candidate);
// do not compare against itself or other feature branches // do not compare against itself or other feature branches
@ -311,13 +312,17 @@ class VersionGuesser
$cmdLine = array_map(static function (string $component) use ($candidate, $branch) { $cmdLine = array_map(static function (string $component) use ($candidate, $branch) {
return str_replace(['%candidate%', '%branch%'], [$candidate, $branch], $component); return str_replace(['%candidate%', '%branch%'], [$candidate, $branch], $component);
}, $scmCmdline); }, $scmCmdline);
$promises[] = $this->process->executeAsync($cmdLine, $path)->then(function (Process $process) use (&$length, &$version, &$prettyVersion, $candidateVersion, &$promises): void { $promises[] = $this->process->executeAsync($cmdLine, $path)->then(function (Process $process) use (&$lastIndex, $index, &$length, &$version, &$prettyVersion, $candidateVersion, &$promises): void {
if (!$process->isSuccessful()) { if (!$process->isSuccessful()) {
return; return;
} }
$output = $process->getOutput(); $output = $process->getOutput();
if (strlen($output) < $length) { // overwrite existing if we have a shorter diff, or we have an equal diff and an index that comes later in the array (i.e. older version)
// as newer versions typically have more commits, if the feature branch is based on a newer branch it should have a longer diff to the old version
// but if it doesn't and they have equal diffs, then it probably is based on the old version
if (strlen($output) < $length || (strlen($output) === $length && $lastIndex < $index)) {
$lastIndex = $index;
$length = strlen($output); $length = strlen($output);
$version = $this->versionParser->normalizeBranch($candidateVersion); $version = $this->versionParser->normalizeBranch($candidateVersion);
$prettyVersion = 'dev-' . $candidateVersion; $prettyVersion = 'dev-' . $candidateVersion;