Merge pull request #34 from nextcloud/enh/noid/changelog-from-beta0

allow fetching pending PRs for first beta

2 files changed, 31 insertions, 21 deletions

diff --git a/README.md b/README.md
index 094f39f..fc599b0 100644
--- a/README.md
+++ b/README.md
@@ -43,4 +43,11 @@ E.g. generate the changelog for the upcoming 3.3.0 Android release:
 php index.php generate:changelog android stable-3.3.0 stable-3.3.x
 ```
 
+E.g. to generate the pending PRs for a very first beta of a major release run (mind, the vxx.0.0beta0 tag is expected NOT to exist)):
+
+```
+php index.php generate:changelog server v42.0.0beta0 master
+```
+
+
 
diff --git a/changelog/index.php b/changelog/index.php
index 55da9a8..6238923 100644
--- a/changelog/index.php
+++ b/changelog/index.php
@@ -196,33 +196,36 @@ class GenerateChangelogCommand extends Command
 		$progressBar->setMessage('Starting ...');
 		$progressBar->start();
 
-		foreach ($reposToIterate as $repoName) {
+		$isBetaNull = strpos($base, 'beta0') !== false;
 
+		foreach ($reposToIterate as $repoName) {
 			$pullRequests = [];
 			/** @var \Github\Api\Repo $repo */
 			$repo = $client->api('repo');
-			try {
-				$progressBar->setMessage("Fetching git history for $repoName...");
-				$diff = $repo->commits()->compare($orgName, $repoName, $base, $head);
-			} catch (\Github\Exception\RuntimeException $e) {
-				if ($e->getMessage() === 'Not Found') {
-					$output->writeln('<error>Could not find base or head reference on ' . $repoName. '.</error>');
-					// print 3 empty lines to not overwrite the error message with the progress bar
-					$output->writeln('');
-					$output->writeln('');
-					$output->writeln('');
-					continue;
+			if (!$isBetaNull) {
+				try {
+					$progressBar->setMessage("Fetching git history for $repoName...");
+					$diff = $repo->commits()->compare($orgName, $repoName, $base, $head);
+				} catch (\Github\Exception\RuntimeException $e) {
+					if ($e->getMessage() === 'Not Found') {
+						$output->writeln('<error>Could not find base or head reference on ' . $repoName . '.</error>');
+						// print 3 empty lines to not overwrite the error message with the progress bar
+						$output->writeln('');
+						$output->writeln('');
+						$output->writeln('');
+						continue;
+					}
+					throw $e;
 				}
-				throw $e;
-			}
 
-			foreach ($diff['commits'] as $commit) {
-				$fullMessage = $commit['commit']['message'];
-				list($firstLine,) = explode("\n", $fullMessage, 2);
-				if (substr($firstLine, 0, 20) === 'Merge pull request #') {
-					$firstLine = substr($firstLine, 20);
-					list($number,) = explode(" ", $firstLine, 2);
-					$pullRequests[] = $number;
+				foreach ($diff['commits'] as $commit) {
+					$fullMessage = $commit['commit']['message'];
+					list($firstLine,) = explode("\n", $fullMessage, 2);
+					if (substr($firstLine, 0, 20) === 'Merge pull request #') {
+						$firstLine = substr($firstLine, 20);
+						list($number,) = explode(" ", $firstLine, 2);
+						$pullRequests[] = $number;
+					}
 				}
 			}
 			$progressBar->advance();