From owner-svn-src-svnadmin@FreeBSD.ORG Wed Dec 4 21:32:15 2013 Return-Path: Delivered-To: svn-src-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EDA796E6; Wed, 4 Dec 2013 21:32:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C063312CC; Wed, 4 Dec 2013 21:32:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB4LWF7Y095351; Wed, 4 Dec 2013 21:32:15 GMT (envelope-from roberto@svn.freebsd.org) Received: (from roberto@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB4LWFkH095350; Wed, 4 Dec 2013 21:32:15 GMT (envelope-from roberto@svn.freebsd.org) Message-Id: <201312042132.rB4LWFkH095350@svn.freebsd.org> From: Ollivier Robert Date: Wed, 4 Dec 2013 21:32:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r258944 - svnadmin/conf X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the admin / configuration tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2013 21:32:16 -0000 Author: roberto Date: Wed Dec 4 21:32:15 2013 New Revision: 258944 URL: http://svnweb.freebsd.org/changeset/base/258944 Log: Add my name for the ntpd vendor import. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf ============================================================================== --- svnadmin/conf/sizelimit.conf Wed Dec 4 21:17:39 2013 (r258943) +++ svnadmin/conf/sizelimit.conf Wed Dec 4 21:32:15 2013 (r258944) @@ -31,6 +31,7 @@ jeff kmacy lstewart obrien +roberto rpaulo rwatson sam From owner-svn-src-svnadmin@FreeBSD.ORG Sat Dec 7 13:11:50 2013 Return-Path: Delivered-To: svn-src-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B8B9FF83; Sat, 7 Dec 2013 13:11:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A54BB1DC4; Sat, 7 Dec 2013 13:11:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7DBo8X063703; Sat, 7 Dec 2013 13:11:50 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7DBoJB063702; Sat, 7 Dec 2013 13:11:50 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312071311.rB7DBoJB063702@svn.freebsd.org> From: Glen Barber Date: Sat, 7 Dec 2013 13:11:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r259070 - svnadmin/conf X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the admin / configuration tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 13:11:50 -0000 Author: gjb Date: Sat Dec 7 13:11:50 2013 New Revision: 259070 URL: http://svnweb.freebsd.org/changeset/base/259070 Log: Require re@ approval for commits to releng/10.0 for the duration of the 10.0-RELEASE cycle. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: svnadmin/conf/approvers Modified: svnadmin/conf/approvers ============================================================================== --- svnadmin/conf/approvers Sat Dec 7 13:06:14 2013 (r259069) +++ svnadmin/conf/approvers Sat Dec 7 13:11:50 2013 (r259070) @@ -21,6 +21,7 @@ #^stable/9/ re #^stable/8/ re #^stable/7/ re +^releng/10.0/ re ^releng/9.[0-2]/ (security-officer|so) ^releng/8.[0-4]/ (security-officer|so) ^releng/7.[0-4]/ (security-officer|so) From owner-svn-src-svnadmin@FreeBSD.ORG Sat Dec 7 18:27:22 2013 Return-Path: Delivered-To: svn-src-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 89EE4626; Sat, 7 Dec 2013 18:27:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 75B9610EF; Sat, 7 Dec 2013 18:27:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7IRMwB071139; Sat, 7 Dec 2013 18:27:22 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7IRMqq071138; Sat, 7 Dec 2013 18:27:22 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201312071827.rB7IRMqq071138@svn.freebsd.org> From: Peter Wemm Date: Sat, 7 Dec 2013 18:27:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r259074 - svnadmin/hooks/scripts X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the admin / configuration tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 18:27:22 -0000 Author: peter Date: Sat Dec 7 18:27:21 2013 New Revision: 259074 URL: http://svnweb.freebsd.org/changeset/base/259074 Log: Add initial version of mergeinfo bloat detection script Added: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl (contents, props changed) Added: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl Sat Dec 7 18:27:21 2013 (r259074) @@ -0,0 +1,198 @@ +#!/usr/bin/env perl + + +# $FreeBSD$ +# source: http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/check-mime-type.pl +# + +# ==================================================================== +# commit-mime-type-check.pl: check that every added file has the +# svn:mime-type property set and every added file with a mime-type +# matching text/* also has svn:eol-style set. If any file fails this +# test the user is sent a verbose error message suggesting solutions and +# the commit is aborted. +# +# Usage: commit-mime-type-check.pl REPOS TXN-NAME +# ==================================================================== +# Most of commit-mime-type-check.pl was taken from +# commit-access-control.pl, Revision 9986, 2004-06-14 16:29:22 -0400. +# ==================================================================== +# Copyright (c) 2000-2004 CollabNet. All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://subversion.tigris.org/license.html. +# If newer versions of this license are posted there, you may use a +# newer version instead, at your option. +# +# This software consists of voluntary contributions made by many +# individuals. For exact contribution history, see the revision +# history and logs, available at http://subversion.tigris.org/. +# ==================================================================== + +require warnings; +import warnings; + +use strict; +use Carp; +use feature qw(switch); # be 5.10 or later, or else! + +###################################################################### +# Configuration section. + +# Svnlook path. +my $svnlook = "/usr/bin/svnlook"; + +# Since the path to svnlook depends upon the local installation +# preferences, check that the required program exists to insure that +# the administrator has set up the script properly. +{ + my $ok = 1; + foreach my $program ($svnlook) { + if (-e $program) { + unless (-x $program) { + warn "$0: required program `$program' is not executable, edit $0.\n"; + $ok = 0; + } + } else { + warn "$0: required program `$program' does not exist, edit $0.\n"; + $ok = 0; + } + } + exit 1 unless $ok; +} + +###################################################################### +# Initial setup/command-line handling. + +&usage unless @ARGV == 2; + +my $repos = shift; +my $txn = shift; + +unless (-e $repos) { + &usage("$0: repository directory `$repos' does not exist."); +} +unless (-d $repos) { + &usage("$0: repository directory `$repos' is not a directory."); +} + + +###################################################################### +# Harvest data using svnlook. + +# Change into /tmp so that svnlook diff can create its .svnlook +# directory. +my $tmp_dir = '/tmp'; +chdir($tmp_dir) + or die "$0: cannot chdir `$tmp_dir': $!\n"; + + +#see rev 257353. We're trying to allow modifications but prevent new stuff. +#Property changes on: stable/10/etc +#___________________________________________________________________ +#Modified: svn:mergeinfo +# +#Property changes on: stable/10/share/man/man7 +#___________________________________________________________________ +#Added: svn:mergeinfo + +my $state = 0; +my $path; +my @errors; +foreach my $line (&read_from_process($svnlook, 'diff', $repos, '-r', $txn)) { + #printf "line: %s, current state %d\n", $line, $state; + if ($state == 0 && $line =~ /^Property changes on: (.*)$/) { + $path = $1; + given ($path) { + when (/stable\/([0-9]+)/) { if ($1 >= 10) { $state = 1; } else { $state = 0; } } + default { $state = 0; } + } + #printf "path: %s, state %d\n", $path, $state; + next; + } + if ($state == 1) { + if ($line =~ /^___________/) { $state = 2; } else { $state = 0; } + #print "state 1 -> 2\n"; + next; + } + if ($state == 2) { + given ($line) { + when (/^Added: svn:mergeinfo/) { + push @errors, "$path : svn:merginfo added at somewhere other than root"; + } + when (/^================/) { $state = 0; } + } + } +} + +# If there are any errors list the problem files and give information +# on how to avoid the problem. Hopefully people will set up auto-props +# and will not see this verbose message more than once. +if (@errors) { + warn "$0:\n\n", join("\n", @errors), "\n\n", <&STDOUT") || die "$0: cannot dup STDOUT: $!\n"; + exec(@_) || die "$0: cannot exec `@_': $!\n"; + } + my @output; + while () { + chomp; + push(@output, $_); + } + close(SAFE_READ); + my $result = $?; + my $exit = $result >> 8; + my $signal = $result & 127; + my $cd = $result & 128 ? "with core dump" : ""; + if ($signal or $cd) { + warn "$0: pipe from `@_' failed $cd: exit=$exit signal=$signal\n"; + } + if (wantarray) { + return ($result, @output); + } else { + return $result; + } +} + +sub read_from_process +{ + unless (@_) { + croak "$0: read_from_process passed no arguments.\n"; + } + my ($status, @output) = &safe_read_from_pipe(@_); + if ($status) { + if (@output) { + die "$0: `@_' failed with this output:\n", join("\n", @output), "\n"; + } else { + die "$0: `@_' failed with no output.\n"; + } + } else { + return @output; + } +} From owner-svn-src-svnadmin@FreeBSD.ORG Sat Dec 7 18:46:26 2013 Return-Path: Delivered-To: svn-src-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1B2C8B26; Sat, 7 Dec 2013 18:46:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E194611E2; Sat, 7 Dec 2013 18:46:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7IkP3K077771; Sat, 7 Dec 2013 18:46:25 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7IkPDR077770; Sat, 7 Dec 2013 18:46:25 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201312071846.rB7IkPDR077770@svn.freebsd.org> From: Peter Wemm Date: Sat, 7 Dec 2013 18:46:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r259075 - svnadmin/hooks/scripts X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the admin / configuration tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 18:46:26 -0000 Author: peter Date: Sat Dec 7 18:46:25 2013 New Revision: 259075 URL: http://svnweb.freebsd.org/changeset/base/259075 Log: Add a -t / -r mode so it can be run on either a proto-txn or an existing rev for testing. Update explanation text. Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl ============================================================================== --- svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl Sat Dec 7 18:27:21 2013 (r259074) +++ svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl Sat Dec 7 18:46:25 2013 (r259075) @@ -65,9 +65,10 @@ my $svnlook = "/usr/bin/svnlook"; ###################################################################### # Initial setup/command-line handling. -&usage unless @ARGV == 2; +&usage unless @ARGV == 3; my $repos = shift; +my $mode = shift; my $txn = shift; unless (-e $repos) { @@ -100,12 +101,12 @@ chdir($tmp_dir) my $state = 0; my $path; my @errors; -foreach my $line (&read_from_process($svnlook, 'diff', $repos, '-r', $txn)) { +foreach my $line (&read_from_process($svnlook, 'diff', $repos, $mode, $txn)) { #printf "line: %s, current state %d\n", $line, $state; if ($state == 0 && $line =~ /^Property changes on: (.*)$/) { $path = $1; given ($path) { - when (/stable\/([0-9]+)/) { if ($1 >= 10) { $state = 1; } else { $state = 0; } } + when (/stable\/([0-9]+)\//) { if ($1 >= 10) { $state = 1; } else { $state = 0; } } default { $state = 0; } } #printf "path: %s, state %d\n", $path, $state; @@ -119,7 +120,7 @@ foreach my $line (&read_from_process($sv if ($state == 2) { given ($line) { when (/^Added: svn:mergeinfo/) { - push @errors, "$path : svn:merginfo added at somewhere other than root"; + push @errors, "$path : svn:merginfo ADDED"; } when (/^================/) { $state = 0; } } @@ -131,9 +132,16 @@ foreach my $line (&read_from_process($sv # and will not see this verbose message more than once. if (@errors) { warn "$0:\n\n", join("\n", @errors), "\n\n", < Delivered-To: svn-src-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E4C3C6A; Sat, 7 Dec 2013 18:48:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2B03411F8; Sat, 7 Dec 2013 18:48:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7ImSOQ078056; Sat, 7 Dec 2013 18:48:28 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7ImSQU078055; Sat, 7 Dec 2013 18:48:28 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201312071848.rB7ImSQU078055@svn.freebsd.org> From: Peter Wemm Date: Sat, 7 Dec 2013 18:48:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r259076 - svnadmin/hooks/scripts X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the admin / configuration tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 18:48:28 -0000 Author: peter Date: Sat Dec 7 18:48:27 2013 New Revision: 259076 URL: http://svnweb.freebsd.org/changeset/base/259076 Log: oops. svn.freebsd.org uses ports svn due to API bindings. Update path. Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl ============================================================================== --- svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl Sat Dec 7 18:46:25 2013 (r259075) +++ svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl Sat Dec 7 18:48:27 2013 (r259076) @@ -41,7 +41,7 @@ use feature qw(switch); # be 5.10 or la # Configuration section. # Svnlook path. -my $svnlook = "/usr/bin/svnlook"; +my $svnlook = "/usr/local/bin/svnlook"; # Since the path to svnlook depends upon the local installation # preferences, check that the required program exists to insure that From owner-svn-src-svnadmin@FreeBSD.ORG Sat Dec 7 18:53:55 2013 Return-Path: Delivered-To: svn-src-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2FEE9DB7; Sat, 7 Dec 2013 18:53:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1C79A1235; Sat, 7 Dec 2013 18:53:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7Irs5K080766; Sat, 7 Dec 2013 18:53:54 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7Irspf080765; Sat, 7 Dec 2013 18:53:54 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201312071853.rB7Irspf080765@svn.freebsd.org> From: Peter Wemm Date: Sat, 7 Dec 2013 18:53:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r259077 - svnadmin/hooks/scripts X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the admin / configuration tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 18:53:55 -0000 Author: peter Date: Sat Dec 7 18:53:54 2013 New Revision: 259077 URL: http://svnweb.freebsd.org/changeset/base/259077 Log: We set $PATH explicitly for our commit scripts. Don't try to second guess it. Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl ============================================================================== --- svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl Sat Dec 7 18:48:27 2013 (r259076) +++ svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl Sat Dec 7 18:53:54 2013 (r259077) @@ -40,28 +40,6 @@ use feature qw(switch); # be 5.10 or la ###################################################################### # Configuration section. -# Svnlook path. -my $svnlook = "/usr/local/bin/svnlook"; - -# Since the path to svnlook depends upon the local installation -# preferences, check that the required program exists to insure that -# the administrator has set up the script properly. -{ - my $ok = 1; - foreach my $program ($svnlook) { - if (-e $program) { - unless (-x $program) { - warn "$0: required program `$program' is not executable, edit $0.\n"; - $ok = 0; - } - } else { - warn "$0: required program `$program' does not exist, edit $0.\n"; - $ok = 0; - } - } - exit 1 unless $ok; -} - ###################################################################### # Initial setup/command-line handling. @@ -101,7 +79,7 @@ chdir($tmp_dir) my $state = 0; my $path; my @errors; -foreach my $line (&read_from_process($svnlook, 'diff', $repos, $mode, $txn)) { +foreach my $line (&read_from_process('svnlook', 'diff', $repos, $mode, $txn)) { #printf "line: %s, current state %d\n", $line, $state; if ($state == 0 && $line =~ /^Property changes on: (.*)$/) { $path = $1; From owner-svn-src-svnadmin@FreeBSD.ORG Sat Dec 7 18:55:54 2013 Return-Path: Delivered-To: svn-src-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 21BF6EEB; Sat, 7 Dec 2013 18:55:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0EAAA1240; Sat, 7 Dec 2013 18:55:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7ItrFc081096; Sat, 7 Dec 2013 18:55:53 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7ItrDL081095; Sat, 7 Dec 2013 18:55:53 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201312071855.rB7ItrDL081095@svn.freebsd.org> From: Peter Wemm Date: Sat, 7 Dec 2013 18:55:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r259078 - svnadmin/hooks X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the admin / configuration tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 18:55:54 -0000 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