From owner-svn-doc-svnadmin@freebsd.org Wed Jun 15 09:08:54 2016 Return-Path: Delivered-To: svn-doc-svnadmin@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37177A13B16; Wed, 15 Jun 2016 09:08:54 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 083A81018; Wed, 15 Jun 2016 09:08:53 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5F98r9l082494; Wed, 15 Jun 2016 09:08:53 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5F98rsl082493; Wed, 15 Jun 2016 09:08:53 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201606150908.u5F98rsl082493@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 15 Jun 2016 09:08:53 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-svnadmin@freebsd.org Subject: svn commit: r48929 - svnadmin/hooks/scripts X-SVN-Group: doc-svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-svnadmin@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for svnadmin of the doc trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2016 09:08:54 -0000 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):