svn commit: r48929 - svnadmin/hooks/scripts

[Mathieu Arnold]

Author: mat
Date: Wed Jun 15 09:08:52 2016
New Revision: 48929
URL: https://svnweb.freebsd.org/changeset/doc/48929

Log:
  Sync all svnadmin hooks to prevent empty messages, and update with
  current commit hook template lines
  
  Approved by:	doceng (implicit)
  Sponsored by:	Absolight

Modified:
  svnadmin/hooks/scripts/log-police.py

Modified: svnadmin/hooks/scripts/log-police.py
==============================================================================
--- svnadmin/hooks/scripts/log-police.py	Tue Jun 14 17:54:10 2016	(r48928)
+++ svnadmin/hooks/scripts/log-police.py	Wed Jun 15 09:08:52 2016	(r48929)
@@ -46,12 +46,18 @@ def fix_log_message(log_message):
     # should check last paragraph for known headers.
     if line == "PR:": continue
     if line == "Submitted by:": continue
+    if line == "Reported by:": continue
     if line == "Reviewed by:": continue
     if line == "Approved by:": continue
     if line == "Obtained from:": continue
     if line == "MFC after:": continue
+    if line == "MFH:": continue
+    if line == "Relnotes:": continue
     if line == "Security:": continue
+    if line == "Changes:": continue
+    if line == "With hat:": continue
     if line == "Sponsored by:": continue
+    if line == "Differential Revision:": continue
     s = s + line + "\n"
   s = s.rstrip() + "\n"
   return s
@@ -63,8 +69,14 @@ def fix_txn(fs, txn_name):
   log_message = svn.fs.svn_fs_txn_prop(txn, "svn:log")
   if log_message is not None:
     new_message = fix_log_message(log_message)
+    if new_message.strip() == "":
+      sys.stderr.write("Log message required\n")
+      sys.exit(1)
     if new_message != log_message:
       svn.fs.svn_fs_change_txn_prop(txn, "svn:log", new_message)
+  else:
+    sys.stderr.write("Log message required\n")
+    sys.exit(1)
 
 
 def fix_rev(fs, revnum):