addrev: Fix regression on parsing bare prnum; correct help output

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/79)

diff --git a/review-tools/addrev b/review-tools/addrev
index 1029b03bde3251fdd123b89da820422f1b4779ca..1518f0cc55f1ffefa87cdf78124644d65b67c3b0 100755 (executable)
--- a/review-tools/addrev
+++ b/review-tools/addrev
@@ -14,7 +14,10 @@ my $useself = 1;
 my $my_email;
 
 foreach (@ARGV) {
-    if (/^\@.+$/) {
+    if (/^(--prnum=)?(\d{1,6}+)$/) {
+        $args .= "--prnum=$2 ";
+       $haveprnum = 1;
+    } elsif (/^\@.+$/) {
         $args .= "--reviewer=$_ ";
     } elsif (/^\w[-\w]*$/) {
         if (/^[0-9a-f]{7,}+/) {
@@ -41,9 +44,6 @@ foreach (@ARGV) {
         $my_email = $1;
     } elsif (/^--nopr$/) {
        $haveprnum = 1;
-    } elsif (/^(--prnum=)?(\d+)$/) {
-        $args .= "--prnum=$2 ";
-       $haveprnum = 1;
     } elsif (/^--commit=(.+)$/) {
         $args .= "--commit=$1 ";
     } elsif (/^-(\d+)$/) {
@@ -117,8 +117,8 @@ HEAD^.. is assumed.
 
 Examples (all meaning the same thing):
 
-  addrev -2 steve levitte
-  addrev steve \@levitte HEAD^^..
-  addrev --reviewer=steve --reviewer=levitte\@openssl.org -2
+  addrev 12345 -2 steve levitte
+  addrev --prnum=12345 steve \@levitte HEAD^^..
+  addrev 12345 --reviewer=steve --reviewer=levitte\@openssl.org -2
 EOF
 }