From: Laura Flores <lflores@redhat.com>
Date: Fri, 5 May 2023 18:31:53 +0000 (+0000)
Subject: script: improve author scraping on cherry picks
X-Git-Tag: v19.0.0~1272^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c20d876c69ec1748d2207d38fbcf31ecbf66c00d;p=ceph.git

script: improve author scraping on cherry picks

Signed-off-by: Laura Flores <lflores@redhat.com>
---

diff --git a/src/script/ceph-release-notes b/src/script/ceph-release-notes
index 1c01154f0901..366588d64a0c 100755
--- a/src/script/ceph-release-notes
+++ b/src/script/ceph-release-notes
@@ -192,8 +192,15 @@ def make_release_notes(gh, repo, ref, cherry_picks, plaintext, html, markdown, v
                 else:
                     print(f"Could not fetch PR {number} in {retries} tries.")
                     raise
+        commit = None
+        if merges[number] == "cherry_pick":
+            try:
+                commit = repo.commit(pr['merge_commit_sha'])
+            except:
+                pass
         if merges[number] == "merge_commit":
             commit = merge_commits[number]
+        if commit:
             (title, message) = _title_message(commit, pr, strict)
         else:
             (title, message) = (pr['title'], pr['body'])
@@ -204,7 +211,7 @@ def make_release_notes(gh, repo, ref, cherry_picks, plaintext, html, markdown, v
             )
 
         authors = {}
-        if merges[number] == "merge_commit":
+        if commit:
             for c in repo.iter_commits(
                     "{sha1}^1..{sha1}^2".format(sha1=commit.hexsha)
                     ):
@@ -224,7 +231,7 @@ def make_release_notes(gh, repo, ref, cherry_picks, plaintext, html, markdown, v
         if authors:
             author = ", ".join(authors.keys())
         else:
-            if merges[number] == "merge_commit":
+            if commit:
                 author = commit.parents[-1].author.name
             else:
                 author = pr['user']['login']