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 [38/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/buildbot/slaves/win32-xp-VS2005/do_all.bat
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat Tue Aug 10 17:03:06 2010
@@ -1,3 +1,20 @@
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
cmd.exe /c ..\svnbuild.bat > build.log
cmd.exe /c ..\svncheck.bat fsfs ra_local > fsfs_local.log
cmd.exe /c ..\svncheck.bat fsfs ra_svn > fsfs_svn.log
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat Tue Aug 10 17:03:06 2010
@@ -1,3 +1,20 @@
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
@echo off
IF NOT EXIST ..\config.bat GOTO noconfig
call ..\config.bat
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat Tue Aug 10 17:03:06 2010
@@ -1,3 +1,20 @@
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
@echo off
IF NOT EXIST ..\config.bat GOTO noconfig
call ..\config.bat
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat Tue Aug 10 17:03:06 2010
@@ -1,3 +1,20 @@
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
@echo off
IF NOT EXIST ..\config.bat GOTO noconfig
call ..\config.bat
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat Tue Aug 10 17:03:06 2010
@@ -1,3 +1,20 @@
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
@echo off
REM IF NOT EXIST ..\config.bat GOTO noconfig
REM call ..\config.bat
@@ -10,4 +27,4 @@ EXIT 0
:noconfig
echo File config.bat not found. Please copy it from config.bat.tmpl and tweak for you.
-EXIT 2
\ No newline at end of file
+EXIT 2
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl Tue Aug 10 17:03:06 2010
@@ -1,3 +1,20 @@
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
set MSDEV=C:\Program Files\VS6.0
set HTTPD_BIN_DIR=C:\Program Files\Apache2
set TEST_DIR=C:\tmp\svn-auto-test
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat Tue Aug 10 17:03:06 2010
@@ -1,3 +1,20 @@
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
IF NOT EXIST ..\config.bat GOTO noconfig
call ..\config.bat
@@ -57,4 +74,4 @@ EXIT 1
:noconfig
echo File config.bat not found. Please copy it from config.bat.tmpl and tweak for you.
-EXIT 2
\ No newline at end of file
+EXIT 2
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat Tue Aug 10 17:03:06 2010
@@ -1,3 +1,20 @@
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
IF NOT EXIST ..\config.bat GOTO noconfig
call ..\config.bat
@@ -31,4 +48,4 @@ EXIT %ERR%
:noconfig
echo File config.bat not found. Please copy it from config.bat.tmpl and tweak for you.
-EXIT 2
\ No newline at end of file
+EXIT 2
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat Tue Aug 10 17:03:06 2010
@@ -1,3 +1,20 @@
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
IF NOT EXIST ..\config.bat GOTO noconfig
call ..\config.bat
@@ -8,4 +25,4 @@ EXIT 0
:noconfig
echo File config.bat not found. Please copy it from config.bat.tmpl and tweak for you.
-EXIT 2
\ No newline at end of file
+EXIT 2
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat Tue Aug 10 17:03:06 2010
@@ -1,3 +1,20 @@
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
IF NOT EXIST ..\config.bat GOTO noconfig
call ..\config.bat
@@ -5,4 +22,4 @@ EXIT 0
:noconfig
echo File config.bat not found. Please copy it from config.bat.tmpl and tweak for you.
-EXIT 2
\ No newline at end of file
+EXIT 2
Modified: subversion/branches/ignore-mergeinfo/tools/client-side/bash_completion
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/client-side/bash_completion?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/client-side/bash_completion (original)
+++ subversion/branches/ignore-mergeinfo/tools/client-side/bash_completion Tue Aug 10 17:03:06 2010
@@ -134,6 +134,7 @@ function _svn_lls()
# status/previous are those at the end of the line, not at the entry position
# - url completion should select more cases where it is relevant
# - url completion of http:// schemas could suggest sub directories?
+# - add completion for experimental 'obliterate' feature?
_svn()
{
local cur cmds cmdOpts pOpts mOpts rOpts qOpts nOpts optsParam opt
@@ -534,6 +535,9 @@ _svn()
# Thus the handling is reprogrammed here...
# The code assumes that property names look like *:*,
# but it also works reasonably well with simple names.
+ #
+ # This hack is broken in bash4... not sure what to do about it,
+ # especially while keeping the bash3 compatibility:-(
local choices=
if [[ $cur == *:* ]]
Modified: subversion/branches/ignore-mergeinfo/tools/client-side/change-svn-wc-format.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/client-side/change-svn-wc-format.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/client-side/change-svn-wc-format.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/client-side/change-svn-wc-format.py Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
# change-svn-wc-format.py: Change the format of a Subversion working copy.
#
# ====================================================================
-# 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
@@ -111,7 +111,7 @@ class WCFormatConverter:
else:
if self.verbosity:
print("Skipping file '%s'" % format.path)
-
+
if self.verbosity:
print("Checking whether WC format can be converted")
try:
@@ -286,7 +286,7 @@ class Entry:
# because 11 does not use has-props and cachable-props (but 10 does).
# Naively downgrading in that situation causes properties to disappear
# from the wc.
- #
+ #
# Downgrading from the 1.7 SQLite-based format to format 10 is not
# implemented.
}
Modified: subversion/branches/ignore-mergeinfo/tools/client-side/server-version.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/client-side/server-version.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/client-side/server-version.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/client-side/server-version.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.
+#
+#
+#
# server-version.py: print a Subversion server's version number
#
# USAGE: server-version.py URL
Modified: subversion/branches/ignore-mergeinfo/tools/client-side/showchange.pl
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/client-side/showchange.pl?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/client-side/showchange.pl (original)
+++ subversion/branches/ignore-mergeinfo/tools/client-side/showchange.pl Tue Aug 10 17:03:06 2010
@@ -1,4 +1,22 @@
#!/usr/bin/perl -w
+# ====================================================================
+# 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.
+# ====================================================================
use strict;
Modified: subversion/branches/ignore-mergeinfo/tools/client-side/svn-graph.pl
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/client-side/svn-graph.pl?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/client-side/svn-graph.pl (original)
+++ subversion/branches/ignore-mergeinfo/tools/client-side/svn-graph.pl Tue Aug 10 17:03:06 2010
@@ -5,10 +5,10 @@
# of a node
#
# ====================================================================
-# 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/client-side/svn-viewspec.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/client-side/svn-viewspec.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/client-side/svn-viewspec.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/client-side/svn-viewspec.py Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
#!/usr/bin/env 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
@@ -113,11 +113,11 @@ DEPTH_FILES = 'files'
DEPTH_IMMEDIATES = 'immediates'
DEPTH_INFINITY = 'infinity'
-
+
class TreeNode:
"""A representation of a single node in a Subversion sparse
checkout tree."""
-
+
def __init__(self, name, depth):
self.name = name # the basename of this tree item
self.depth = depth # its depth (one of the DEPTH_* values)
@@ -139,7 +139,7 @@ class TreeNode:
class SubversionViewspec:
"""A representation of a Subversion sparse checkout specification."""
-
+
def __init__(self, base_url, revision, tree):
self.base_url = base_url # base URL of the checkout
self.revision = revision # revision of the checkout (-1 == HEAD)
@@ -147,10 +147,10 @@ class SubversionViewspec:
def svn_path_compare_paths(path1, path2):
"""Compare PATH1 and PATH2 as paths, sorting depth-first-ily.
-
+
NOTE: Stolen unapologetically from Subversion's Python bindings
module svn.core."""
-
+
path1_len = len(path1);
path2_len = len(path2);
min_len = min(path1_len, path2_len)
@@ -189,7 +189,7 @@ def svn_path_compare_paths(path1, path2)
def parse_viewspec_headers(viewspec_fp):
"""Parse the headers from the viewspec file, return them as a
dictionary mapping header names to values."""
-
+
headers = {}
while 1:
line = viewspec_fp.readline().strip()
@@ -202,7 +202,7 @@ def parse_viewspec_headers(viewspec_fp):
def parse_viewspec(viewspec_fp):
"""Parse the viewspec file, returning a SubversionViewspec object
that represents the specification."""
-
+
headers = parse_viewspec_headers(viewspec_fp)
format = headers['Format']
assert format == '1'
@@ -244,7 +244,7 @@ def parse_viewspec(viewspec_fp):
# Add our rule to the set thereof.
assert not rules.has_key(path)
rules[path] = depth
-
+
tree = TreeNode('', root_depth)
paths = rules.keys()
paths.sort(svn_path_compare_paths)
@@ -266,7 +266,7 @@ def checkout_tree(base_url, revision, tr
sparse checkout item. IS_TOP is set iff this node represents the
root of the checkout tree. REVISION is the revision to checkout,
or -1 if checking out HEAD."""
-
+
depth = tree_node.depth
revision_str = ''
if revision != -1:
@@ -288,7 +288,7 @@ def checkout_tree(base_url, revision, tr
def checkout_spec(viewspec, target_dir):
"""Checkout the view specification VIEWSPEC into TARGET_DIR."""
-
+
checkout_tree(viewspec.base_url,
viewspec.revision,
viewspec.tree,
@@ -307,7 +307,7 @@ def main():
target_dir = None
else:
target_dir = sys.argv[2]
-
+
viewspec = parse_viewspec(fp)
if target_dir is None:
sys.stderr.write("Url: %s\n" % (viewspec.base_url))
@@ -320,6 +320,6 @@ def main():
viewspec.tree.dump(True)
else:
checkout_spec(viewspec, target_dir)
-
+
if __name__ == "__main__":
main()
Modified: subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc-test.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc-test.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc-test.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc-test.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: svnmucc-test.py [build-dir-top [base-url]]
Modified: subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc.c 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.
+ *
+ */
+
/* Multiple URL Command Client
Combine a list of mv, cp and rm commands on URLs into a single commit.
Modified: subversion/branches/ignore-mergeinfo/tools/dev/analyze-svnlogs.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/analyze-svnlogs.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/analyze-svnlogs.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/analyze-svnlogs.py Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/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.
+#
+#
+#
# Generate a report of each area each committer has touched over all time.
#
# $ svn log -v ^/ > svnlogdata
Modified: subversion/branches/ignore-mergeinfo/tools/dev/contribulyze.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/contribulyze.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/contribulyze.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/contribulyze.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.
+#
+#
# See usage() for details, or run with --help option.
#
@@ -490,7 +510,7 @@ class LogMessage(object):
log_separator = '-' * 72 + '\n'
log_header_re = re.compile\
('^(r[0-9]+) \| ([^|]+) \| ([^|]+) \| ([0-9]+)[^0-9]')
-field_re = re.compile('^(Patch|Review(ed)?|Suggested|Found) by:\s*(.*)')
+field_re = re.compile('^(Patch|Review(ed)?|Suggested|Found) by:\s*\S.*$')
field_aliases = { 'Reviewed' : 'Review' }
parenthetical_aside_re = re.compile('^\s*\(.*\)\s*$')
@@ -545,6 +565,8 @@ def graze(input):
+ (field.alias or field.name)
+ ' by:\s+|\s+)([^\s(].*)')
m = in_field_re.match(line)
+ if m is None:
+ sys.stderr.write("Error matching: %s\n" % (line))
user, real, email = Contributor.parse(m.group(2))
if user == 'me':
user = log.committer
Modified: subversion/branches/ignore-mergeinfo/tools/dev/datecheck.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/datecheck.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/datecheck.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/datecheck.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 debugging script to test date-ordering in an SVN repository.
Modified: subversion/branches/ignore-mergeinfo/tools/dev/find-bad-style.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/find-bad-style.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/find-bad-style.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/find-bad-style.py Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/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.
+#
+#
+#
# Find places in our code where whitespace is erroneously used before
# the open-paren on a function all. This is typically manifested like:
#
Modified: subversion/branches/ignore-mergeinfo/tools/dev/find-unmoved-deprecated.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/find-unmoved-deprecated.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/find-unmoved-deprecated.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/find-unmoved-deprecated.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.
+#
+#
+#
# Find functions marked a SVN_DEPRECATED, but which have not been moved
# to their associated deprecated.c file.
#
Modified: subversion/branches/ignore-mergeinfo/tools/dev/gen-javahl-errors.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/gen-javahl-errors.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/gen-javahl-errors.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/gen-javahl-errors.py Tue Aug 10 17:03:06 2010
@@ -4,17 +4,22 @@
# C error codes
#
# ====================================================================
-# Copyright (c) 2007-2009 CollabNet. All rights reserved.
+# 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
#
-# * 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-1.html.
-# If newer versions of this license are posted there, you may use a
-# newer version instead, at your option.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# * 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/.
+# 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.
# ====================================================================
#
Modified: subversion/branches/ignore-mergeinfo/tools/dev/gen_junit_report.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/gen_junit_report.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/gen_junit_report.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/gen_junit_report.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/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.
+#
+#
# $Id$
"""
@@ -6,24 +26,71 @@ gen_junit_report.py -- The script is to
Subversion tests. The script uses the log file, tests.log created by
"make check" process. It parses the log file and generate the junit
files for each test separately in the specified output directory. The
-script can take --log-file and --output-dir arguments.
+script can take --log-file and --output-dir arguments.
"""
import sys
import os
import getopt
-def xml_encode(data):
- """encode the xml characters in the data"""
- encode = {
+def replace_from_map(data, encode):
+ """replace substrings in DATA with replacements defined in ENCODING"""
+ for pattern, replacement in encode.items():
+ data = data.replace(pattern, replacement)
+ return data
+
+xml_encode_map = {
'&': '&',
'<': '<',
'>': '>',
'"': '"',
- "'": '''
+ "'": ''',
+ }
+
+def xml_encode(data):
+ """encode the xml characters in the data"""
+ return replace_from_map(data, xml_encode_map)
+
+special_encode_map = {
+ ']]>': ']]]]><![CDATA[>', # CDATA terminator sequence
+ '\000': '␀', # U+2400 SYMBOL FOR NULL
+ '\001': '␁', # U+2401 SYMBOL FOR START OF HEADING
+ '\002': '␂', # U+2402 SYMBOL FOR START OF TEXT
+ '\003': '␃', # U+2403 SYMBOL FOR END OF TEXT
+ '\004': '␄', # U+2404 SYMBOL FOR END OF TRANSMISSION
+ '\005': '␅', # U+2405 SYMBOL FOR ENQUIRY
+ '\006': '␆', # U+2406 SYMBOL FOR ACKNOWLEDGE
+ '\007': '␇', # U+2407 SYMBOL FOR BELL
+ '\010': '␈', # U+2408 SYMBOL FOR BACKSPACE
+ '\011': '␉', # U+2409 SYMBOL FOR HORIZONTAL TABULATION
+ #'\012': '␊', # U+240A SYMBOL FOR LINE FEED
+ '\013': '␋', # U+240B SYMBOL FOR VERTICAL TABULATION
+ '\014': '␌', # U+240C SYMBOL FOR FORM FEED
+ #'\015': '␍', # U+240D SYMBOL FOR CARRIAGE RETURN
+ '\016': '␎', # U+240E SYMBOL FOR SHIFT OUT
+ '\017': '␏', # U+240F SYMBOL FOR SHIFT IN
+ '\020': '␐', # U+2410 SYMBOL FOR DATA LINK ESCAPE
+ '\021': '␑', # U+2411 SYMBOL FOR DEVICE CONTROL ONE
+ '\022': '␒', # U+2412 SYMBOL FOR DEVICE CONTROL TWO
+ '\023': '␓', # U+2413 SYMBOL FOR DEVICE CONTROL THREE
+ '\024': '␔', # U+2414 SYMBOL FOR DEVICE CONTROL FOUR
+ '\025': '␕', # U+2415 SYMBOL FOR NEGATIVE ACKNOWLEDGE
+ '\026': '␖', # U+2416 SYMBOL FOR SYNCHRONOUS IDLE
+ '\027': '␗', # U+2417 SYMBOL FOR END OF TRAMSNISSION BLOCK
+ '\030': '␘', # U+2418 SYMBOL FOR CANCEL
+ '\031': '␙', # U+2419 SYMBOL FOR END OF MEDIUM
+ '\032': '␚', # U+241A SYMBOL FOR SUBSTITUTE
+ '\033': '␛', # U+241B SYMBOL FOR ESCAPE
+ '\034': '␜', # U+241C SYMBOL FOR FILE SEPARATOR
+ '\035': '␝', # U+241D SYMBOL FOR GROUP SEPARATOR
+ '\036': '␞', # U+241E SYMBOL FOR RECORD SEPARATOR
+ '\037': '␟', # U+241F SYMBOL FOR UNIT SEPARATOR
}
- for char in encode.keys():
- data = data.replace(char, encode[char])
+
+def escape_special_characters(data):
+ """remove special characters in test failure reasons"""
+ if data:
+ data = replace_from_map(data, special_encode_map)
return data
def start_junit():
@@ -35,7 +102,7 @@ def start_testsuite(test_name):
"""start testsuite. The value for the attributes are replaced later
when the junit file handling is concluded"""
sub_test_name = test_name.replace('.', '-')
- start = """<testsuite time="ELAPSED_%s" tests="TOTAL_%s" name="%s"
+ start = """<testsuite time="ELAPSED_%s" tests="TOTAL_%s" name="%s"
failures="FAIL_%s" errors="FAIL_%s" skipped="SKIP_%s">""" % \
(test_name, test_name, sub_test_name, test_name, test_name, test_name)
return start
@@ -52,6 +119,7 @@ def junit_testcase_fail(test_name, casen
"""mark the test case as FAILED"""
casename = xml_encode(casename)
sub_test_name = test_name.replace('.', '-')
+ reason = escape_special_characters(reason)
case = """<testcase time="ELAPSED_CASE_%s" name="%s" classname="%s">
<failure type="Failed"><![CDATA[%s]]></failure>
</testcase>""" % (test_name, casename, sub_test_name, reason)
@@ -61,6 +129,7 @@ def junit_testcase_xfail(test_name, case
"""mark the test case as XFAILED"""
casename = xml_encode(casename)
sub_test_name = test_name.replace('.', '-')
+ reason = escape_special_characters(reason)
case = """<testcase time="ELAPSED_CASE_%s" name="%s" classname="%s">
<system-out><![CDATA[%s]]></system-out>
</testcase>""" % (test_name, casename, sub_test_name, reason)
@@ -163,7 +232,7 @@ def main():
test_name = line.split(' ')[1]
# replace '.' in test name with '_' to avoid confusing class
# name in test result displayed in the CI user interface
- test_name.replace('.', '_')
+ test_name.replace('.', '_')
count[test_name] = {
'pass' : 0,
'skip' : 0,
@@ -203,7 +272,7 @@ def main():
count[test_name]['elapsed'] = secs_taken
junit_str = update_stat(test_name, junit, count)
- test_junit_file = os.path.join(output_dir,
+ test_junit_file = os.path.join(output_dir,
"%s.junit.xml" % test_name)
w_fp = open (test_junit_file, 'w')
w_fp.writelines(junit_str)
Modified: subversion/branches/ignore-mergeinfo/tools/dev/gnuify-changelog.pl
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/gnuify-changelog.pl?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/gnuify-changelog.pl (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/gnuify-changelog.pl Tue Aug 10 17:03:06 2010
@@ -1,5 +1,22 @@
#!/usr/bin/perl -w
-
+# ====================================================================
+# 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 script to munge the output of 'svn log' into something approaching the
# style of a GNU ChangeLog.
#
Modified: subversion/branches/ignore-mergeinfo/tools/dev/graph-dav-servers.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/graph-dav-servers.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/graph-dav-servers.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/graph-dav-servers.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.
+#
+#
+#
# graph-svn-dav.py by Brian W. Fitzpatrick <fi...@red-bean.com>
#
# This was originally a quick hack to make a pretty picture of svn DAV servers.
Modified: subversion/branches/ignore-mergeinfo/tools/dev/iz/ff2csv.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/iz/ff2csv.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/iz/ff2csv.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/iz/ff2csv.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.
+#
+#
# -*- Python -*-
"""Transform find-fix.py output into Excellable csv."""
Modified: subversion/branches/ignore-mergeinfo/tools/dev/iz/find-fix.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/iz/find-fix.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/iz/find-fix.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/iz/find-fix.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.
+#
+#
# -*- Python -*-
"""find-fix.py: produce a find/fix report for Subversion's IZ database
Modified: subversion/branches/ignore-mergeinfo/tools/dev/iz/run-queries.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/iz/run-queries.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/iz/run-queries.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/iz/run-queries.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.
+#
+#
if test $# != 3; then
echo "USAGE: $0 DATABASE_USER DATABASE_PASSWORD MYSQL_DATABASE"
Modified: subversion/branches/ignore-mergeinfo/tools/dev/lock-check.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/lock-check.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/lock-check.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/lock-check.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.
+#
+#
### Repository lock checker. Gets an exclusive lock on the provided
### repository, then runs db_stat to see if the lock counts have been
Modified: subversion/branches/ignore-mergeinfo/tools/dev/min-includes.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/min-includes.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/min-includes.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/min-includes.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.
+#
+#
+#
# Attempt to figure out the minimum set of includes for our header files.
#
# ### this is incomplete. it merely lists the header files in order from
Modified: subversion/branches/ignore-mergeinfo/tools/dev/mklog.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/mklog.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/mklog.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/mklog.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.
+#
+#
+#
# Read a diff from stdin, and output a log message template to stdout.
# Hint: It helps if the diff was generated using 'svn diff -x -p'
#
Modified: subversion/branches/ignore-mergeinfo/tools/dev/mlpatch.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/mlpatch.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/mlpatch.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/mlpatch.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.
+#
+#
# mlpatch.py: Run with no arguments for usage
Modified: subversion/branches/ignore-mergeinfo/tools/dev/normalize-dump.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/normalize-dump.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/normalize-dump.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/normalize-dump.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 re
Modified: subversion/branches/ignore-mergeinfo/tools/dev/po-merge.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/po-merge.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/po-merge.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/po-merge.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 os, re, sys
Modified: subversion/branches/ignore-mergeinfo/tools/dev/prebuild-cleanup.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/prebuild-cleanup.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/prebuild-cleanup.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/prebuild-cleanup.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.
+#
+#
### Purify a system, to simulate building Subversion on a "clean" box.
###
Modified: subversion/branches/ignore-mergeinfo/tools/dev/random-commits.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/random-commits.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/random-commits.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/random-commits.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: random-commits.py
#
# Using the FILELIST (see config below), a series of COUNT commits will be
Modified: subversion/branches/ignore-mergeinfo/tools/dev/scramble-tree.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/scramble-tree.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/scramble-tree.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/scramble-tree.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.
+#
+#
+#
# scramble-tree.py: (See scramble-tree.py --help.)
#
# Makes multiple random file changes to a directory tree, for testing.
Modified: subversion/branches/ignore-mergeinfo/tools/dev/stress.pl
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/stress.pl?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/stress.pl (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/stress.pl Tue Aug 10 17:03:06 2010
@@ -1,4 +1,22 @@
#!/usr/bin/perl -w
+# ====================================================================
+# 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 script that allows some simple testing of Subversion, in
# particular concurrent read, write and read-write access by the 'svn'
Modified: subversion/branches/ignore-mergeinfo/tools/dev/svn-merge-revs.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/svn-merge-revs.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/svn-merge-revs.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/svn-merge-revs.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
Modified: subversion/branches/ignore-mergeinfo/tools/dev/svnraisetreeconflict/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/svnraisetreeconflict/main.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/svnraisetreeconflict/main.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/svnraisetreeconflict/main.c Tue Aug 10 17:03:06 2010
@@ -1,5 +1,5 @@
/* svnraisetreeconflict
- *
+ *
* This is a crude command line tool that publishes API to create
* tree-conflict markings in a working copy.
*
@@ -15,10 +15,10 @@
* source tree.
*
* ====================================================================
- * 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/dev/trails.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/trails.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/trails.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/trails.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.
+#
+#
## See the usage() function for operating instructions. ##
Modified: subversion/branches/ignore-mergeinfo/tools/dev/verify-history.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/verify-history.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/verify-history.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/verify-history.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 program is used to verify the FS history code.
#
Modified: subversion/branches/ignore-mergeinfo/tools/dev/warn-ignored-err.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/warn-ignored-err.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/warn-ignored-err.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/warn-ignored-err.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.
+#
+#
HELP="\
Usage: $0 [--remove] [FILE...]
Modified: subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/count-progress.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/count-progress.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/count-progress.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/count-progress.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 os, sys
Modified: subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/gather-data.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/gather-data.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/gather-data.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/gather-data.sh Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#/usr/bin/env 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.
+#
+#
# Trap Ctrl-C
trap 'exit 1' 2
Modified: subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/graph-data.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/graph-data.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/graph-data.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/graph-data.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 matplotlib.mlab as mlab
import matplotlib.pyplot as plt
Modified: subversion/branches/ignore-mergeinfo/tools/dev/which-error.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/which-error.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dev/which-error.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/dev/which-error.py Tue Aug 10 17:03:06 2010
@@ -5,10 +5,10 @@
# their numeric error code values
#
# ====================================================================
-# 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/diff/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/diff/diff.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/diff/diff.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/diff/diff.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* diff-test.c -- test driver for text diffs
*
* ====================================================================
- * 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/diff/diff3.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/diff/diff3.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/diff/diff3.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/diff/diff3.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* diff3-test.c -- test driver for 3-way text merges
*
* ====================================================================
- * 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/diff/diff4.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/diff/diff4.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/diff/diff4.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/diff/diff4.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* diff4-test.c -- test driver for 3-way text merges
*
* ====================================================================
- * 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/dist/construct-rolling-environment.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dist/construct-rolling-environment.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dist/construct-rolling-environment.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/dist/construct-rolling-environment.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
AUTOCONF=autoconf-2.64
@@ -10,10 +30,10 @@ APR_UTIL=apr-util-1.3.9
NEON=neon-0.29.0
SERF=serf-0.3.0
ZLIB=zlib-1.2.3
-SQLITE_VERSION=3.6.17
+SQLITE_VERSION=3.6.20
SQLITE=sqlite-amalgamation-$SQLITE_VERSION
-HTTPD=httpd-2.2.13
+HTTPD=httpd-2.2.14
HTTPD_OOPS=
APR_ICONV=apr-iconv-1.2.1
APR_ICONV_OOPS=
Modified: subversion/branches/ignore-mergeinfo/tools/dist/dist.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dist/dist.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/dist/dist.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/dist/dist.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.
+#
+#
# USAGE: ./dist.sh -v VERSION -r REVISION -pr REPOS-PATH
# [-alpha ALPHA_NUM|-beta BETA_NUM|-rc RC_NUM|pre PRE_NUM]
@@ -203,7 +223,7 @@ export TZ
echo "Exporting $REPOS_PATH r$REVISION into sandbox..."
(cd "$DIST_SANDBOX" && \
${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS -r "$REVISION" \
- "http://svn.collab.net/repos/svn/$REPOS_PATH" \
+ "http://svn.apache.org/repos/asf/subversion/$REPOS_PATH" \
"$DISTNAME" --username none --password none)
rm -f "$DISTPATH/STATUS"
@@ -214,7 +234,7 @@ rm -f "$DISTPATH/STATUS"
rm -rf "$DISTPATH/www"
mkdir "$DISTPATH/www"
${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS -r "$REVISION" \
- "http://svn.collab.net/repos/svn/trunk/www/hacking.html" \
+ "http://svn.apache.org/repos/asf/subversion/trunk/www/hacking.html" \
--username none --password none "$DISTPATH/www/hacking.html"
# Remove contrib/ from our distribution tarball. Some of it is of
@@ -222,6 +242,10 @@ ${SVN:-svn} export -q $EXTRA_EXPORT_OPTI
# (See http://svn.haxx.se/dev/archive-2009-04/0166.shtml for discussion.)
rm -rf "$DISTPATH/contrib"
+# Remove packages/ from the tarball.
+# (See http://svn.haxx.se/dev/archive-2009-12/0205.shtml)
+rm -rf "$DISTPATH/packages"
+
install_dependency()
{
DEP_NAME=$1