From owner-svn-ports-svnadmin@freebsd.org Wed Jun 15 09:08:09 2016 Return-Path: Delivered-To: svn-ports-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 F0AC5A13A71; Wed, 15 Jun 2016 09:08:09 +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 C29F31D94; Wed, 15 Jun 2016 09:08:09 +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 u5F989Qg082363; Wed, 15 Jun 2016 09:08:09 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5F989IV082362; Wed, 15 Jun 2016 09:08:09 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201606150908.u5F989IV082362@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:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r416920 - svnadmin/hooks/scripts X-SVN-Group: ports-svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2016 09:08:10 -0000 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): From owner-svn-ports-svnadmin@freebsd.org Sat Jun 18 10:44:37 2016 Return-Path: Delivered-To: svn-ports-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 DEE8DA782CE; Sat, 18 Jun 2016 10:44:37 +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 98A3E1A45; Sat, 18 Jun 2016 10:44:37 +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 u5IAia5e099587; Sat, 18 Jun 2016 10:44:36 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5IAia5S099586; Sat, 18 Jun 2016 10:44:36 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201606181044.u5IAia5S099586@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Sat, 18 Jun 2016 10:44:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r417059 - svnadmin/hooks/scripts X-SVN-Group: ports-svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jun 2016 10:44:38 -0000 Author: mat Date: Sat Jun 18 10:44:36 2016 New Revision: 417059 URL: https://svnweb.freebsd.org/changeset/ports/417059 Log: Tell people about make makepatch. Sponsored by: Absolight Modified: svnadmin/hooks/scripts/detect-filename.sh Modified: svnadmin/hooks/scripts/detect-filename.sh ============================================================================== --- svnadmin/hooks/scripts/detect-filename.sh Sat Jun 18 10:26:05 2016 (r417058) +++ svnadmin/hooks/scripts/detect-filename.sh Sat Jun 18 10:44:36 2016 (r417059) @@ -19,7 +19,8 @@ $SVNLOOK log -t "$TXN" "$REPO" | grep -q # We scan through the transaction diff, looking for files with colon in the name if $SVNLOOK changed -t "$TXN" "$REPO" | grep -q -E '^A.*:'; then echo "Some files in your commit have a colon (:) in the name" >&2 - echo "which is not allowed. Use __ instead of :: for patches ." >&2 + echo "which is not allowed. Use _ instead of : for patches." >&2 + echo "Or even better, generate your patches with make makepatch." >&2 echo "For further information please read:" >&2 echo "http://www.freebsd.org/doc/en/books/porters-handbook/slow-patch.html" >&2 echo "Please fix this and try committing again." >&2