Allow Release line to be added to all commits touched by addrev

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/web/pull/115)

diff --git a/HOWTO-make-a-release.md b/HOWTO-make-a-release.md
index d378a4b46e79c6d1f69c6e06dea22831db4175df..cf970502fb3b623b5032728bde7c380bd6167f3c 100644 (file)
--- a/HOWTO-make-a-release.md
+++ b/HOWTO-make-a-release.md
@@ -169,8 +169,8 @@ openssl-tools.git checkout directory):
 
     $TOOLS/release-tools/do-copyright-year
 
-Obtain approval for these commits from the reviewer and add the reviewed-by
-headers as required.
+Obtain approval for these commits from the reviewer and add the Release and
+Reviewed-By trailers as required.
 
 *Do* send the auto-generated commits to the reviewer and await their
 approval.

diff --git a/review-tools/addrev b/review-tools/addrev
index 8f28b024c92722fecc41a7e637d4cc13a1d814fc..5fe44259ffc30fac39b35682e8607495f111095a 100755 (executable)
--- a/review-tools/addrev
+++ b/review-tools/addrev
@@ -46,6 +46,8 @@ foreach (@ARGV) {
         $haveprnum = 1;
     } elsif (/^--commit=(.+)$/) {
         $args .= "--commit=$1 ";
+    } elsif (/^--release$/) {
+        $args .= "--release ";
     } elsif (/^-(\d+)$/) {
         print "Warning: overriding previous filter args $filterargs\n" if $filterargs ne "";
         $filterargs = "HEAD~$1..";

diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev
index d3cd3d12748e865d89ce764ecf25349315a7640c..8fee0ae577450ec3be2536921a1a19d131a3b99a 100755 (executable)
--- a/review-tools/gitaddrev
+++ b/review-tools/gitaddrev
@@ -20,6 +20,7 @@ my $found = 0;
 my $num = 0;
 my $refuse = 0;
 my $prnum = 0;
+my $release = 0;
 my $verbose = 0;
 my $WHAT = 'openssl';
 
@@ -109,6 +110,8 @@ foreach (@ARGV) {
         $WHAT = 'web';
     } elsif (/--tools$/) {
         $WHAT = 'tools'
+    } elsif (/^--release$/) {
+        $release = 1;
     }
 }
 
@@ -184,6 +187,11 @@ foreach (@commit_message) {
         $last_is_rev = 1;
         # Remove reviewers that are already in the message from our reviewer list
         @reviewers = grep { $_ ne $id } @reviewers;
+    } elsif (/^Release:\s*yes\s*$/i) {
+        if ($release == 1) {
+            # We are re-adding the release line below
+            next;
+        }
     }
     print $_,"\n";
 }
@@ -195,5 +203,9 @@ if ($rmrev == 0) {
     }
 }
 
+if ($release == 1) {
+    print "Release: yes\n";
+}
+
 print "(Merged from https://github.com/openssl/$WHAT/pull/$prnum)\n"
     if $prnum;