svn commit: r259078 - svnadmin/hooks

[Peter Wemm]

Author: peter
Date: Sat Dec  7 18:55:53 2013
New Revision: 259078
URL: http://svnweb.freebsd.org/changeset/base/259078

Log:
  Check for mergeinfo growth on stable/10+.

Modified:
  svnadmin/hooks/pre-commit

Modified: svnadmin/hooks/pre-commit
==============================================================================
--- svnadmin/hooks/pre-commit	Sat Dec  7 18:53:54 2013	(r259077)
+++ svnadmin/hooks/pre-commit	Sat Dec  7 18:55:53 2013	(r259078)
@@ -87,6 +87,9 @@ verify.py "$REPO" -t "$TXN" || exit 1
 # check for merge debris
 detect-merge-conflicts.sh "$REPO" "$TXN" || exit 1
 
+# stomp on mergeinfo bloat
+detect-mergeinfo-bloat.pl "$REPO" -t "$TXN" || exit 1
+
 # check for upper/lowercase filename conflicts on clients
 case-insensitive.py "$REPO" "$TXN" || exit 1
 
@@ -95,16 +98,3 @@ log-police.py -t "$TXN" "$REPO" || exit 
 
 # Nothing else, go ahead.
 exit 0
-
-
-# Make sure that the log message contains some text.
-SVNLOOK=/usr/local/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPO" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
-
-# Check that the author of this commit has the rights to perform
-# the commit on the files and directories being modified.
-commit-access-control.pl "$REPO" "$TXN" commit-access-control.cfg || exit 1
-
-# All checks passed, so allow the commit.
-exit 0