Alexandre Julliard : testbot: Add In-Reply-To header on the TestBot replies.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: ad353ded45601dd3b42d8ccab2358f11e0deddea
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=ad353ded45601dd3b42d8ccab2358f11e0deddea

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Nov 15 12:01:53 2017 +0100

testbot: Add In-Reply-To header on the TestBot replies.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/bin/WineSendLog.pl         | 10 ++++++++++
 testbot/ddl/update27.sql           |  5 +++++
 testbot/ddl/winetestbot.sql        |  1 +
 testbot/lib/WineTestBot/Patches.pm |  6 ++++++
 4 files changed, 22 insertions(+)

diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index 922811d..e00c276 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -189,6 +189,11 @@ sub SendLog($)
     $Subject .= ": " . $Description;
   }
   print SENDMAIL "Subject: $Subject\n";
+  if ($Job->Patch->MessageId)
+  {
+    print SENDMAIL "In-Reply-To: ", $Job->Patch->MessageId, "\n";
+    print SENDMAIL "References: ", $Job->Patch->MessageId, "\n";
+  }
   print SENDMAIL <<"EOF";
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="==13F70BD1-BA1B-449A-9CCB-B6A8E90CED47=="
@@ -424,6 +429,11 @@ EOF
     print SENDMAIL "To: $To\n";
     print SENDMAIL "Cc: $WinePatchCc\n";
     print SENDMAIL "Subject: Re: ", $Job->Patch->Subject, "\n";
+    if ($Job->Patch->MessageId)
+    {
+      print SENDMAIL "In-Reply-To: ", $Job->Patch->MessageId, "\n";
+      print SENDMAIL "References: ", $Job->Patch->MessageId, "\n";
+    }
     print SENDMAIL <<"EOF";
 
 Hi,
diff --git a/testbot/ddl/update27.sql b/testbot/ddl/update27.sql
new file mode 100644
index 0000000..0dc2b89
--- /dev/null
+++ b/testbot/ddl/update27.sql
@@ -0,0 +1,5 @@
+USE winetestbot;
+
+ALTER TABLE Patches
+  ADD MessageId VARCHAR(256) NULL
+      AFTER Subject;
diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql
index 5e79bd3..f8d590f 100644
--- a/testbot/ddl/winetestbot.sql
+++ b/testbot/ddl/winetestbot.sql
@@ -70,6 +70,7 @@ CREATE TABLE Patches
   FromName    VARCHAR(40)     NULL,
   FromEMail   VARCHAR(40)     NULL,
   Subject     VARCHAR(120)    NULL,
+  MessageId   VARCHAR(256)    NULL,
   PRIMARY KEY (Id),
   INDEX PatchesWebPatchId (WebPatchId)
 )
diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm
index d5de05e..b5320dc 100644
--- a/testbot/lib/WineTestBot/Patches.pm
+++ b/testbot/lib/WineTestBot/Patches.pm
@@ -100,6 +100,11 @@ sub FromSubmission($$)
   my $PropertyDescriptor = $self->GetPropertyDescriptorByName("Subject");
   $self->Subject(substr($Subject, 0, $PropertyDescriptor->GetMaxLength()));
 
+  my $MessageId = $Head->get("Message-Id");
+  $MessageId =~ s/\s*\n\s*/ /gs;
+  $PropertyDescriptor = $self->GetPropertyDescriptorByName("MessageId");
+  $self->MessageId(substr($MessageId, 0, $PropertyDescriptor->GetMaxLength()));
+
   $self->Disposition("Processing");
 }
 
@@ -371,6 +376,7 @@ BEGIN
     CreateBasicPropertyDescriptor("FromName", "Author", !1, !1, "A", 40),
     CreateBasicPropertyDescriptor("FromEMail", "Author's email address", !1, !1, "A", 40),
     CreateBasicPropertyDescriptor("Subject", "Subject", !1, !1, "A", 120),
+    CreateBasicPropertyDescriptor("MessageId", "Message id", !1, !1, "A", 256),
     CreateBasicPropertyDescriptor("Disposition", "Disposition", !1, 1, "A", 40),
   );
 }