Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Jun 2016 09:08:09 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org
Subject:   svn commit: r416920 - svnadmin/hooks/scripts
Message-ID:  <201606150908.u5F989IV082362@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Wed Jun 15 09:08:08 2016
New Revision: 416920
URL: https://svnweb.freebsd.org/changeset/ports/416920

Log:
  Sync all svnadmin hooks to prevent empty messages, and update with
  current commit hook template lines

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

Modified: svnadmin/hooks/scripts/log-police.py
==============================================================================
--- svnadmin/hooks/scripts/log-police.py	Wed Jun 15 09:05:01 2016	(r416919)
+++ svnadmin/hooks/scripts/log-police.py	Wed Jun 15 09:08:08 2016	(r416920)
@@ -46,14 +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 == "Relnotes:": continue
+    if line == "Differential Revision:": continue
     s = s + line + "\n"
   s = s.rstrip() + "\n"
   return s
@@ -65,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):



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606150908.u5F989IV082362>