Pick higher revision number to guarantee successful file retrieval (#…

…11350)
composer · Mar 17, 2023 · 3b16937 · 3b16937
1 parent 1a3f986
commit 3b16937
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/src/Composer/Repository/Vcs/SvnDriver.php b/src/Composer/Repository/Vcs/SvnDriver.php
@@ -236,14 +236,19 @@ public function getTags(): array
             if ($this->tagsPath !== false) {
                 $output = $this->execute('svn ls --verbose', $this->baseUrl . '/' . $this->tagsPath);
                 if ($output) {
+                    $lastRev = null;
                     foreach ($this->process->splitLines($output) as $line) {
                         $line = trim($line);
                         if ($line && Preg::isMatch('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
-                            if (isset($match[1], $match[2]) && $match[2] !== './') {
-                                $tags[rtrim($match[2], '/')] = $this->buildIdentifier(
-                                    '/' . $this->tagsPath . '/' . $match[2],
-                                    $match[1]
-                                );
+                            if (isset($match[1], $match[2])) {
+                                if ($match[2] === './') {
+                                    $lastRev = $match[1];
+                                } else {
+                                    $tags[rtrim($match[2], '/')] = $this->buildIdentifier(
+                                        '/' . $this->tagsPath . '/' . $match[2],
+                                        max($lastRev, $match[1])
+                                    );
+                                }
                             }
                         }
                     }
@@ -291,14 +296,19 @@ public function getBranches(): array
             if ($this->branchesPath !== false) {
                 $output = $this->execute('svn ls --verbose', $this->baseUrl . '/' . $this->branchesPath);
                 if ($output) {
+                    $lastRev = null;
                     foreach ($this->process->splitLines(trim($output)) as $line) {
                         $line = trim($line);
                         if ($line && Preg::isMatch('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
-                            if (isset($match[1], $match[2]) && $match[2] !== './') {
-                                $branches[rtrim($match[2], '/')] = $this->buildIdentifier(
-                                    '/' . $this->branchesPath . '/' . $match[2],
-                                    $match[1]
-                                );
+                            if (isset($match[1], $match[2])) {
+                                if ($match[2] === './') {
+                                    $lastRev = $match[1];
+                                } else {
+                                    $branches[rtrim($match[2], '/')] = $this->buildIdentifier(
+                                        '/' . $this->branchesPath . '/' . $match[2],
+                                        max($lastRev, $match[1])
+                                    );
+                                }
                             }
                         }
                     }