Jeremy White : Add the In-Reply-To id to References.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 754130bc4af8d8f99e4a3e9285042fb5a7b7f5ce
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=754130bc4af8d8f99e4a3e92...

Author: Jeremy White 
Date:   Tue May  3 15:11:34 2022 -0500

Add the In-Reply-To id to References.

It does no harm, and may help some utilities such
as the winehq patch tracker to keep patches together.

Signed-off-by: Alexandre Julliard

---

gitlab/gitlab-to-mail/gitlabtomail.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py
index 6aa16be..15fa5dd 100755
--- a/gitlab/gitlab-to-mail/gitlabtomail.py
+++ b/gitlab/gitlab-to-mail/gitlabtomail.py
@@ -357,7 +357,7 @@ def process_commented_on(event):
     mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title)
     mail['Message-ID'] = create_message_id(mr_iid, mr_version, note_id=note_id)
     mail['In-Reply-To'] = create_message_id(mr_iid, mr_version)
-    mail['References'] = create_reference(mr_id, gitlab_hostname)
+    mail['References'] = create_reference(mr_id, gitlab_hostname) + " " + mail['In-Reply-To']
     mail['Date'] = email.utils.format_datetime(parse_gitlab_datetime(date))
     mail.set_payload(f"{body}\n\n-- \n{mr_url}")

@@ -388,7 +388,7 @@ def process_closed(event):
     mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title) + f" - {action_name}"
     mail['Message-ID'] = create_message_id(mr_iid, mr_version, event_id=event_id)
     mail['In-Reply-To'] = create_message_id(mr_iid, mr_version)
-    mail['References'] = create_reference(mr_id, gitlab_hostname)
+    mail['References'] = create_reference(mr_id, gitlab_hostname) + " " + mail['In-Reply-To']
     mail['Date'] = email.utils.format_datetime(parse_gitlab_datetime(date))
     mail.set_payload(f"\nThis merge request was {action_name} by {event['author']['name']}.\n-- \n{mr_url}")

@@ -620,7 +620,7 @@ def process_mr(mr, update_db):
             fixup_date(mail, date)
             fixup_version(mail, version)
             create_headers_from_mr(mail, mr)
-            mail['References'] = create_reference(mr['id'], gitlab_hostname)
+            mail['References'] = create_reference(mr['id'], gitlab_hostname) + " " + mail['In-Reply-To']
             log(f"MR{iid}v{version} - sent email")
             send_email(mail)
     if update_db: