You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/08/10 19:03:37 UTC
svn commit: r984122 [39/40] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/ac-macros/ build/generator/ build/generator/swig/
build/generator/templates/ build/generator/util/ build/hudson/
build/hudson/jobs/ build/hudson/jobs/subversion-1.6...
Modified: subversion/branches/ignore-mergeinfo/tools/dist/download-release.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dist/download-release.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dist/download-release.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/dist/download-release.sh Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/bin/bash
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
BASEURL=$1
VERSION=$2
wget -nc $BASEURL/{{md5,sha1}sums,svn_version.h.dist,subversion{-deps,}-$VERSION.{{zip,tar.bz2}{.asc,},tar.gz.asc}}
Modified: subversion/branches/ignore-mergeinfo/tools/dist/extract-for-examination.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dist/extract-for-examination.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dist/extract-for-examination.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/dist/extract-for-examination.sh Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/bin/sh
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
for i in *.tar.bz2; do
base=${i%.tar.bz2}-tar-bz2
Modified: subversion/branches/ignore-mergeinfo/tools/dist/gen_nightly_ann.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dist/gen_nightly_ann.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dist/gen_nightly_ann.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dist/gen_nightly_ann.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/usr/bin/env python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
webpagetext = '''<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
Modified: subversion/branches/ignore-mergeinfo/tools/dist/getsigs.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dist/getsigs.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dist/getsigs.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dist/getsigs.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/usr/bin/env python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# Less terrible, ugly hack of a script than getsigs.pl, but similar. Used to
# verify the signatures on the release tarballs and produce the list of who
Modified: subversion/branches/ignore-mergeinfo/tools/dist/nightly.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dist/nightly.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dist/nightly.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/dist/nightly.sh Tue Aug 10 17:03:06 2010
@@ -1,24 +1,41 @@
#!/bin/sh
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
set -e
-repo=http://svn.collab.net/repos/svn
+repo=http://svn.apache.org/repos/asf/subversion
+svn=svn
-# Get the latest versions of the rolling scripts
-svn export $repo/trunk/tools/dist/construct-rolling-environment.sh
-svn export $repo/trunk/tools/dist/roll.sh
-svn export $repo/trunk/tools/dist/dist.sh
-svn export $repo/trunk/tools/dist/gen_nightly_ann.py
-
-while getopts "cd:t:" flag; do
+# Parse our arguments
+while getopts "cd:t:s:" flag; do
case $flag in
d) dir="$OPTARG" ;;
c) clean="1" ;;
t) target="$OPTARG" ;;
+ s) svn="$OPTARG" ;;
esac
done
# Setup directories
-if [ -n "$dir" ]; then cd $dir; fi
+if [ -n "$dir" ]; then cd $dir; else dir="."; fi
if [ -d "roll" ]; then rm -rf roll; fi
mkdir roll
if [ ! -n "$target" ]; then
@@ -26,8 +43,16 @@ if [ ! -n "$target" ]; then
target="target"
fi
+abscwd=`cd $dir; pwd`
+
echo "Will place results in: $target"
+# Get the latest versions of the rolling scripts
+$svn export $repo/trunk/tools/dist/construct-rolling-environment.sh $dir
+$svn export $repo/trunk/tools/dist/roll.sh $dir
+$svn export $repo/trunk/tools/dist/dist.sh $dir
+$svn export $repo/trunk/tools/dist/gen_nightly_ann.py $dir
+
# Create the environment
cd roll
echo '----------------building environment------------------'
@@ -40,8 +65,8 @@ fi
# Roll the tarballs
echo '-------------------rolling tarball--------------------'
-head=`svn info $repo/trunk | grep '^Revision' | cut -d ' ' -f 2`
-`dirname $0`/roll.sh trunk $head "-nightly"
+head=`$svn info $repo/trunk | grep '^Revision' | cut -d ' ' -f 2`
+${abscwd}/roll.sh trunk $head "-nightly"
cd ..
# Create the information page
Modified: subversion/branches/ignore-mergeinfo/tools/dist/post-to-tigris.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dist/post-to-tigris.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dist/post-to-tigris.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dist/post-to-tigris.py Tue Aug 10 17:03:06 2010
@@ -1,11 +1,31 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# Creates entries on the tigris file manager for a release, using the
# contents of:
# md5sums
#
# Note: this file is not guaranteed to work with Python 3. In fact, it
-# probably doesn't. Since the RM is really the only guy who uses and
+# probably doesn't. Since the RM is really the only guy who uses and
# develops this script, and he currently has Python 2.x, let's forgo worrying
# about Python 3 compatibility until it becomes a real problem. It makes
# the script simpler to develop and maintain. -hkw
Modified: subversion/branches/ignore-mergeinfo/tools/dist/roll.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dist/roll.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dist/roll.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/dist/roll.sh Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/bin/sh
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
set -e
VERSION=$1
@@ -10,7 +30,7 @@ else
BRANCH=trunk
fi
-rs=http://svn.collab.net/repos/svn
+rs=http://svn.apache.org/repos/asf/subversion
if [ "$VERSION" != "trunk" ]; then
if [ -n "`svn diff --summarize $rs/branches/$BRANCH/CHANGES@$REV $rs/trunk/CHANGES@$REV | grep ^M`" ]; then
Modified: subversion/branches/ignore-mergeinfo/tools/dist/sample-rc-warning-index.html
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dist/sample-rc-warning-index.html?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dist/sample-rc-warning-index.html (original)
+++ subversion/branches/ignore-mergeinfo/tools/dist/sample-rc-warning-index.html Tue Aug 10 17:03:06 2010
@@ -1,3 +1,24 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
Modified: subversion/branches/ignore-mergeinfo/tools/dist/test.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dist/test.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dist/test.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/dist/test.sh Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/bin/sh
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
set -e
[ -e $HOME/.svndistrc ] && . $HOME/.svndistrc
Modified: subversion/branches/ignore-mergeinfo/tools/dist/write-announcement.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dist/write-announcement.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dist/write-announcement.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dist/write-announcement.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/usr/bin/python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# Creates release announcement text using the contents of:
# md5sums
Modified: subversion/branches/ignore-mergeinfo/tools/examples/SvnCLBrowse
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/SvnCLBrowse?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/SvnCLBrowse (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/SvnCLBrowse Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
# SvnCLBrowse -- graphical Subversion changelist browser
#
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/examples/blame.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/blame.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/blame.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/blame.py Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# USAGE: blame.py [-r REV] repos-path file
#
Modified: subversion/branches/ignore-mergeinfo/tools/examples/check-modified.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/check-modified.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/check-modified.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/check-modified.py Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# USAGE: check-modified.py FILE_OR_DIR1 FILE_OR_DIR2 ...
#
# prints out the URL associated with each item
Modified: subversion/branches/ignore-mergeinfo/tools/examples/dumpprops.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/dumpprops.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/dumpprops.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/dumpprops.py Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# USAGE: dumprops.py [-r REV] repos-path [file]
#
# dump out the properties on a given path (recursively if given a dir)
Modified: subversion/branches/ignore-mergeinfo/tools/examples/get-location-segments.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/get-location-segments.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/get-location-segments.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/get-location-segments.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/usr/bin/env python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
import sys
import os
from svn import client, ra, core
Modified: subversion/branches/ignore-mergeinfo/tools/examples/getfile.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/getfile.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/getfile.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/getfile.py Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# USAGE: getfile.py [-r REV] repos-path file
#
# gets a file from an SVN repository, puts it to sys.stdout
Modified: subversion/branches/ignore-mergeinfo/tools/examples/getlocks_test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/getlocks_test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/getlocks_test.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/getlocks_test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* getlocks_test.c : show all repository locks living below a URL
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/examples/geturl.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/geturl.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/geturl.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/geturl.py Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# USAGE: geturl.py FILE_OR_DIR1 FILE_OR_DIR2 ...
#
# prints out the URL associated with each item
Modified: subversion/branches/ignore-mergeinfo/tools/examples/headrev.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/headrev.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/headrev.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/headrev.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* headrev.c : print out the HEAD revision of a repository.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/examples/minimal_client.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/minimal_client.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/minimal_client.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/minimal_client.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* minimal_client.c - a minimal Subversion client application ("hello world")
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/examples/putfile.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/putfile.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/putfile.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/putfile.py Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# USAGE: putfile.py [-m commitmsg] [-u username] file repos-path
#
# put a file into an SVN repository
Modified: subversion/branches/ignore-mergeinfo/tools/examples/revplist.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/revplist.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/revplist.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/revplist.py Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
# revplist.py : display revision properties
#
######################################################################
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/examples/svnlook.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/svnlook.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/svnlook.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/svnlook.py Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
# svnlook.py : a Python-based replacement for svnlook
#
######################################################################
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/examples/svnlook.rb
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/svnlook.rb?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/svnlook.rb (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/svnlook.rb Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
# svnlook.rb : a Ruby-based replacement for svnlook
#
######################################################################
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/examples/svnput.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/svnput.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/svnput.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/svnput.c Tue Aug 10 17:03:06 2010
@@ -15,10 +15,10 @@
* ***************************************************************
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/examples/svnserve-sgid.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/svnserve-sgid.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/svnserve-sgid.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/svnserve-sgid.c Tue Aug 10 17:03:06 2010
@@ -1,4 +1,25 @@
/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+/*
* Wrapper to run the svnserve process setgid.
* The idea is to avoid the problem that some interpreters like bash
* invoked by svnserve in hook scripts will reset the effective gid to
Modified: subversion/branches/ignore-mergeinfo/tools/examples/svnshell.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/svnshell.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/svnshell.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/svnshell.py Tue Aug 10 17:03:06 2010
@@ -4,10 +4,10 @@
# the filesystem.
#
######################################################################
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/examples/svnshell.rb
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/svnshell.rb?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/svnshell.rb (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/svnshell.rb Tue Aug 10 17:03:06 2010
@@ -11,10 +11,10 @@
# for details on how to install readline for Ruby.
#
######################################################################
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/examples/testwrite.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/examples/testwrite.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/examples/testwrite.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/examples/testwrite.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* testwrite.c : test whether a user has commit access.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/hook-scripts/commit-access-control.pl.in
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/commit-access-control.pl.in?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/hook-scripts/commit-access-control.pl.in (original)
+++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/commit-access-control.pl.in Tue Aug 10 17:03:06 2010
@@ -14,10 +14,10 @@
# Usage: commit-access-control.pl REPOS TXN-NAME CONF_FILE
#
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/hook-scripts/log-police.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/log-police.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/hook-scripts/log-police.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/log-police.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/usr/bin/env python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# log-police.py: Ensure that log messages end with a single newline.
# See usage() function for details, or just run with no arguments.
Modified: subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.conf.example
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.conf.example?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.conf.example (original)
+++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.conf.example Tue Aug 10 17:03:06 2010
@@ -35,15 +35,16 @@
# Any sections other than [general], [defaults], [maps] and sections
# referred to within [maps] are considered to be user-defined groups
# which override values in the [defaults] section.
-# These groups are selected using the following two options:
+# These groups are selected using the following three options:
#
# for_repos
# for_paths
+# search_logmsg
#
-# Both options specify a regular expression. The former is matched against
-# the absolute path to the repository the mailer is operating against. The
-# second is matched against *every* path (files and dirs) that was modified
-# during the commit.
+# Each option specifies a regular expression. for_repos is matched
+# against the absolute path to the repository the mailer is operating
+# against. for_paths is matched against *every* path (files and
+# dirs) that was modified during the commit.
#
# The options specified in the [defaults] section are always selected. The
# presence of a non-matching for_repos has no relevance. Note that you may
@@ -62,6 +63,14 @@
# none of the paths, even though its for_paths would have selected some of
# the paths in the commit.
#
+# search_logmsg specifies a regular expression to match against the
+# log message. If the regular expression does not match the log
+# message, the group is not matched; if the regular expression matches
+# once, the group is used. If there are multiple matches, each
+# successful match generates another group-match (this is useful if
+# "named groups" are used). If search_logmsg is not used, no log
+# message filtering is performed.
+#
# Groups are matched in no particular order. Do not depend upon their
# order within this configuration file. The values from [defaults] will
# be used if no group is matched or an option in a group does not override
@@ -111,6 +120,20 @@
# If none of the groups match, but a for_paths is present in [defaults],
# then its extracted names will be available.
#
+# Further suppose you want to match bug-ids in log messages:
+#
+# search_logmsg = (?P<bugid>(ProjA|ProjB)#\d)
+#
+# The bugids would be of the form ProjA#123 and ProjB#456. In this
+# case, each time the regular expression matches, another match group
+# will be generated. Thus, if you use:
+#
+# commit_subject_prefix = %(bugid)s:
+#
+# Then, a log message such as "Fixes ProjA#123 and ProjB#234" would
+# match both bug-ids, and two emails would be generated - one with
+# subject "ProjA#123: <...>" and "ProjB#234: <...>".
+#
# Note that each unique set of names for substitution will generate an
# email. In the above example, if a commit modified files in all three
# client subdirectories, then an email will be sent to all three commits@
@@ -329,3 +352,10 @@ show_nonmatching_paths = yes
# for_repos = /home/(?P<who>[^/]*)/repos
# to_addr = %(who)s@example.com
#
+# [issuetracker]
+# search_logmsg = (?P<bugid>(?P<project>projecta|projectb|projectc)#\d+)
+# # (or, use a mapping if the bug-id to email address is not this trivial)
+# to_addr = %(project)s-tracker@example.com
+# commit_subject_prefix = %(bugid)s:
+# propchange_subject_prefix = %(bugid)s:
+
Modified: subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.py Tue Aug 10 17:03:06 2010
@@ -1,6 +1,25 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# mailer.py: send email describing a commit
#
# $HeadURL$
@@ -328,10 +347,12 @@ class Commit(Messenger):
self.changelist = sorted(editor.get_changes().items())
+ log = repos.get_rev_prop(svn.core.SVN_PROP_REVISION_LOG) or ''
+
# collect the set of groups and the unique sets of params for the options
self.groups = { }
for path, change in self.changelist:
- for (group, params) in self.cfg.which_groups(path):
+ for (group, params) in self.cfg.which_groups(path, log):
# turn the params into a hashable object and stash it away
param_list = sorted(params.items())
# collect the set of paths belonging to this group
@@ -402,7 +423,7 @@ class PropChange(Messenger):
# collect the set of groups and the unique sets of params for the options
self.groups = { }
- for (group, params) in self.cfg.which_groups(''):
+ for (group, params) in self.cfg.which_groups('', None):
# turn the params into a hashable object and stash it away
param_list = sorted(params.items())
self.groups[group, tuple(param_list)] = params
@@ -492,7 +513,7 @@ class Lock(Messenger):
# collect the set of groups and the unique sets of params for the options
self.groups = { }
for path in self.dirlist:
- for (group, params) in self.cfg.which_groups(path):
+ for (group, params) in self.cfg.which_groups(path, None):
# turn the params into a hashable object and stash it away
param_list = sorted(params.items())
# collect the set of paths belonging to this group
@@ -1243,32 +1264,56 @@ class Config:
else:
exclude_paths_re = None
- self._group_re.append((group, re.compile(for_paths),
- exclude_paths_re, params))
+ # check search_logmsg re
+ search_logmsg = getattr(sub, 'search_logmsg', None)
+ if search_logmsg is not None:
+ search_logmsg_re = re.compile(search_logmsg)
+ else:
+ search_logmsg_re = None
+
+ self._group_re.append((group,
+ re.compile(for_paths),
+ exclude_paths_re,
+ params,
+ search_logmsg_re))
# after all the groups are done, add in the default group
try:
self._group_re.append((None,
re.compile(self.defaults.for_paths),
None,
- self._default_params))
+ self._default_params,
+ None))
except AttributeError:
# there is no self.defaults.for_paths
pass
- def which_groups(self, path):
+ def which_groups(self, path, logmsg):
"Return the path's associated groups."
groups = []
- for group, pattern, exclude_pattern, repos_params in self._group_re:
+ for group, pattern, exclude_pattern, repos_params, search_logmsg_re in self._group_re:
match = pattern.match(path)
if match:
if exclude_pattern and exclude_pattern.match(path):
continue
params = repos_params.copy()
params.update(match.groupdict())
- groups.append((group, params))
+
+ if search_logmsg_re is None:
+ groups.append((group, params))
+ else:
+ if logmsg is None:
+ logmsg = ''
+
+ for match in search_logmsg_re.finditer(logmsg):
+ # Add captured variables to (a copy of) params
+ msg_params = params.copy()
+ msg_params.update(match.groupdict())
+ groups.append((group, msg_params))
+
if not groups:
groups.append((None, self._default_params))
+
return groups
Modified: subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-init.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-init.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-init.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-init.sh Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/bin/sh
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# mailer-init.sh: create and initialize a repository for the mailer tests
#
# USAGE: ./mailer-init.sh
@@ -36,7 +56,7 @@ svn ps svn:new_svn_prop val file2
svn ps prop1 propval1 file2
svn ps prop3 propval3 dir1
echo change C2 >> dir2/file5
-svn commit -m "two file changes"
+svn commit -m "two file changes. Fixes Blah#123"
# copy a file and a dir and change property
svn cp file1 dir2/file7
@@ -64,7 +84,7 @@ echo file9 > file9
svn add file9
svn mkdir dir4
echo change C4 >> dir1/file3
-svn commit -m "mixed addition and change"
+svn commit -m "mixed addition and change. Fixes Blaz#456 Blah#987"
# add a file, add a dir, delete a file, delete a dir, and make a change
echo file10 > dir1/file10
Modified: subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-t1.output
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-t1.output?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-t1.output (original)
+++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-t1.output Tue Aug 10 17:03:06 2010
@@ -152,24 +152,29 @@ Added: file2
+++ file2 Sun Sep 9 01:46:40 2001 (r1)
@@ -0,0 +1 @@
+file2
-Group: file plus other areas
-Subject: r2 - dir1 dir2
+Group: bugtracker
+Subject: Fix for Blah#123: r2 - dir1 dir2
Author: mailer test
Date: Sun Sep 9 04:33:20 2001
New Revision: 2
Log:
-two file changes
+two file changes. Fixes Blah#123
Modified:
+ dir1/ (props changed)
+ dir2/file5
file1 (props changed)
file2 (contents, props changed)
-Changes in other areas also in this revision:
-Modified:
- dir1/ (props changed)
- dir2/file5
+Modified: dir2/file5
+==============================================================================
+--- dir2/file5 Sun Sep 9 01:46:40 2001 (r1)
++++ dir2/file5 Sun Sep 9 04:33:20 2001 (r2)
+@@ -1 +1,2 @@
+ file5
++change C2
Modified: file2
==============================================================================
@@ -178,16 +183,6 @@ Modified: file2
@@ -1 +1,2 @@
file2
+change C1
-
-Diffs of changes in other areas also in this revision:
-
-Modified: dir2/file5
-==============================================================================
---- dir2/file5 Sun Sep 9 01:46:40 2001 (r1)
-+++ dir2/file5 Sun Sep 9 04:33:20 2001 (r2)
-@@ -1 +1,2 @@
- file5
-+change C2
Group: All
Subject: r2 - dir1 dir2
@@ -196,7 +191,7 @@ Date: Sun Sep 9 04:33:20 2001
New Revision: 2
Log:
-two file changes
+two file changes. Fixes Blah#123
Modified:
dir1/ (props changed)
@@ -219,6 +214,42 @@ Modified: file2
@@ -1 +1,2 @@
file2
+change C1
+Group: file plus other areas
+Subject: r2 - dir1 dir2
+
+Author: mailer test
+Date: Sun Sep 9 04:33:20 2001
+New Revision: 2
+
+Log:
+two file changes. Fixes Blah#123
+
+Modified:
+ file1 (props changed)
+ file2 (contents, props changed)
+
+Changes in other areas also in this revision:
+Modified:
+ dir1/ (props changed)
+ dir2/file5
+
+Modified: file2
+==============================================================================
+--- file2 Sun Sep 9 01:46:40 2001 (r1)
++++ file2 Sun Sep 9 04:33:20 2001 (r2)
+@@ -1 +1,2 @@
+ file2
++change C1
+
+Diffs of changes in other areas also in this revision:
+
+Modified: dir2/file5
+==============================================================================
+--- dir2/file5 Sun Sep 9 01:46:40 2001 (r1)
++++ dir2/file5 Sun Sep 9 04:33:20 2001 (r2)
+@@ -1 +1,2 @@
+ file5
++change C2
Group: file
Subject: r2 - dir1 dir2
@@ -227,7 +258,7 @@ Date: Sun Sep 9 04:33:20 2001
New Revision: 2
Log:
-two file changes
+two file changes. Fixes Blah#123
Modified:
file1 (props changed)
@@ -326,6 +357,25 @@ changes and deletes of properties
Modified:
file2 (props changed)
+Group: file
+Subject: r6 - dir1 dir4
+
+Author: mailer test
+Date: Sun Sep 9 15:40:00 2001
+New Revision: 6
+
+Log:
+mixed addition and change. Fixes Blaz#456 Blah#987
+
+Added:
+ file9
+
+Added: file9
+==============================================================================
+--- /dev/null 00:00:00 1970 (empty, because file is newly added)
++++ file9 Sun Sep 9 15:40:00 2001 (r6)
+@@ -0,0 +1 @@
++file9
Group: file plus other areas
Subject: r6 - dir1 dir4
@@ -334,7 +384,7 @@ Date: Sun Sep 9 15:40:00 2001
New Revision: 6
Log:
-mixed addition and change
+mixed addition and change. Fixes Blaz#456 Blah#987
Added:
file9
@@ -369,7 +419,7 @@ Date: Sun Sep 9 15:40:00 2001
New Revision: 6
Log:
-mixed addition and change
+mixed addition and change. Fixes Blaz#456 Blah#987
Added:
dir4/
@@ -391,18 +441,59 @@ Added: file9
+++ file9 Sun Sep 9 15:40:00 2001 (r6)
@@ -0,0 +1 @@
+file9
-Group: file
-Subject: r6 - dir1 dir4
+Group: bugtracker
+Subject: Fix for Blah#987: r6 - dir1 dir4
Author: mailer test
Date: Sun Sep 9 15:40:00 2001
New Revision: 6
Log:
-mixed addition and change
+mixed addition and change. Fixes Blaz#456 Blah#987
Added:
+ dir4/
file9
+Modified:
+ dir1/file3
+
+Modified: dir1/file3
+==============================================================================
+--- dir1/file3 Sun Sep 9 12:53:20 2001 (r5)
++++ dir1/file3 Sun Sep 9 15:40:00 2001 (r6)
+@@ -1 +1,2 @@
+ file3
++change C4
+
+Added: file9
+==============================================================================
+--- /dev/null 00:00:00 1970 (empty, because file is newly added)
++++ file9 Sun Sep 9 15:40:00 2001 (r6)
+@@ -0,0 +1 @@
++file9
+Group: bugtracker
+Subject: Fix for Blaz#456: r6 - dir1 dir4
+
+Author: mailer test
+Date: Sun Sep 9 15:40:00 2001
+New Revision: 6
+
+Log:
+mixed addition and change. Fixes Blaz#456 Blah#987
+
+Added:
+ dir4/
+ file9
+Modified:
+ dir1/file3
+
+Modified: dir1/file3
+==============================================================================
+--- dir1/file3 Sun Sep 9 12:53:20 2001 (r5)
++++ dir1/file3 Sun Sep 9 15:40:00 2001 (r6)
+@@ -1 +1,2 @@
+ file3
++change C4
Added: file9
==============================================================================
Modified: subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-t1.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-t1.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-t1.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-t1.sh Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/bin/sh
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# mailer-t1.sh: test #1 for the mailer.py script
#
# This test generates "email" for each revision in the repository,
Modified: subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-tweak.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-tweak.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-tweak.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer-tweak.py Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# mailer-tweak.py: tweak the svn:date and svn:author properties
# on all revisions
#
Modified: subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer.conf
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer.conf?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer.conf (original)
+++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/tests/mailer.conf Tue Aug 10 17:03:06 2010
@@ -338,3 +338,9 @@ for_paths = file.*
[file]
for_paths = file.*
show_nonmatching_paths = no
+
+[bugtracker]
+search_logmsg = (?P<bugid>(Blaz|Blah)#\d+)
+to_addr = issue-tracker@example.com
+commit_subject_prefix = Fix for %(bugid)s:
+
Modified: subversion/branches/ignore-mergeinfo/tools/hook-scripts/svn2feed.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/svn2feed.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/hook-scripts/svn2feed.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/svn2feed.py Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/hook-scripts/svnperms.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/svnperms.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/hook-scripts/svnperms.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/svnperms.py Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# $HeadURL$
# $LastChangedDate$
Modified: subversion/branches/ignore-mergeinfo/tools/hook-scripts/validate-extensions.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/validate-extensions.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/hook-scripts/validate-extensions.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/validate-extensions.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/usr/bin/env python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
"""\
Check that any files pending commit into a Subversion repository have
@@ -49,7 +69,7 @@ def validate_added_extensions(repos_path
kind = fs.check_path(txn_root, path)
if kind != core.svn_node_file:
continue
-
+
# If this was a newly added (without history) file ...
if ((change.change_kind == fs.path_change_replace) \
or (change.change_kind == fs.path_change_add)):
@@ -72,7 +92,7 @@ def usage_and_exit(errmsg=None):
if errmsg:
stream.write("ERROR: " + errmsg + "\n")
sys.exit(errmsg and 1 or 0)
-
+
def main():
argc = len(sys.argv)
if argc < 5:
Modified: subversion/branches/ignore-mergeinfo/tools/hook-scripts/verify-po.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/verify-po.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/hook-scripts/verify-po.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/verify-po.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/usr/bin/env python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
"""This is a pre-commit hook that checks whether the contents of PO files
committed to the repository are encoded in UTF-8.
"""
Modified: subversion/branches/ignore-mergeinfo/tools/po/l10n-report.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/po/l10n-report.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/po/l10n-report.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/po/l10n-report.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/usr/bin/env python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
"""Usage: l10n-report.py [OPTION...]
Modified: subversion/branches/ignore-mergeinfo/tools/po/po-update.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/po/po-update.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/po/po-update.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/po/po-update.sh Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/bin/sh
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# Usage:
# ./po-update.sh pot
# - to generate just the pot file
Modified: subversion/branches/ignore-mergeinfo/tools/server-side/fsfs-reshard.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/server-side/fsfs-reshard.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/server-side/fsfs-reshard.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/server-side/fsfs-reshard.py Tue Aug 10 17:03:06 2010
@@ -28,10 +28,10 @@
# intended to solve.
#
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/server-side/svn-backup-dumps.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/server-side/svn-backup-dumps.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/server-side/svn-backup-dumps.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/server-side/svn-backup-dumps.py Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
# svn-backup-dumps.py -- Create dumpfiles to backup a subversion repository.
#
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
@@ -247,7 +247,7 @@ class SvnBackupOutputCommand(SvnBackupOu
SvnBackupOutput.__init__(self, abspath, filename + file_extension)
self.__cmd_path = cmd_path
self.__cmd_options = cmd_options
-
+
def open(self):
cmd = [ self.__cmd_path, self.__cmd_options ]
@@ -320,7 +320,7 @@ class SvnBackup:
self.__quiet = options.quiet
self.__deltas = options.deltas
self.__relative_incremental = options.relative_incremental
-
+
# svnadmin/svnlook path
self.__svnadmin_path = "svnadmin"
if options.svnadmin_path:
@@ -455,7 +455,7 @@ class SvnBackup:
# determine the latest revision dumped
highest_rev = rev_end
- return highest_rev
+ return highest_rev
def transfer_ftp(self, absfilename, filename):
rc = False
Modified: subversion/branches/ignore-mergeinfo/tools/server-side/svn-populate-node-origins-index.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/server-side/svn-populate-node-origins-index.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/server-side/svn-populate-node-origins-index.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/server-side/svn-populate-node-origins-index.c Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
* origins index.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/server-side/svn-rep-sharing-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/server-side/svn-rep-sharing-stats.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/server-side/svn-rep-sharing-stats.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/server-side/svn-rep-sharing-stats.c Tue Aug 10 17:03:06 2010
@@ -1,9 +1,9 @@
/*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -51,7 +51,6 @@ usage(apr_pool_t *pool)
svn_error_clear(svn_cmdline_fprintf
(stderr, pool,
_("Type 'svn-rep-sharing-stats --help' for usage.\n")));
- exit(1);
}
@@ -123,7 +122,7 @@ svn_cl__check_cancel(void *baton)
static svn_cancel_func_t cancel_func = svn_cl__check_cancel;
-static void set_up_cancellation()
+static void set_up_cancellation(void)
{
/* Set up our cancellation support. */
apr_signal(SIGINT, signal_handler);
@@ -210,7 +209,7 @@ static svn_error_t *record(apr_hash_t *r
key->offset = rep->offset;
/* Update or create the value. */
- if (value = apr_hash_get(records, key, sizeof(*key)))
+ if ((value = apr_hash_get(records, key, sizeof(*key))))
{
/* Paranoia. */
SVN_ERR_ASSERT(value->sha1_checksum != NULL);
@@ -238,11 +237,14 @@ static svn_error_t *record(apr_hash_t *r
* If PROP_REPS or DATA_REPS is NULL, the respective kind of reps are not
* tallied.
*
+ * Print progress report to STDERR unless QUIET is true.
+ *
* Use SCRATCH_POOL for temporary allocations.
*/
static svn_error_t *
process_one_revision(svn_fs_t *fs,
svn_revnum_t revnum,
+ svn_boolean_t quiet,
apr_hash_t *prop_reps,
apr_hash_t *data_reps,
apr_hash_t *both_reps,
@@ -253,13 +255,16 @@ process_one_revision(svn_fs_t *fs,
apr_hash_t *paths_changed;
apr_hash_index_t *hi;
- SVN_DBG(("processing r%ld\n", revnum));
+ if (! quiet)
+ SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool,
+ "processing r%ld\n", revnum));
/* Get the changed paths. */
SVN_ERR(svn_fs_revision_root(&rev_root, fs, revnum, scratch_pool));
SVN_ERR(svn_fs_paths_changed2(&paths_changed, rev_root, scratch_pool));
/* Iterate them. */
+ /* ### use iterpool? */
for (hi = apr_hash_first(scratch_pool, paths_changed);
hi; hi = apr_hash_next(hi))
{
@@ -272,7 +277,9 @@ process_one_revision(svn_fs_t *fs,
path = svn_apr_hash_index_key(hi);
change = svn_apr_hash_index_val(hi);
- SVN_DBG(("processing r%ld:%s\n", revnum, path));
+ if (! quiet)
+ SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool,
+ "processing r%ld:%s\n", revnum, path));
if (change->change_kind == svn_fs_path_change_delete)
/* Can't ask for reps of PATH at REVNUM if the path no longer exists
@@ -360,11 +367,12 @@ static svn_error_t *is_fs_fsfs(svn_fs_t
/* The core logic. This function iterates the repository REPOS_PATH
* and sends all the (DATA and/or PROP) reps in each revision for counting
- * by process_one_revision().
+ * by process_one_revision(). QUIET is passed to process_one_revision().
*/
static svn_error_t *process(const char *repos_path,
svn_boolean_t prop,
svn_boolean_t data,
+ svn_boolean_t quiet,
apr_pool_t *scratch_pool)
{
apr_hash_t *prop_reps = NULL;
@@ -396,7 +404,8 @@ static svn_error_t *process(const char *
{
svn_pool_clear(iterpool);
SVN_ERR(cancel_func(NULL));
- SVN_ERR(process_one_revision(fs, rev, prop_reps, data_reps, both_reps,
+ SVN_ERR(process_one_revision(fs, rev, quiet,
+ prop_reps, data_reps, both_reps,
scratch_pool, iterpool));
}
svn_pool_destroy(iterpool);
@@ -416,6 +425,7 @@ main(int argc, const char *argv[])
apr_allocator_t *allocator;
apr_pool_t *pool;
svn_boolean_t prop = FALSE, data = FALSE;
+ svn_boolean_t quiet = FALSE;
svn_error_t *err;
apr_getopt_t *os;
const apr_getopt_option_t options[] =
@@ -423,6 +433,7 @@ main(int argc, const char *argv[])
{"data", OPT_DATA, 0, N_("display data reps stats")},
{"prop", OPT_PROP, 0, N_("display prop reps stats")},
{"both", OPT_BOTH, 0, N_("display combined (data+prop) reps stats")},
+ {"quiet", 'q', 0, N_("no progress (only errors) to stderr")},
{"help", 'h', 0, N_("display this help")},
{"version", OPT_VERSION, 0,
N_("show program version information")},
@@ -481,6 +492,9 @@ main(int argc, const char *argv[])
data = TRUE;
prop = TRUE;
break;
+ case 'q':
+ quiet = TRUE;
+ break;
case 'h':
help(options, pool);
break;
@@ -510,7 +524,7 @@ main(int argc, const char *argv[])
set_up_cancellation();
/* Do something. */
- SVN_INT_ERR(process(repos_path, prop, data, pool));
+ SVN_INT_ERR(process(repos_path, prop, data, quiet, pool));
/* We're done. */
Modified: subversion/branches/ignore-mergeinfo/tools/server-side/svn_server_log_parse.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/server-side/svn_server_log_parse.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/server-side/svn_server_log_parse.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/server-side/svn_server_log_parse.py Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
#!/usr/bin/python
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/server-side/svnauthz-validate.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/server-side/svnauthz-validate.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/server-side/svnauthz-validate.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/server-side/svnauthz-validate.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* svnauthz-validate.c : Load and validate an authz file.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/server-side/test_svn_server_log_parse.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/server-side/test_svn_server_log_parse.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/server-side/test_svn_server_log_parse.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/server-side/test_svn_server_log_parse.py Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
#!/usr/bin/python
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/tools/xslt/svnindex.css
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/xslt/svnindex.css?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/xslt/svnindex.css (original)
+++ subversion/branches/ignore-mergeinfo/tools/xslt/svnindex.css Tue Aug 10 17:03:06 2010
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
/* A sample style sheet for displaying the Subversion directory listing
that is generated by mod_dav_svn and "svnindex.xsl". */