From 7f3316269d1e8e4992d17f1ae35bd54587fb2b0f Mon Sep 17 00:00:00 2001
From: Orestis Floros <orestisflo@gmail.com>
Date: Sat, 6 Nov 2021 14:13:18 +0100
Subject: [PATCH] Release notes script fixes (#4652)

* release-notes: Sort filenames

* release-notes: Fix print-urls
---
 release-notes/generator.pl | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/release-notes/generator.pl b/release-notes/generator.pl
index 6996d7a9..d77eb098 100755
--- a/release-notes/generator.pl
+++ b/release-notes/generator.pl
@@ -29,10 +29,17 @@ strongly encouraged to upgrade.
 my $print_urls = 0;
 my $result = GetOptions('print-urls' => \$print_urls);
 
+sub get_number {
+  my $s = shift;
+  return $1 if $s =~ m/^(\d+)/;
+  return -1;
+}
+
 sub read_changefiles {
     my $dirpath = shift;
     opendir my $dir, $dirpath or die "Cannot open directory $dirpath: $!";
-    my @files = readdir $dir;
+    my @files = sort { get_number($a) <=> get_number($b) } readdir $dir;
+
     closedir $dir;
 
     my $s = '';
@@ -41,7 +48,7 @@ sub read_changefiles {
         next if $filename eq '..';
         next if $filename eq '0-example';
 
-        die "Filename $filename should start with a number (e.g. the pull request number)" unless ($filename =~ /^\d+/);
+        die "Filename $filename should start with a number (e.g. the pull request number)" unless get_number($filename) > 0;
 
         $filename = $dirpath . '/' . $filename;
         open my $in, '<', $filename or die "can't open $filename: $!";
@@ -51,14 +58,14 @@ sub read_changefiles {
         my $content = trim(join("\n  ", map { trim($_) } @lines));
         die "$filename can't be empty" unless length($content) > 0;
 
-        my $commit = `git log --diff-filter=A --pretty=format:"%H" $filename`;
-        $commit = trim($commit) if defined($commit);
-        die "$filename: git log failed to find commit" if ($?) || (length($commit) == 0);
-
         my $url = '';
         if ($print_urls) {
+            my $commit = `git log --diff-filter=A --pretty=format:"%H" $filename`;
+            $commit = trim($commit) if defined($commit);
+            die "$filename: git log failed to find commit" if ($?) || (length($commit) == 0);
+
             my $pr = find_pr($commit);
-            my $url = 'https://github.com/i3/i3/commit/' . $commit;
+            $url = 'https://github.com/i3/i3/commit/' . $commit;
             $url = 'https://github.com/i3/i3/pull/' . $pr if defined($pr);
             $url = $url . "\n";
         }