Author: rhuijben
Date: Fri Feb 13 11:17:40 2015
New Revision: 1659509
URL: http://svn.apache.org/r1659509
Log:
Apply the standard pre-branch whitespace cleanup via
tools/dev/remove-trailing-whitespace.zsh
There should be no functional changes.
* .ycm_extra_conf.py
* build/generator/gen_win.py
* build/generator/gen_win_dependencies.py
* subversion/bindings/javahl/native/EditorProxy.h
* subversion/bindings/javahl/native/StateReporter.cpp
*
subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
* subversion/bindings/swig/ruby/test/test_fs.rb
* subversion/bindings/swig/ruby/test/util.rb
* subversion/bindings/swig/ruby/test/windows_util.rb
* subversion/include/private/svn_fs_fs_private.h
* subversion/include/private/svn_packed_data.h
* subversion/include/private/svn_repos_private.h
* subversion/include/private/svn_sorts_private.h
* subversion/include/private/svn_subr_private.h
* subversion/include/private/svn_wc_private.h
* subversion/include/svn_auth.h
* subversion/include/svn_cache_config.h
* subversion/include/svn_client.h
* subversion/include/svn_cmdline.h
* subversion/include/svn_diff.h
* subversion/include/svn_fs.h
* subversion/include/svn_io.h
* subversion/include/svn_ra.h
* subversion/include/svn_repos.h
* subversion/include/svn_string.h
* subversion/libsvn_client/blame.c
* subversion/libsvn_client/commit.c
* subversion/libsvn_client/commit_util.c
* subversion/libsvn_client/copy.c
* subversion/libsvn_client/diff.c
* subversion/libsvn_client/externals.c
* subversion/libsvn_client/log.c
* subversion/libsvn_client/patch.c
* subversion/libsvn_client/ra.c
* subversion/libsvn_client/update.c
* subversion/libsvn_delta/svndiff.c
* subversion/libsvn_diff/parse-diff.c
* subversion/libsvn_fs/fs-loader.c
* subversion/libsvn_fs_base/lock.c
* subversion/libsvn_fs_fs/cached_data.c
* subversion/libsvn_fs_fs/fs_fs.c
* subversion/libsvn_fs_fs/hotcopy.c
* subversion/libsvn_fs_fs/id.c
* subversion/libsvn_fs_fs/index.c
* subversion/libsvn_fs_fs/index.h
* subversion/libsvn_fs_fs/lock.c
* subversion/libsvn_fs_fs/low_level.c
* subversion/libsvn_fs_fs/low_level.h
* subversion/libsvn_fs_fs/pack.c
* subversion/libsvn_fs_fs/recovery.c
* subversion/libsvn_fs_fs/rev_file.c
* subversion/libsvn_fs_fs/revprops.c
* subversion/libsvn_fs_fs/revprops.h
* subversion/libsvn_fs_fs/stats.c
* subversion/libsvn_fs_fs/transaction.c
* subversion/libsvn_fs_fs/tree.c
* subversion/libsvn_fs_fs/verify.c
* subversion/libsvn_fs_x/cached_data.c
* subversion/libsvn_fs_x/changes.c
* subversion/libsvn_fs_x/dag.h
* subversion/libsvn_fs_x/fs.h
* subversion/libsvn_fs_x/fs_id.c
* subversion/libsvn_fs_x/fs_x.c
* subversion/libsvn_fs_x/hotcopy.c
* subversion/libsvn_fs_x/hotcopy.h
* subversion/libsvn_fs_x/index.c
* subversion/libsvn_fs_x/index.h
* subversion/libsvn_fs_x/lock.c
* subversion/libsvn_fs_x/lock.h
* subversion/libsvn_fs_x/low_level.c
* subversion/libsvn_fs_x/low_level.h
* subversion/libsvn_fs_x/noderevs.c
* subversion/libsvn_fs_x/pack.c
* subversion/libsvn_fs_x/reps.c
* subversion/libsvn_fs_x/rev_file.c
* subversion/libsvn_fs_x/revprops.c
* subversion/libsvn_fs_x/revprops.h
* subversion/libsvn_fs_x/string_table.c
* subversion/libsvn_fs_x/string_table.h
* subversion/libsvn_fs_x/transaction.c
* subversion/libsvn_fs_x/tree.c
* subversion/libsvn_fs_x/util.c
* subversion/libsvn_fs_x/verify.c
* subversion/libsvn_ra_local/ra_plugin.c
* subversion/libsvn_ra_serf/ra_serf.h
* subversion/libsvn_ra_serf/serf.c
* subversion/libsvn_ra_serf/update.c
* subversion/libsvn_ra_serf/util.c
* subversion/libsvn_ra_svn/client.c
* subversion/libsvn_ra_svn/marshal.c
* subversion/libsvn_repos/authz_pool.c
* subversion/libsvn_repos/config_pool.c
* subversion/libsvn_repos/dump.c
* subversion/libsvn_repos/fs-wrap.c
* subversion/libsvn_repos/log.c
* subversion/libsvn_subr/bit_array.c
* subversion/libsvn_subr/cache-membuffer.c
* subversion/libsvn_subr/config.c
* subversion/libsvn_subr/dirent_uri.c
* subversion/libsvn_subr/fnv1a.c
* subversion/libsvn_subr/gpg_agent.c
* subversion/libsvn_subr/hash.c
* subversion/libsvn_subr/io.c
* subversion/libsvn_subr/object_pool.c
* subversion/libsvn_subr/packed_data.c
* subversion/libsvn_subr/prefix_string.c
* subversion/libsvn_subr/sorts.c
* subversion/libsvn_subr/sqlite.c
* subversion/libsvn_subr/subst.c
* subversion/libsvn_subr/sysinfo.c
* subversion/libsvn_subr/types.c
* subversion/libsvn_subr/utf.c
* subversion/libsvn_subr/utf8proc/utf8proc_data.c
* subversion/libsvn_subr/x509info.c
* subversion/libsvn_wc/diff.h
* subversion/libsvn_wc/props.c
* subversion/libsvn_wc/update_editor.c
* subversion/libsvn_wc/wc.h
* subversion/libsvn_wc/wc_db.c
* subversion/libsvn_wc/wc_db.h
* subversion/mod_dav_svn/lock.c
* subversion/mod_dav_svn/mod_dav_svn.c
* subversion/mod_dav_svn/status.c
* subversion/svn/auth-cmd.c
* subversion/svn/info-cmd.c
* subversion/svn/mergeinfo-cmd.c
* subversion/svn/notify.c
* subversion/svn/propget-cmd.c
* subversion/svn/svn.c
* subversion/svnadmin/svnadmin.c
* subversion/svnserve/logger.c
* subversion/svnserve/serve.c
* subversion/svnserve/server.h
* subversion/svnserve/svnserve.c
* subversion/tests/cmdline/blame_tests.py
* subversion/tests/cmdline/checkout_tests.py
* subversion/tests/cmdline/commit_tests.py
* subversion/tests/cmdline/export_tests.py
* subversion/tests/cmdline/externals_tests.py
* subversion/tests/cmdline/lock_tests.py
* subversion/tests/cmdline/merge_tests.py
* subversion/tests/cmdline/merge_tree_conflict_tests.py
* subversion/tests/cmdline/move_tests.py
* subversion/tests/cmdline/redirect_tests.py
* subversion/tests/cmdline/stat_tests.py
* subversion/tests/cmdline/svnadmin_tests.py
* subversion/tests/cmdline/switch_tests.py
* subversion/tests/cmdline/update_tests.py
* subversion/tests/libsvn_client/client-test.c
* subversion/tests/libsvn_client/mtcc-test.c
* subversion/tests/libsvn_fs/fs-test.c
* subversion/tests/libsvn_fs/locks-test.c
* subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c
* subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
* subversion/tests/libsvn_fs_x/fs-x-pack-test.c
* subversion/tests/libsvn_fs_x/string-table-test.c
* subversion/tests/libsvn_ra/ra-test.c
* subversion/tests/libsvn_subr/cache-test.c
* subversion/tests/libsvn_subr/checksum-test.c
* subversion/tests/libsvn_subr/config-test.c
* subversion/tests/libsvn_subr/io-test.c
* subversion/tests/libsvn_subr/packed-data-test.c
* subversion/tests/libsvn_subr/priority-queue-test.c
* subversion/tests/libsvn_subr/sqlite-test.c
* subversion/tests/libsvn_subr/string-test.c
* subversion/tests/libsvn_subr/subst_translate-test.c
* subversion/tests/libsvn_subr/x509-test.c
* subversion/tests/libsvn_wc/op-depth-test.c
* subversion/tests/svn_test_main.c
* tools/dev/benchmarks/RepoPerf/copy_repo.py
* tools/dev/benchmarks/RepoPerf/win_repo_bench.py
* tools/dev/build-svn-deps-win.pl
* tools/dev/fsfs-access-map.c
* tools/dev/po-merge.py
* tools/dev/x509-parser.c
* tools/diff/diff.c
* tools/dist/backport.pl
* tools/dist/backport_tests.py
* tools/hook-scripts/mailer/mailer.py
* tools/server-side/svnpubsub/daemonize.py
* win-tests.py
Remove unneeded whitespace via script.
Modified:
subversion/trunk/.ycm_extra_conf.py
subversion/trunk/build/generator/gen_win.py
subversion/trunk/build/generator/gen_win_dependencies.py
subversion/trunk/subversion/bindings/javahl/native/EditorProxy.h
subversion/trunk/subversion/bindings/javahl/native/StateReporter.cpp
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb
subversion/trunk/subversion/bindings/swig/ruby/test/util.rb
subversion/trunk/subversion/bindings/swig/ruby/test/windows_util.rb
subversion/trunk/subversion/include/private/svn_fs_fs_private.h
subversion/trunk/subversion/include/private/svn_packed_data.h
subversion/trunk/subversion/include/private/svn_repos_private.h
subversion/trunk/subversion/include/private/svn_sorts_private.h
subversion/trunk/subversion/include/private/svn_subr_private.h
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/include/svn_auth.h
subversion/trunk/subversion/include/svn_cache_config.h
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/include/svn_cmdline.h
subversion/trunk/subversion/include/svn_diff.h
subversion/trunk/subversion/include/svn_fs.h
subversion/trunk/subversion/include/svn_io.h
subversion/trunk/subversion/include/svn_ra.h
subversion/trunk/subversion/include/svn_repos.h
subversion/trunk/subversion/include/svn_string.h
subversion/trunk/subversion/libsvn_client/blame.c
subversion/trunk/subversion/libsvn_client/commit.c
subversion/trunk/subversion/libsvn_client/commit_util.c
subversion/trunk/subversion/libsvn_client/copy.c
subversion/trunk/subversion/libsvn_client/diff.c
subversion/trunk/subversion/libsvn_client/externals.c
subversion/trunk/subversion/libsvn_client/log.c
subversion/trunk/subversion/libsvn_client/patch.c
subversion/trunk/subversion/libsvn_client/ra.c
subversion/trunk/subversion/libsvn_client/update.c
subversion/trunk/subversion/libsvn_delta/svndiff.c
subversion/trunk/subversion/libsvn_diff/parse-diff.c
subversion/trunk/subversion/libsvn_fs/fs-loader.c
subversion/trunk/subversion/libsvn_fs_base/lock.c
subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/libsvn_fs_fs/hotcopy.c
subversion/trunk/subversion/libsvn_fs_fs/id.c
subversion/trunk/subversion/libsvn_fs_fs/index.c
subversion/trunk/subversion/libsvn_fs_fs/index.h
subversion/trunk/subversion/libsvn_fs_fs/lock.c
subversion/trunk/subversion/libsvn_fs_fs/low_level.c
subversion/trunk/subversion/libsvn_fs_fs/low_level.h
subversion/trunk/subversion/libsvn_fs_fs/pack.c
subversion/trunk/subversion/libsvn_fs_fs/recovery.c
subversion/trunk/subversion/libsvn_fs_fs/rev_file.c
subversion/trunk/subversion/libsvn_fs_fs/revprops.c
subversion/trunk/subversion/libsvn_fs_fs/revprops.h
subversion/trunk/subversion/libsvn_fs_fs/stats.c
subversion/trunk/subversion/libsvn_fs_fs/transaction.c
subversion/trunk/subversion/libsvn_fs_fs/tree.c
subversion/trunk/subversion/libsvn_fs_fs/verify.c
subversion/trunk/subversion/libsvn_fs_x/cached_data.c
subversion/trunk/subversion/libsvn_fs_x/changes.c
subversion/trunk/subversion/libsvn_fs_x/dag.h
subversion/trunk/subversion/libsvn_fs_x/fs.h
subversion/trunk/subversion/libsvn_fs_x/fs_id.c
subversion/trunk/subversion/libsvn_fs_x/fs_x.c
subversion/trunk/subversion/libsvn_fs_x/hotcopy.c
subversion/trunk/subversion/libsvn_fs_x/hotcopy.h
subversion/trunk/subversion/libsvn_fs_x/index.c
subversion/trunk/subversion/libsvn_fs_x/index.h
subversion/trunk/subversion/libsvn_fs_x/lock.c
subversion/trunk/subversion/libsvn_fs_x/lock.h
subversion/trunk/subversion/libsvn_fs_x/low_level.c
subversion/trunk/subversion/libsvn_fs_x/low_level.h
subversion/trunk/subversion/libsvn_fs_x/noderevs.c
subversion/trunk/subversion/libsvn_fs_x/pack.c
subversion/trunk/subversion/libsvn_fs_x/reps.c
subversion/trunk/subversion/libsvn_fs_x/rev_file.c
subversion/trunk/subversion/libsvn_fs_x/revprops.c
subversion/trunk/subversion/libsvn_fs_x/revprops.h
subversion/trunk/subversion/libsvn_fs_x/string_table.c
subversion/trunk/subversion/libsvn_fs_x/string_table.h
subversion/trunk/subversion/libsvn_fs_x/transaction.c
subversion/trunk/subversion/libsvn_fs_x/tree.c
subversion/trunk/subversion/libsvn_fs_x/util.c
subversion/trunk/subversion/libsvn_fs_x/verify.c
subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c
subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
subversion/trunk/subversion/libsvn_ra_serf/serf.c
subversion/trunk/subversion/libsvn_ra_serf/update.c
subversion/trunk/subversion/libsvn_ra_serf/util.c
subversion/trunk/subversion/libsvn_ra_svn/client.c
subversion/trunk/subversion/libsvn_ra_svn/marshal.c
subversion/trunk/subversion/libsvn_repos/authz_pool.c
subversion/trunk/subversion/libsvn_repos/config_pool.c
subversion/trunk/subversion/libsvn_repos/dump.c
subversion/trunk/subversion/libsvn_repos/fs-wrap.c
subversion/trunk/subversion/libsvn_repos/log.c
subversion/trunk/subversion/libsvn_subr/bit_array.c
subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
subversion/trunk/subversion/libsvn_subr/config.c
subversion/trunk/subversion/libsvn_subr/dirent_uri.c
subversion/trunk/subversion/libsvn_subr/fnv1a.c
subversion/trunk/subversion/libsvn_subr/gpg_agent.c
subversion/trunk/subversion/libsvn_subr/hash.c
subversion/trunk/subversion/libsvn_subr/io.c
subversion/trunk/subversion/libsvn_subr/object_pool.c
subversion/trunk/subversion/libsvn_subr/packed_data.c
subversion/trunk/subversion/libsvn_subr/prefix_string.c
subversion/trunk/subversion/libsvn_subr/sorts.c
subversion/trunk/subversion/libsvn_subr/sqlite.c
subversion/trunk/subversion/libsvn_subr/subst.c
subversion/trunk/subversion/libsvn_subr/sysinfo.c
subversion/trunk/subversion/libsvn_subr/types.c
subversion/trunk/subversion/libsvn_subr/utf.c
subversion/trunk/subversion/libsvn_subr/utf8proc/utf8proc_data.c
subversion/trunk/subversion/libsvn_subr/x509info.c
subversion/trunk/subversion/libsvn_wc/diff.h
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/wc.h
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
subversion/trunk/subversion/mod_dav_svn/lock.c
subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
subversion/trunk/subversion/mod_dav_svn/status.c
subversion/trunk/subversion/svn/auth-cmd.c
subversion/trunk/subversion/svn/info-cmd.c
subversion/trunk/subversion/svn/mergeinfo-cmd.c
subversion/trunk/subversion/svn/notify.c
subversion/trunk/subversion/svn/propget-cmd.c
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/svnadmin/svnadmin.c
subversion/trunk/subversion/svnserve/logger.c
subversion/trunk/subversion/svnserve/serve.c
subversion/trunk/subversion/svnserve/server.h
subversion/trunk/subversion/svnserve/svnserve.c
subversion/trunk/subversion/tests/cmdline/blame_tests.py
subversion/trunk/subversion/tests/cmdline/checkout_tests.py
subversion/trunk/subversion/tests/cmdline/commit_tests.py
subversion/trunk/subversion/tests/cmdline/export_tests.py
subversion/trunk/subversion/tests/cmdline/externals_tests.py
subversion/trunk/subversion/tests/cmdline/lock_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/trunk/subversion/tests/cmdline/move_tests.py
subversion/trunk/subversion/tests/cmdline/redirect_tests.py
subversion/trunk/subversion/tests/cmdline/stat_tests.py
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/switch_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
subversion/trunk/subversion/tests/libsvn_client/client-test.c
subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c
subversion/trunk/subversion/tests/libsvn_fs/fs-test.c
subversion/trunk/subversion/tests/libsvn_fs/locks-test.c
subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c
subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c
subversion/trunk/subversion/tests/libsvn_ra/ra-test.c
subversion/trunk/subversion/tests/libsvn_subr/cache-test.c
subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c
subversion/trunk/subversion/tests/libsvn_subr/config-test.c
subversion/trunk/subversion/tests/libsvn_subr/io-test.c
subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c
subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c
subversion/trunk/subversion/tests/libsvn_subr/sqlite-test.c
subversion/trunk/subversion/tests/libsvn_subr/string-test.c
subversion/trunk/subversion/tests/libsvn_subr/subst_translate-test.c
subversion/trunk/subversion/tests/libsvn_subr/x509-test.c
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
subversion/trunk/subversion/tests/svn_test_main.c
subversion/trunk/tools/dev/benchmarks/RepoPerf/copy_repo.py
subversion/trunk/tools/dev/benchmarks/RepoPerf/win_repo_bench.py
subversion/trunk/tools/dev/build-svn-deps-win.pl
subversion/trunk/tools/dev/fsfs-access-map.c
subversion/trunk/tools/dev/po-merge.py
subversion/trunk/tools/dev/x509-parser.c
subversion/trunk/tools/diff/diff.c
subversion/trunk/tools/dist/backport.pl
subversion/trunk/tools/dist/backport_tests.py
subversion/trunk/tools/hook-scripts/mailer/mailer.py
subversion/trunk/tools/server-side/svnpubsub/daemonize.py
subversion/trunk/win-tests.py
Modified: subversion/trunk/.ycm_extra_conf.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/.ycm_extra_conf.py?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/.ycm_extra_conf.py (original)
+++ subversion/trunk/.ycm_extra_conf.py Fri Feb 13 11:17:40 2015
@@ -31,7 +31,7 @@ import os
import ycm_core
from clang_helpers import PrepareClangFlags
-compilation_database_folder = os.path.dirname(os.path.realpath(__file__))
+compilation_database_folder = os.path.dirname(os.path.realpath(__file__))
if compilation_database_folder:
database = ycm_core.CompilationDatabase( compilation_database_folder )
@@ -79,10 +79,10 @@ def FlagsForFile( filename ):
filename )
do_cache = True
else:
- final_flags = [ ]
- do_cache = False
+ final_flags = [ ]
+ do_cache = False
return {
'flags': final_flags,
- 'do_cache': do_cache
+ 'do_cache': do_cache
}
Modified: subversion/trunk/build/generator/gen_win.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Fri Feb 13 11:17:40 2015
@@ -70,7 +70,7 @@ class WinGeneratorBase(gen_win_dependenc
# On Windows we create svn_private_config.h in the output directory since
# r1370526.
- #
+ #
# Without this replacement all projects include a not-existing file,
# which makes the MSBuild calculation to see whether a project is changed
# far more expensive than necessary.
@@ -86,7 +86,7 @@ class WinGeneratorBase(gen_win_dependenc
printed = []
for lib in sorted(self._libraries.values(), key = lambda s: s.name):
if lib.name in printed:
- continue
+ continue
printed.append(lib.name)
print('Found %s %s' % (lib.name, lib.version))
@@ -761,7 +761,7 @@ class WinGeneratorBase(gen_win_dependenc
"Return the list of include directories for target"
fakeincludes = [ "subversion/include" ]
-
+
for dep in self.get_win_depends(target, FILTER_EXTERNALLIBS):
if dep.external_lib:
for elib in re.findall('\$\(SVN_([^\)]*)_LIBS\)', dep.external_lib):
Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Fri Feb 13
11:17:40 2015
@@ -19,7 +19,7 @@
#
#
#
-# gen_win_dependencies.py
+# gen_win_dependencies.py
#
# base class for generating windows projects, containing the
# dependency locator code shared between the test runner and
@@ -73,22 +73,22 @@ class SVNCommonLibrary:
self.debug_lib_dir = debug_lib_dir
else:
self.debug_lib_dir = lib_dir
-
+
if debug_lib_name:
self.debug_lib_name = debug_lib_name
else:
self.debug_lib_name = lib_name
-
+
if debug_dll_dir:
self.debug_dll_dir = debug_dll_dir
else:
self.debug_dll_dir = dll_dir
-
+
if debug_dll_name:
self.debug_dll_name = debug_dll_name
else:
self.debug_dll_name = dll_name
-
+
self.extra_bin = extra_bin
class GenDependenciesBase(gen_base.GeneratorBase):
@@ -278,7 +278,7 @@ class GenDependenciesBase(gen_base.Gener
if find_libs:
self.find_libraries(False)
-
+
def find_libraries(self, show_warnings):
"find required and optional libraries"
@@ -312,7 +312,7 @@ class GenDependenciesBase(gen_base.Gener
if not self.apr_path:
sys.stderr.write("ERROR: Use '--with-apr' option to configure APR " + \
"location.\n")
- sys.exit(1)
+ sys.exit(1)
inc_base = os.path.join(self.apr_path, 'include')
@@ -391,18 +391,18 @@ class GenDependenciesBase(gen_base.Gener
extra_bin = []
- if dll_dir:
+ if dll_dir:
bin_files = os.listdir(dll_dir)
if debug_dll_dir and os.path.isdir(debug_dll_dir):
debug_bin_files = os.listdir(debug_dll_dir)
else:
- debug_bin_files = bin_files
-
+ debug_bin_files = bin_files
+
for bin in bin_files:
if bin in debug_bin_files:
if re.match('^(lib)?apr[-_].*' + suffix + '(d)?.dll$', bin):
extra_bin.append(bin)
-
+
self._libraries['apr'] = SVNCommonLibrary('apr', inc_path, lib_dir,
lib_name,
apr_version,
debug_lib_dir=debug_lib_dir,
@@ -442,7 +442,7 @@ class GenDependenciesBase(gen_base.Gener
version = (major, minor, patch)
self.aprutil_version = aprutil_version = '%d.%d.%d' % version
-
+
if version < minimal_aprutil_version:
sys.stderr.write("ERROR: apr-util %s or higher is required "
"(%s found)\n" % (
@@ -462,7 +462,7 @@ class GenDependenciesBase(gen_base.Gener
debug_dll_dir = None
dll_name = None
defines.extend(["APU_DECLARE_STATIC"])
-
+
if not os.path.isdir(lib_dir) and \
os.path.isfile(os.path.join(self.apr_util_path, 'lib', lib_name)):
# Installed APR-Util instead of APR-Util-Source
@@ -473,7 +473,7 @@ class GenDependenciesBase(gen_base.Gener
else:
lib_name = 'libaprutil%s.lib' % suffix
lib_dir = os.path.join(self.apr_util_path, 'Release')
-
+
if not os.path.isdir(lib_dir) and \
os.path.isfile(os.path.join(self.apr_util_path, 'lib', lib_name)):
# Installed APR-Util instead of APR-Util-Source
@@ -481,7 +481,7 @@ class GenDependenciesBase(gen_base.Gener
debug_lib_dir = lib_dir
else:
debug_lib_dir = os.path.join(self.apr_util_path, 'Debug')
-
+
dll_name = 'libaprutil%s.dll' % suffix
if os.path.isfile(os.path.join(lib_dir, dll_name)):
dll_dir = lib_dir
@@ -491,13 +491,13 @@ class GenDependenciesBase(gen_base.Gener
debug_dll_dir = None
extra_bin = []
-
+
if dll_dir:
bin_files = os.listdir(dll_dir)
if debug_dll_dir and os.path.isdir(debug_dll_dir):
debug_bin_files = os.listdir(debug_dll_dir)
else:
- debug_bin_files = bin_files
+ debug_bin_files = bin_files
for bin in bin_files:
if bin in debug_bin_files:
@@ -688,7 +688,7 @@ class GenDependenciesBase(gen_base.Gener
# CMake default: zlibstatic.lib (static) and zlib.lib (dll)
lib_name = 'zlibstatic.lib'
else:
- # Standard makefile produces zlib.lib (static) and zdll.lib (dll)
+ # Standard makefile produces zlib.lib (static) and zdll.lib (dll)
lib_name = 'zlib.lib'
debug_lib_name = None
else:
@@ -711,7 +711,7 @@ class GenDependenciesBase(gen_base.Gener
version = tuple(map(int, vermatch.groups()))
self.zlib_version = '%d.%d.%d' % version
-
+
if version < minimal_zlib_version:
sys.stderr.write("ERROR: ZLib %s or higher is required "
"(%s found)\n" % (
@@ -804,10 +804,10 @@ class GenDependenciesBase(gen_base.Gener
def _find_openssl(self, show_warnings):
"Find openssl"
-
+
if not self.openssl_path:
return
-
+
version_path = os.path.join(self.openssl_path, 'inc32/openssl/opensslv.h')
if os.path.isfile(version_path):
# We have an OpenSSL Source location
@@ -840,12 +840,12 @@ class GenDependenciesBase(gen_base.Gener
vermatch = re.search(
r'#\s*define\s+OPENSSL_VERSION_TEXT\s+"OpenSSL\s+((\d+)\.(\d+).(\d+)([^
-]*))',
txt)
-
- version = (int(vermatch.group(2)),
+
+ version = (int(vermatch.group(2)),
int(vermatch.group(3)),
int(vermatch.group(4)))
openssl_version = vermatch.group(1)
-
+
self._libraries['openssl'] = SVNCommonLibrary('openssl', inc_dir, lib_dir,
'ssleay32.lib',
openssl_version,
@@ -1378,7 +1378,7 @@ class GenDependenciesBase(gen_base.Gener
# Amalgamation
inc_dir = sqlite_base
lib_dir = None
- lib_name = None
+ lib_name = None
defines.append('SVN_SQLITE_INLINE')
else:
sys.stderr.write("ERROR: SQLite not found\n")
Modified: subversion/trunk/subversion/bindings/javahl/native/EditorProxy.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/EditorProxy.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/EditorProxy.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/EditorProxy.h Fri Feb 13
11:17:40 2015
@@ -142,7 +142,7 @@ private:
const char* m_repos_root_url; ///< The root of the repository
const char* m_base_relpath; ///< The root of the session within the repo
bool m_found_paths; ///< Returned paths are absolute
-
+
svn_editor_t* m_editor;
const svn_delta_editor_t* m_delta_editor;
void* m_delta_baton;
Modified: subversion/trunk/subversion/bindings/javahl/native/StateReporter.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StateReporter.cpp?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StateReporter.cpp
(original)
+++ subversion/trunk/subversion/bindings/javahl/native/StateReporter.cpp Fri
Feb 13 11:17:40 2015
@@ -83,7 +83,7 @@ StateReporter::setPath(jstring jpath, jl
//DEBUG:fprintf(stderr, " (n) StateReporter::setPath()\n");
if (!m_valid) { throw_reporter_inactive(); return; }
-
+
JNIStringHolder lock_token(jlock_token);
if (JNIUtil::isJavaExceptionThrown())
return;
Modified:
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
(original)
+++
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
Fri Feb 13 11:17:40 2015
@@ -178,7 +178,7 @@ Java_org_apache_subversion_javahl_util_C
ctx.m_config, &value,
ctx.m_section.c_str(), ctx.m_option.c_str(),
default_value.c_str()),
- NULL);
+ NULL);
return JNIUtil::makeJString(value);
}
Modified:
subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
(original)
+++
subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
Fri Feb 13 11:17:40 2015
@@ -130,11 +130,11 @@ static void *convert_pl_revision_range(S
/* this will assign to range */
SWIG_ConvertPtr(value, (void **)&range,
_SWIG_TYPE("svn_opt_revision_range_t *"), 0);
return range;
- }
+ }
- if (SvROK(value)
+ if (SvROK(value)
&& SvTYPE(SvRV(value)) == SVt_PVAV
- && av_len((AV *)SvRV(value)) == 1) {
+ && av_len((AV *)SvRV(value)) == 1) {
/* value is a two-element ARRAY */
AV* array = (AV *)SvRV(value);
svn_opt_revision_t temp_start, temp_end;
@@ -143,17 +143,17 @@ static void *convert_pl_revision_range(S
/* Note: Due to how svn_swig_pl_set_revision works,
* either the passed in svn_opt_revision_t is modified
- * (and the original pointer returned) or a different pointer
+ * (and the original pointer returned) or a different pointer
* is returned. svn_swig_pl_set_revision may return NULL
* only if croak_on_error is FALSE.
*/
- start = svn_swig_pl_set_revision(&temp_start,
- *av_fetch(array, 0, 0),
+ start = svn_swig_pl_set_revision(&temp_start,
+ *av_fetch(array, 0, 0),
croak_on_error, pool);
if (start == NULL)
return NULL;
- end = svn_swig_pl_set_revision(&temp_end,
- *av_fetch(array, 1, 0),
+ end = svn_swig_pl_set_revision(&temp_end,
+ *av_fetch(array, 1, 0),
croak_on_error, pool);
if (end == NULL)
return NULL;
@@ -163,7 +163,7 @@ static void *convert_pl_revision_range(S
range->start = *start;
range->end = *end;
return range;
- }
+ }
if (croak_on_error)
croak("unknown revision range: "
@@ -283,7 +283,7 @@ apr_array_header_t *svn_swig_pl_objs_to_
}
/* Convert a single revision range or an array of revisions ranges
- * Note: We can't simply use svn_swig_pl_to_array() as is, since
+ * Note: We can't simply use svn_swig_pl_to_array() as is, since
* it immediatley checks whether source is an array reference and then
* proceeds to treat this as the "array of ..." case. But a revision range
* may be specified as a (two-element) array. Hence we first try to
@@ -297,7 +297,7 @@ apr_array_header_t *svn_swig_pl_array_to
svn_opt_revision_range_t *range;
if ((range = convert_pl_revision_range(source, &croak_on_error, pool))) {
- apr_array_header_t *temp = apr_array_make(pool, 1,
+ apr_array_header_t *temp = apr_array_make(pool, 1,
sizeof(svn_opt_revision_range_t *));
temp->nelts = 1;
APR_ARRAY_IDX(temp, 0, svn_opt_revision_range_t *) = range;
@@ -306,7 +306,7 @@ apr_array_header_t *svn_swig_pl_array_to
if (SvROK(source) && SvTYPE(SvRV(source)) == SVt_PVAV) {
croak_on_error = TRUE;
- return svn_swig_pl_to_array(source, convert_pl_revision_range,
+ return svn_swig_pl_to_array(source, convert_pl_revision_range,
&croak_on_error, pool);
}
@@ -314,7 +314,7 @@ apr_array_header_t *svn_swig_pl_array_to
/* This return is actually unreachable because of the croak above,
* however, Visual Studio's compiler doesn't like if all paths don't have
- * a return and errors out otherwise. */
+ * a return and errors out otherwise. */
return NULL;
}
@@ -430,8 +430,8 @@ SV *svn_swig_pl_revnums_to_list(const ap
}
/* perl -> c svn_opt_revision_t conversion */
-svn_opt_revision_t *svn_swig_pl_set_revision(svn_opt_revision_t *rev,
- SV *source,
+svn_opt_revision_t *svn_swig_pl_set_revision(svn_opt_revision_t *rev,
+ SV *source,
svn_boolean_t croak_on_error,
apr_pool_t *pool)
{
@@ -471,7 +471,7 @@ svn_opt_revision_t *svn_swig_pl_set_revi
maybe_croak(("unknown opt_revision_t string \"%s\": "
"missing closing brace for \"{DATE}\"", input));
*end = '\0';
- err = svn_parse_date (&matched, &tm,
+ err = svn_parse_date (&matched, &tm,
input + 1, apr_time_now(), pool);
if (err) {
svn_error_clear (err);
@@ -1043,7 +1043,7 @@ svn_error_t *svn_swig_pl_thunk_log_entry
svn_swig_pl_callback_thunk(CALL_SV,
receiver, NULL,
- "SS",
+ "SS",
log_entry, _SWIG_TYPE("svn_log_entry_t *"),
pool, POOLINFO);
Modified:
subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
(original)
+++
subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
Fri Feb 13 11:17:40 2015
@@ -108,7 +108,7 @@ SV *svn_swig_pl_convert_array(const apr_
SV *svn_swig_pl_revnums_to_list(const apr_array_header_t *array);
-svn_opt_revision_t *svn_swig_pl_set_revision(svn_opt_revision_t *rev,
+svn_opt_revision_t *svn_swig_pl_set_revision(svn_opt_revision_t *rev,
SV *source,
svn_boolean_t croak_on_error,
apr_pool_t *pool);
Modified:
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
(original)
+++
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Fri Feb 13 11:17:40 2015
@@ -2376,7 +2376,7 @@ static svn_error_t *parse_fn3_close_revi
}
-static const svn_repos_parse_fns3_t thunk_parse_fns3_vtable =
+static const svn_repos_parse_fns3_t thunk_parse_fns3_vtable =
{
parse_fn3_magic_header_record,
parse_fn3_uuid_record,
Modified:
subversion/trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
(original)
+++
subversion/trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
Fri Feb 13 11:17:40 2015
@@ -743,7 +743,7 @@ static svn_boolean_t
rb_set_pool_if_swig_type_object(VALUE target, VALUE pool)
{
VALUE targets[1];
-
+
targets[0] = target;
if (!NIL_P(find_swig_type_object(1, targets))) {
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_fs.rb Fri Feb 13
11:17:40 2015
@@ -110,7 +110,7 @@ class SvnFsTest < Test::Unit::TestCase
FileUtils.mkdir_p(fs_path)
make_context(log) do |ctx|
- # ### Verify Svn::Error::RaLocalReposOpenFailed in chain
+ # ### Verify Svn::Error::RaLocalReposOpenFailed in chain
assert_raises(Svn::Error::RaCannotCreateSession) do
ctx.log_message(path, rev)
end
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/util.rb
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/util.rb?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/util.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/util.rb Fri Feb 13
11:17:40 2015
@@ -1,4 +1,4 @@
-# ====================================================================
+# ====================================================================
# 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
@@ -91,7 +91,7 @@ module SvnTestUtil
@need_svnserve = need_svnserve
setup_default_variables
setup_tmp
- setup_tmp(@import_path)
+ setup_tmp(@import_path)
setup_repository
add_hooks
setup_svnserve if @need_svnserve
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/windows_util.rb
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/windows_util.rb?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/windows_util.rb
(original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/windows_util.rb Fri Feb
13 11:17:40 2015
@@ -51,7 +51,7 @@ module SvnTestUtil
IO.popen("#{svnserve_path} -d -r #{Svnserve.escape_value(root)}
--listen-host #{@svnserve_host} --listen-port #{@svnserve_port} --pid-file
#{@svnserve_pid_file}")
user = ENV["USERNAME"] || Etc.getlogin
-
+
# Give svnserve a bit of time to start
sleep 1
end
Modified: subversion/trunk/subversion/include/private/svn_fs_fs_private.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_fs_fs_private.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_fs_fs_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_fs_fs_private.h Fri Feb 13
11:17:40 2015
@@ -296,7 +296,7 @@ typedef struct svn_fs_fs__p2l_entry_t
{
/* offset of the first byte that belongs to the item */
apr_off_t offset;
-
+
/* length of the item in bytes */
apr_off_t size;
Modified: subversion/trunk/subversion/include/private/svn_packed_data.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_packed_data.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_packed_data.h (original)
+++ subversion/trunk/subversion/include/private/svn_packed_data.h Fri Feb 13
11:17:40 2015
@@ -221,7 +221,7 @@ svn_packed__byte_count(svn_packed__byte_
/* Return the next number from STREAM as unsigned integer. Returns 0 when
* reading beyond the end of the stream.
*/
-apr_uint64_t
+apr_uint64_t
svn_packed__get_uint(svn_packed__int_stream_t *stream);
/* Return the next number from STREAM as signed integer. Returns 0 when
Modified: subversion/trunk/subversion/include/private/svn_repos_private.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_repos_private.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_repos_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_repos_private.h Fri Feb 13
11:17:40 2015
@@ -164,7 +164,7 @@ typedef struct svn_repos__config_pool_t
/* Create a new configuration pool object with a lifetime determined by
* POOL and return it in *CONFIG_POOL.
- *
+ *
* The THREAD_SAFE flag indicates whether the pool actually needs to be
* thread-safe and POOL must be also be thread-safe if this flag is set.
*/
Modified: subversion/trunk/subversion/include/private/svn_sorts_private.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_sorts_private.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_sorts_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_sorts_private.h Fri Feb 13
11:17:40 2015
@@ -28,7 +28,7 @@
#ifndef SVN_SORTS_PRIVATE_H
#define SVN_SORTS_PRIVATE_H
-#include "../svn_sorts.h"
+#include "../svn_sorts.h"
#ifdef __cplusplus
extern "C" {
Modified: subversion/trunk/subversion/include/private/svn_subr_private.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_subr_private.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_subr_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_subr_private.h Fri Feb 13
11:17:40 2015
@@ -306,7 +306,7 @@ svn__fnv1a_32(const void *input, apr_siz
/**
* Return a 32 bit modified FNV-1a checksum for the first @a len bytes in
* @a input.
- *
+ *
* @note This is a proprietary checksumming algorithm based FNV-1a with
* approximately the same strength. It is up to 4 times faster
* than plain FNV-1a for longer data blocks.
@@ -416,7 +416,7 @@ typedef struct svn_hash__entry_t
/** Reads a single key-value pair from @a stream and returns it in the
* caller-provided @a *entry (members don't need to be pre-initialized).
* @a pool is used to allocate members of @a *entry and for tempoaries.
- *
+ *
* @see #svn_hash_read2 for more details.
*
* @since New in 1.9.
@@ -652,7 +652,7 @@ svn_config__get_default_config(apr_hash_
*/
/* This opaque data struct is an alternative to an INT->VOID hash.
- *
+ *
* Technically, it is an automatically growing packed bit array.
* All indexes not previously set are implicitly 0 and setting it will
* grow the array as needed.
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Fri Feb 13
11:17:40 2015
@@ -1297,7 +1297,7 @@ svn_wc__parse_externals_description(apr_
const char *desc,
svn_boolean_t canonicalize_url,
apr_pool_t *pool);
-
+
/**
* Set @a *editor and @a *edit_baton to an editor that generates
* #svn_wc_status3_t structures and sends them through @a status_func /
@@ -1854,7 +1854,7 @@ svn_wc__acquire_write_lock_for_resolve(c
* If ROOT_RELPATH is not NULL, set *ROOT_RELPATH to the target of the diff
* within the diff namespace. ("" or a single path component).
*
- * If ROOT_IS_FILE is NOT NULL set it
+ * If ROOT_IS_FILE is NOT NULL set it
* the first processor call. (The anchor is LOCAL_ABSPATH or an ancestor of it)
*/
svn_error_t *
Modified: subversion/trunk/subversion/include/svn_auth.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_auth.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_auth.h (original)
+++ subversion/trunk/subversion/include/svn_auth.h Fri Feb 13 11:17:40 2015
@@ -884,7 +884,7 @@ svn_auth_get_platform_specific_client_pr
* @note An administrative password reset may invalidate the account's
* secret key. This function will detect that situation and behave as
* if the password were not cached at all.
- * @deprecated Provided for backwards compatibility with the 1.8 API. Use
+ * @deprecated Provided for backwards compatibility with the 1.8 API. Use
* svn_auth_get_platform_specific_provider with provider_name of "windows"
* and provider_type of "simple".
*/
Modified: subversion/trunk/subversion/include/svn_cache_config.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_cache_config.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_cache_config.h (original)
+++ subversion/trunk/subversion/include/svn_cache_config.h Fri Feb 13 11:17:40
2015
@@ -43,7 +43,7 @@ extern "C" {
@note Do not extend this data structure as this would break binary
compatibility.
-
+
@since New in 1.7.
*/
typedef struct svn_cache_config_t
Modified: subversion/trunk/subversion/include/svn_client.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Fri Feb 13 11:17:40 2015
@@ -2724,7 +2724,7 @@ svn_client_status(svn_revnum_t *result_r
*
* If @a include_merged_revisions is set, log information for revisions
* which have been merged to @a targets will also be returned.
- *
+ *
* If @a revprops is NULL, retrieve all revision properties; else, retrieve
* only the revision properties named by the (const char *) array elements
* (i.e. retrieve none if the array is empty).
@@ -4510,7 +4510,7 @@ typedef struct svn_client_copy_source_t
* If the copy source is a working copy, then all externals must be checked
* out, be at a single-revision, contain no local modifications, and contain
* no switched subtrees. Else, #SVN_ERR_WC_PATH_UNEXPECTED_STATUS is returned.
- *
+ *
* If non-NULL, @a externals_to_pin restricts pinning to a subset of externals.
* It is a hash table keyed by either a local absolute path or a URL at which
* an svn:externals property is set. The hash table contains
apr_array_header_t*
Modified: subversion/trunk/subversion/include/svn_cmdline.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_cmdline.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_cmdline.h (original)
+++ subversion/trunk/subversion/include/svn_cmdline.h Fri Feb 13 11:17:40 2015
@@ -342,7 +342,7 @@ svn_cmdline_auth_plaintext_passphrase_pr
*
* @a trust_server_cert_other_failure: If @c TRUE, accept certificates
* even if any other verification failure than the above occured.
- *
+ *
* @a cfg is the @c SVN_CONFIG_CATEGORY_CONFIG configuration, and
* @a cancel_func and @a cancel_baton control the cancellation of the
* prompting providers that are initialized.
@@ -370,7 +370,7 @@ svn_cmdline_create_auth_baton2(svn_auth_
/* Like svn_cmdline_create_auth_baton2, but with only one trust_server_cert
* option which corresponds to trust_server_cert_unknown_ca.
- *
+ *
* @deprecated Provided for backward compatibility with the 1.8 API.
* @since New in 1.6.
*/
Modified: subversion/trunk/subversion/include/svn_diff.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_diff.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_diff.h (original)
+++ subversion/trunk/subversion/include/svn_diff.h Fri Feb 13 11:17:40 2015
@@ -1056,7 +1056,7 @@ typedef struct svn_diff_hunk_t svn_diff_
/**
* Allocate @a *stringbuf in @a result_pool, and read into it one line
* of the diff text of @a hunk. The hunk header is not returned only the
- * unidiff data lines (starting with '+', '-', or ' ') are returned.
+ * unidiff data lines (starting with '+', '-', or ' ') are returned.
* If the @a hunk is being interpreted in reverse (i.e. the reverse
* parameter of svn_diff_parse_next_patch() was @c TRUE), the diff
* text will be returned in reversed form.
@@ -1067,7 +1067,7 @@ typedef struct svn_diff_hunk_t svn_diff_
* Temporary allocations will be performed in @a scratch_pool.
*
* @note The hunk header information can be retrieved with the following
- * functions:
+ * functions:
* @see svn_diff_hunk_get_original_start()
* @see svn_diff_hunk_get_original_length()
* @see svn_diff_hunk_get_modified_start()
Modified: subversion/trunk/subversion/include/svn_fs.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Fri Feb 13 11:17:40 2015
@@ -152,7 +152,7 @@ typedef struct svn_fs_t svn_fs_t;
*
* It is not ready for general production use. Please consult the
* respective release notes on suggested usage scenarios.
- *
+ *
* @since New in 1.9.
*/
#define SVN_FS_TYPE_FSX "fsx"
@@ -346,12 +346,12 @@ typedef enum svn_fs_upgrade_notify_actio
svn_fs_upgrade_format_bumped
} svn_fs_upgrade_notify_action_t;
-/** The type of a upgrade notification function. @a number is specifc
+/** The type of a upgrade notification function. @a number is specifc
* to @a action (see #svn_fs_upgrade_notify_action_t); @a action is the
* type of action being performed. @a baton is the corresponding baton
* for the notification function, and @a pool can be used for temporary
* allocations, but will be cleared between invocations.
- *
+ *
* @since New in 1.9.
*/
typedef svn_error_t *(*svn_fs_upgrade_notify_t)(void *baton,
@@ -393,7 +393,7 @@ svn_fs_upgrade2(const char *path,
* Like svn_fs_upgrade2 but with notify_func, notify_baton, cancel_func
* and cancel_baton being set to NULL.
*
- * @deprecated Provided for backward compatibility with the 1.8 API.
+ * @deprecated Provided for backward compatibility with the 1.8 API.
* @since New in 1.5.
*/
SVN_DEPRECATED
@@ -449,7 +449,7 @@ svn_fs_path(svn_fs_t *fs,
* Return a shallow copy of the configuration parameters used to open
* @a fs, allocated in @a pool. It may be @c NULL. The contents of the
* hash contents remains valid only for @a fs's lifetime.
- *
+ *
* @note This is just what was passed to svn_fs_create() or svn_fs_open().
* You may not modify it.
*
@@ -872,7 +872,7 @@ svn_fs_access_add_lock_token(svn_fs_acce
*/
/** Defines the possible ways two arbitrary nodes may be related.
- *
+ *
* @since New in 1.9.
*/
typedef enum svn_fs_node_relation_t
@@ -1137,7 +1137,7 @@ svn_fs_begin_txn(svn_fs_txn_t **txn_p,
* new revision will have svn:date set to the current time at some
* point during the commit and any svn:date on the transaction will be
* lost.
- *
+ *
* If @a conflict_p is non-zero, use it to provide details on any
* conflicts encountered merging @a txn with the most recent committed
* revisions. If a conflict occurs, set @a *conflict_p to the path of
Modified: subversion/trunk/subversion/include/svn_io.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_io.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_io.h (original)
+++ subversion/trunk/subversion/include/svn_io.h Fri Feb 13 11:17:40 2015
@@ -693,7 +693,7 @@ svn_io_files_contents_three_same_p(svn_b
*
* Use @a pool for memory allocations.
*
- * @since
+ * @since
*/
svn_error_t *
svn_io_file_create(const char *file,
@@ -720,7 +720,7 @@ svn_io_file_create_bytes(const char *fil
apr_pool_t *pool);
/** Create an empty file at utf8-encoded path @a file.
- *
+ *
* @a file must not already exist. If an error occurs while
* closing the file, attempt to delete the file before returning the error.
*
Modified: subversion/trunk/subversion/include/svn_ra.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_ra.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_ra.h (original)
+++ subversion/trunk/subversion/include/svn_ra.h Fri Feb 13 11:17:40 2015
@@ -289,7 +289,7 @@ typedef svn_boolean_t (*svn_ra_check_tun
* This function will be called when the pool that owns the tunnel
* connection is cleared or destroyed.
*
- * @a tunnel_context is the baton as returned from the
+ * @a tunnel_context is the baton as returned from the
* svn_ra_open_tunnel_func_t.
*
* @a tunnel_baton was returned by the open-tunnel callback.
Modified: subversion/trunk/subversion/include/svn_repos.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Fri Feb 13 11:17:40 2015
@@ -3749,7 +3749,7 @@ svn_repos_authz_check_access(svn_authz_t
typedef enum svn_repos_revision_access_level_t
{
/** no access allowed to the revision properties and all changed-paths
- * information. */
+ * information. */
svn_repos_revision_access_none,
/** access granted to some (svn:date and svn:author) revision properties and
* changed-paths information on paths the read has access to. */
Modified: subversion/trunk/subversion/include/svn_string.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_string.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_string.h (original)
+++ subversion/trunk/subversion/include/svn_string.h Fri Feb 13 11:17:40 2015
@@ -443,7 +443,7 @@ svn_string_compare_stringbuf(const svn_s
*/
/** Divide @a input into substrings, interpreting any char from @a sep
- * as a token separator.
+ * as a token separator.
*
* Return an array of copies of those substrings (plain const char*),
* allocating both the array and the copies in @a pool.
Modified: subversion/trunk/subversion/libsvn_client/blame.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/blame.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/blame.c (original)
+++ subversion/trunk/subversion/libsvn_client/blame.c Fri Feb 13 11:17:40 2015
@@ -662,7 +662,7 @@ svn_client_blame5(const char *target,
target, peg_revision,
&younger_end,
ctx, pool));
-
+
/* Make the session point to the real URL. */
SVN_ERR(svn_ra_reparent(ra_session, loc->url, pool));
}
@@ -740,7 +740,7 @@ svn_client_blame5(const char *target,
revision. */
SVN_ERR(svn_ra_get_latest_revnum(ra_session, &youngest, frb.currpool));
SVN_ERR(svn_ra_get_file_revs2(ra_session, "",
- start_revnum
+ start_revnum
- (0 < start_revnum && start_revnum <=
end_revnum ? 1 : 0)
+ (youngest > start_revnum && start_revnum >
end_revnum ? 1 : 0),
end_revnum, include_merged_revisions,
Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Fri Feb 13 11:17:40 2015
@@ -242,8 +242,8 @@ post_process_commit_item(svn_wc_committe
remove_lock = (! keep_locks && (item->state_flags
& SVN_CLIENT_COMMIT_ITEM_LOCK_TOKEN));
- /* When the node was deleted (or replaced), we need to always remove the
- locks, as they're invalidated on the server. We cannot honor the
+ /* When the node was deleted (or replaced), we need to always remove the
+ locks, as they're invalidated on the server. We cannot honor the
SVN_CLIENT_COMMIT_ITEM_LOCK_TOKEN flag here because it does not tell
us whether we have locked children. */
if (item->state_flags & SVN_CLIENT_COMMIT_ITEM_DELETE)
@@ -252,7 +252,7 @@ post_process_commit_item(svn_wc_committe
return svn_error_trace(
svn_wc_queue_committed4(queue, wc_ctx, item->path,
loop_recurse,
- 0 != (item->state_flags &
+ 0 != (item->state_flags &
(SVN_CLIENT_COMMIT_ITEM_ADD
| SVN_CLIENT_COMMIT_ITEM_DELETE
| SVN_CLIENT_COMMIT_ITEM_TEXT_MODS
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Fri Feb 13 11:17:40
2015
@@ -1559,7 +1559,7 @@ do_item_commit(void **dir_baton,
file_pool = pool;
/* Subpools are cheap, but memory isn't */
- file_pool = svn_pool_create(file_pool);
+ file_pool = svn_pool_create(file_pool);
/* Call the cancellation function. */
if (ctx->cancel_func)
Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Fri Feb 13 11:17:40 2015
@@ -1311,7 +1311,7 @@ queue_externals_change_path_infos(apr_ar
for (i = 0; i < path_infos->nelts; i++)
{
path_driver_info_t *existing_info;
-
+
existing_info = APR_ARRAY_IDX(path_infos, i, path_driver_info_t *);
if (strcmp(src_url, existing_info->src_url) == 0)
{
@@ -1750,7 +1750,7 @@ repos_to_repos_copy(const apr_array_head
for (i = 0; i < pin_externals_only_infos->nelts; i++)
{
path_driver_info_t *info;
-
+
info = APR_ARRAY_IDX(pin_externals_only_infos, i, path_driver_info_t
*);
APR_ARRAY_PUSH(paths, const char *) = info->dst_path;
svn_hash_sets(action_hash, info->dst_path, info);
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Fri Feb 13 11:17:40 2015
@@ -2207,7 +2207,7 @@ do_diff(const char **root_relpath,
SVN_ERR(svn_dirent_get_absolute(&abspath1, path_or_url1,
scratch_pool));
- SVN_ERR(svn_dirent_get_absolute(&abspath2, path_or_url2,
+ SVN_ERR(svn_dirent_get_absolute(&abspath2, path_or_url2,
scratch_pool));
/* ### What about ddi? */
Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Fri Feb 13 11:17:40
2015
@@ -171,7 +171,7 @@ switch_dir_external(const char *local_ab
if (revision->kind == svn_opt_revision_number)
external_rev = revision->value.number;
- /*
+ /*
* The code below assumes existing versioned paths are *not* part of
* the external's defining working copy.
* The working copy library does not support registering externals
Modified: subversion/trunk/subversion/libsvn_client/log.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/log.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/log.c (original)
+++ subversion/trunk/subversion/libsvn_client/log.c Fri Feb 13 11:17:40 2015
@@ -303,7 +303,7 @@ limit_receiver(void *baton, svn_log_entr
The limitations on TARGETS specified by svn_client_log5 are enforced here.
So TARGETS can only contain a single WC path or a URL and zero or more
- relative paths -- anything else will raise an error.
+ relative paths -- anything else will raise an error.
PEG_REVISION, TARGETS, and CTX are as per svn_client_log5.
@@ -642,7 +642,7 @@ run_ra_get_log(apr_array_header_t *revis
apr_array_header_t *log_segments,
svn_client__pathrev_t *actual_loc,
svn_ra_session_t *ra_session,
- /* The following are as per svn_client_log5. */
+ /* The following are as per svn_client_log5. */
const apr_array_header_t *targets,
int limit,
svn_boolean_t discover_changed_paths,
@@ -761,7 +761,7 @@ run_ra_get_log(apr_array_header_t *revis
So to be safe we handle that case. */
if (matching_segment == NULL)
continue;
-
+
/* A segment with a NULL path means there is gap in the history.
We'll just proceed and let svn_ra_get_log2 fail with a useful
error...*/
Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Fri Feb 13 11:17:40 2015
@@ -1795,7 +1795,7 @@ get_hunk_info(hunk_info_t **hi, patch_ta
&& (!matched_line
|| (matched_line > original_start
&& (matched_line - original_start
- > original_start - search_start))))
+ > original_start - search_start))))
{
svn_linenum_t search_start2 = 1;
Modified: subversion/trunk/subversion/libsvn_client/ra.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/ra.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/ra.c (original)
+++ subversion/trunk/subversion/libsvn_client/ra.c Fri Feb 13 11:17:40 2015
@@ -706,7 +706,7 @@ repos_locations(const char **start_url,
|| (SVN_IS_VALID_REVNUM(end_revnum) && (end_revnum > youngest_rev)))
return svn_error_createf(SVN_ERR_FS_NO_SUCH_REVISION, NULL,
_("No such revision %ld"),
- (start_revnum > youngest_rev)
+ (start_revnum > youngest_rev)
? start_revnum : end_revnum);
if (start_url)
Modified: subversion/trunk/subversion/libsvn_client/update.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/update.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/update.c (original)
+++ subversion/trunk/subversion/libsvn_client/update.c Fri Feb 13 11:17:40 2015
@@ -198,7 +198,7 @@ record_conflict(svn_wc_conflict_result_t
is not null.
Use RA_SESSION_P to run the update if it is not NULL. If it is then
- open a new ra session and place it in RA_SESSION_P. This allows
+ open a new ra session and place it in RA_SESSION_P. This allows
repeated calls to update_internal to reuse the same session.
*/
static svn_error_t *
Modified: subversion/trunk/subversion/libsvn_delta/svndiff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/svndiff.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/svndiff.c (original)
+++ subversion/trunk/subversion/libsvn_delta/svndiff.c Fri Feb 13 11:17:40 2015
@@ -360,7 +360,7 @@ decode_size(apr_size_t *val,
const unsigned char *result = svn__decode_uint(&temp, p, end);
if (temp > APR_SIZE_MAX)
return NULL;
-
+
*val = (apr_size_t)temp;
return result;
}
@@ -494,7 +494,7 @@ zlib_decode(const unsigned char *in, apr
compressed.data = (char *)in;
compressed.len = inLen;
compressed.blocksize = inLen + 1;
-
+
return svn__decompress(&compressed, out, limit);
}
@@ -796,7 +796,7 @@ read_one_byte(unsigned char *byte, svn_s
return SVN_NO_ERROR;
}
-/* Read and decode one integer from STREAM into *SIZE.
+/* Read and decode one integer from STREAM into *SIZE.
Increment *BYTE_COUNTER by the number of chars we have read. */
static svn_error_t *
read_one_size(apr_size_t *size,
Modified: subversion/trunk/subversion/libsvn_diff/parse-diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/parse-diff.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/parse-diff.c Fri Feb 13 11:17:40
2015
@@ -532,7 +532,7 @@ parse_mergeinfo(svn_boolean_t *found_mer
}
else
SVN_ERR(err);
-
+
if (mergeinfo)
{
if (hunk->original_length > 0) /* reverse merges */
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Fri Feb 13 11:17:40 2015
@@ -1691,7 +1691,7 @@ svn_fs_lock(svn_lock_t **lock, svn_fs_t
apr_pool_t *pool)
{
apr_hash_t *targets = apr_hash_make(pool);
- svn_fs_lock_target_t target;
+ svn_fs_lock_target_t target;
svn_error_t *err;
struct lock_baton_t baton = {0};
@@ -1710,7 +1710,7 @@ svn_fs_lock(svn_lock_t **lock, svn_fs_t
svn_error_compose(err, baton.fs_err);
else if (!err)
err = baton.fs_err;
-
+
return svn_error_trace(err);
}
@@ -1958,7 +1958,7 @@ svn_fs_info_dup(const void *info_void,
fs_library_vtable_t *vtable;
SVN_ERR(get_library_vtable(&vtable, info->fs_type, scratch_pool));
-
+
if (vtable->info_fsap_dup)
return vtable->info_fsap_dup(info_void, result_pool);
else
Modified: subversion/trunk/subversion/libsvn_fs_base/lock.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/lock.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/lock.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/lock.c Fri Feb 13 11:17:40 2015
@@ -261,7 +261,7 @@ svn_fs_base__lock(svn_fs_t *fs,
args.expiration_date = expiration_date;
args.current_rev = target->current_rev;
args.result_pool = result_pool;
-
+
err = svn_fs_base__retry_txn(fs, txn_body_lock, &args, TRUE,
scratch_pool);
if (!cb_err && lock_callback)
Modified: subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/cached_data.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/cached_data.c Fri Feb 13 11:17:40
2015
@@ -631,7 +631,7 @@ typedef struct rep_state_t
-1 if the offset is yet unknown. */
apr_off_t current;/* The current offset relative to START. */
apr_off_t size; /* The on-disk size of the representation. */
- int ver; /* If a delta, what svndiff version?
+ int ver; /* If a delta, what svndiff version?
-1 for unknown delta version. */
int chunk_index; /* number of the window to read */
} rep_state_t;
@@ -991,7 +991,7 @@ svn_fs_fs__rep_chain_length(int *chain_l
int count = 0;
int shards = 1;
svn_revnum_t last_shard = rep->revision / shard_size;
-
+
/* Check whether the length of the deltification chain is acceptable.
* Otherwise, shared reps may form a non-skipping delta chain in
* extreme cases. */
@@ -1104,7 +1104,7 @@ struct rep_read_baton
/* The text we've been reading, if we're going to cache it. */
svn_stringbuf_t *current_fulltext;
- /* If not NULL, attempt to read the data from this cache.
+ /* If not NULL, attempt to read the data from this cache.
Once that lookup fails, reset it to NULL. */
svn_cache__t *fulltext_cache;
@@ -1550,7 +1550,7 @@ read_plain_window(svn_stringbuf_t **nwin
apr_pool_t *scratch_pool)
{
apr_off_t offset;
-
+
/* RS->FILE may be shared between RS instances -> make sure we point
* to the right data. */
SVN_ERR(auto_open_shared_file(rs->sfile));
@@ -2001,7 +2001,7 @@ rep_read_contents(void *baton,
&rb->src_state, &rb->len, rb->fs, &rb->rep,
rb->filehandle_pool));
- /* In case we did read from the fulltext cache before, make the
+ /* In case we did read from the fulltext cache before, make the
* window stream catch up. Also, initialize the fulltext buffer
* if we want to cache the fulltext at the end. */
SVN_ERR(skip_contents(rb, rb->fulltext_delivered));
@@ -2788,7 +2788,7 @@ init_rep_state(rep_state_t *rs,
/* this function does not apply to representation containers */
SVN_ERR_ASSERT(entry->type >= SVN_FS_FS__ITEM_TYPE_FILE_REP
&& entry->type <= SVN_FS_FS__ITEM_TYPE_DIR_PROPS);
-
+
shared_file->rfile = file;
shared_file->fs = fs;
shared_file->revision = entry->item.revision;
@@ -2850,7 +2850,7 @@ get_raw_window_end(void **out,
* at or beyond that offset. Use POOL for temporary allocations.
*
* This function requires RS->RAW_WINDOW_CACHE and RS->WINDOW_CACHE to
- * be non-NULL.
+ * be non-NULL.
*/
static svn_error_t *
cache_windows(svn_fs_t *fs,
@@ -2965,7 +2965,7 @@ block_read_windows(svn_fs_fs__rep_header
SVN_ERR(init_rep_state(&rs, rep_header, fs, rev_file, entry,
result_pool));
-
+
/* RS->FILE may be shared between RS instances -> make sure we point
* to the right data. */
offset = rs.start + rs.current;
@@ -3018,7 +3018,7 @@ read_rep_header(svn_fs_fs__rep_header_t
{
fs_fs_data_t *ffd = fs->fsap_data;
svn_boolean_t is_cached = FALSE;
-
+
if (ffd->rep_header_cache)
{
SVN_ERR(svn_cache__get((void**)rep_header, &is_cached,
@@ -3246,7 +3246,7 @@ block_read(void **result,
/* don't try this on transaction protorev files */
SVN_ERR_ASSERT(SVN_IS_VALID_REVNUM(revision));
-
+
/* index lookup: find the OFFSET of the item we *must* read plus (in the
* "do-while" block) the list of items in the same block. */
SVN_ERR(svn_fs_fs__item_offset(&wanted_offset, fs, revision_file,
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Fri Feb 13 11:17:40 2015
@@ -401,7 +401,7 @@ svn_fs_fs__with_all_locks(svn_fs_t *fs,
fs_fs_data_t *ffd = fs->fsap_data;
/* Be sure to use the correct lock ordering as documented in
- fs_fs_shared_data_t. The lock chain is being created in
+ fs_fs_shared_data_t. The lock chain is being created in
innermost (last to acquire) -> outermost (first to acquire) order. */
with_lock_baton_t *lock_baton
= create_lock_baton(fs, write_lock, body, baton, pool);
@@ -1144,7 +1144,7 @@ create_file_ignore_eexist(const char *fi
return svn_error_trace(err);
}
-/* Baton type bridging svn_fs_fs__upgrade and upgrade_body carrying
+/* Baton type bridging svn_fs_fs__upgrade and upgrade_body carrying
* parameters over between them. */
struct upgrade_baton_t
{
@@ -1287,7 +1287,7 @@ svn_fs_fs__upgrade(svn_fs_t *fs,
baton.notify_baton = notify_baton;
baton.cancel_func = cancel_func;
baton.cancel_baton = cancel_baton;
-
+
return svn_fs_fs__with_all_locks(fs, upgrade_body, (void *)&baton, pool);
}
@@ -1556,7 +1556,7 @@ svn_fs_fs__file_checksum(svn_checksum_t
{
svn_checksum_t temp;
temp.kind = kind;
-
+
switch(kind)
{
case svn_checksum_md5:
Modified: subversion/trunk/subversion/libsvn_fs_fs/hotcopy.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/hotcopy.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/hotcopy.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/hotcopy.c Fri Feb 13 11:17:40 2015
@@ -369,7 +369,7 @@ hotcopy_copy_packed_shard(svn_boolean_t
return SVN_NO_ERROR;
}
-/* Remove file PATH, if it exists - even if it is read-only.
+/* Remove file PATH, if it exists - even if it is read-only.
* Use POOL for temporary allocations. */
static svn_error_t *
hotcopy_remove_file(const char *path,
Modified: subversion/trunk/subversion/libsvn_fs_fs/id.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/id.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/id.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/id.c Fri Feb 13 11:17:40 2015
@@ -232,7 +232,7 @@ svn_fs_fs__id_txn_unparse(const svn_fs_f
{
char string[2 * SVN_INT64_BUFFER_SIZE + 1];
char *p = string;
-
+
p += svn__i64toa(p, txn_id->revision);
*(p++) = '-';
p += svn__ui64tobase36(p, txn_id->number);
@@ -418,7 +418,7 @@ svn_fs_fs__id_txn_create_root(const svn_
fs_fs__id_t *id = apr_pcalloc(pool, sizeof(*id));
/* node ID and copy ID are "0" */
-
+
id->private_id.txn_id = *txn_id;
id->private_id.rev_item.revision = SVN_INVALID_REVNUM;
@@ -598,7 +598,7 @@ svn_fs_fs__id_serialize(svn_temp_seriali
const svn_fs_id_t * const *in)
{
const fs_fs__id_t *id = (const fs_fs__id_t *)*in;
-
+
/* nothing to do for NULL ids */
if (id == NULL)
return;
Modified: subversion/trunk/subversion/libsvn_fs_fs/index.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/index.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/index.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/index.c Fri Feb 13 11:17:40 2015
@@ -87,7 +87,7 @@ typedef struct l2p_page_table_entry_t
/* Master run-time data structure of an log-to-phys index. It contains
* the page tables of every revision covered by that index - but not the
- * pages themselves.
+ * pages themselves.
*/
typedef struct l2p_header_t
{
@@ -498,7 +498,7 @@ stream_write_encoded(svn_stream_t *strea
apr_uint64_t value)
{
unsigned char encoded[ENCODED_INT_LENGTH];
-
+
apr_size_t len = encode_uint(encoded, value);
return svn_error_trace(svn_stream_write(stream, (char *)encoded, &len));
}
@@ -806,7 +806,7 @@ svn_fs_fs__l2p_index_append(svn_checksum
* The current implementation is limited to 2G entries per page. */
if (ffd->l2p_page_size > APR_INT32_MAX)
return svn_error_createf(SVN_ERR_FS_INDEX_OVERFLOW , NULL,
- _("L2P index page size %s"
+ _("L2P index page size %s"
" exceeds current limit of 2G entries"),
apr_psprintf(local_pool, "%" APR_UINT64_T_FMT,
ffd->l2p_page_size));
@@ -869,7 +869,7 @@ svn_fs_fs__l2p_index_append(svn_checksum
return svn_error_createf(SVN_ERR_FS_INDEX_OVERFLOW , NULL,
_("Item index %s too large "
"in l2p proto index for revision %ld"),
- apr_psprintf(local_pool, "%"
APR_UINT64_T_FMT,
+ apr_psprintf(local_pool, "%"
APR_UINT64_T_FMT,
proto_entry.item_index),
revision + page_counts->nelts);
@@ -1277,7 +1277,7 @@ l2p_page_table_access_func(void **out,
/* set output as a courtesy to the caller */
*out = table_baton->pages;
-
+
return SVN_NO_ERROR;
}
@@ -1669,7 +1669,7 @@ l2p_proto_index_lookup(apr_off_t *offset
}
SVN_ERR(svn_io_file_close(file, scratch_pool));
-
+
return SVN_NO_ERROR;
}
@@ -2188,7 +2188,7 @@ get_p2l_header(p2l_header_t **header,
/* allocate result data structure */
result = apr_pcalloc(result_pool, sizeof(*result));
-
+
/* Read table sizes, check them for plausibility and allocate page array. */
SVN_ERR(packed_stream_get(&value, rev_file->p2l_stream));
result->first_revision = (svn_revnum_t)value;
@@ -2282,7 +2282,7 @@ p2l_page_info_copy(p2l_page_info_baton_t
const p2l_header_t *header,
const apr_off_t *offsets)
{
- /* if the requested offset is out of bounds, return info for
+ /* if the requested offset is out of bounds, return info for
* a zero-sized empty page right behind the last page.
*/
if (baton->offset / header->page_size < header->page_count)
@@ -2595,7 +2595,7 @@ get_p2l_keys(p2l_page_info_baton_t *page
apr_pool_t *scratch_pool)
{
p2l_page_info_baton_t page_info;
-
+
/* request info for the index pages that describes the pack / rev file
* contents at pack / rev file position OFFSET. */
page_info.offset = offset;
@@ -2611,7 +2611,7 @@ get_p2l_keys(p2l_page_info_baton_t *page
/* return results */
if (page_info_p)
*page_info_p = page_info;
-
+
/* construct cache key */
if (key_p)
{
@@ -2621,7 +2621,7 @@ get_p2l_keys(p2l_page_info_baton_t *page
key.is_packed = rev_file->is_packed;
key.page = page_info.page_no;
- *key_p = key;
+ *key_p = key;
}
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_fs_fs/index.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/index.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/index.h (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/index.h Fri Feb 13 11:17:40 2015
@@ -71,7 +71,7 @@ svn_fs_fs__l2p_proto_index_add_revision(
* Not all possible index values need to be used. OFFSET may be -1 to
* mark 'invalid' item indexes but that is already implied for all item
* indexes not explicitly given a mapping.
- *
+ *
* Use SCRATCH_POOL for temporary allocations.
*/
svn_error_t *
@@ -83,7 +83,7 @@ svn_fs_fs__l2p_proto_index_add_entry(apr
/* Use the proto index file stored at PROTO_FILE_NAME, construct the final
* log-to-phys index and append it to INDEX_FILE. The first revision will
* be REVISION, entries to the next revision will be assigned to REVISION+1
- * and so forth.
+ * and so forth.
*
* Return the MD5 checksum of the on-disk index data in *CHECKSUM, allocated
* in RESULT_POOL. Use SCRATCH_POOL for temporary allocations.
Modified: subversion/trunk/subversion/libsvn_fs_fs/lock.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/lock.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/lock.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/lock.c Fri Feb 13 11:17:40 2015
@@ -355,7 +355,7 @@ set_lock(const char *fs_path,
always come back empty. */
SVN_ERR(read_digest_file(&children, NULL, fs_path, digest_path, pool));
- SVN_ERR(write_digest_file(children, lock, fs_path, digest_path,
+ SVN_ERR(write_digest_file(children, lock, fs_path, digest_path,
perms_reference, pool));
return SVN_NO_ERROR;
@@ -405,7 +405,7 @@ add_to_digest(const char *fs_path,
}
if (apr_hash_count(children) != original_count)
- SVN_ERR(write_digest_file(children, lock, fs_path, index_digest_path,
+ SVN_ERR(write_digest_file(children, lock, fs_path, index_digest_path,
perms_reference, pool));
return SVN_NO_ERROR;
@@ -438,7 +438,7 @@ delete_from_digest(const char *fs_path,
}
if (apr_hash_count(children) || lock)
- SVN_ERR(write_digest_file(children, lock, fs_path, index_digest_path,
+ SVN_ERR(write_digest_file(children, lock, fs_path, index_digest_path,
perms_reference, pool));
else
SVN_ERR(svn_io_remove_file2(index_digest_path, TRUE, pool));
@@ -1150,7 +1150,7 @@ svn_fs_fs__lock(svn_fs_t *fs,
info->fs_err = svn_error_createf(SVN_ERR_FS_LOCK_OPERATION_FAILED,
0, _("Failed to lock '%s'"),
info->path);
-
+
cb_err = lock_callback(lock_baton, info->path, info->lock,
info->fs_err, scratch_pool);
}
Modified: subversion/trunk/subversion/libsvn_fs_fs/low_level.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/low_level.c?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/low_level.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/low_level.c Fri Feb 13 11:17:40
2015
@@ -499,7 +499,7 @@ svn_fs_fs__read_changes_incrementally(sv
}
while (change);
svn_pool_destroy(iterpool);
-
+
return SVN_NO_ERROR;
}
@@ -725,7 +725,7 @@ svn_fs_fs__parse_representation(represen
/* initialize transaction info (never stored) */
svn_fs_fs__id_txn_reset(&rep->txn_id);
-
+
/* while in transactions, it is legal to simply write "-1" */
str = svn_cstring_tokenize(" ", &string);
if (str == NULL)
@@ -998,7 +998,7 @@ format_digest(const unsigned char *diges
svn_checksum_t checksum;
checksum.digest = digest;
checksum.kind = kind;
-
+
if (is_null)
return "(null)";
@@ -1174,7 +1174,7 @@ svn_fs_fs__write_rep_header(svn_fs_fs__r
apr_pool_t *scratch_pool)
{
const char *text;
-
+
switch (header->type)
{
case svn_fs_fs__rep_plain:
Modified: subversion/trunk/subversion/libsvn_fs_fs/low_level.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/low_level.h?rev=1659509&r1=1659508&r2=1659509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/low_level.h (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/low_level.h Fri Feb 13 11:17:40
2015
@@ -44,7 +44,7 @@
* in *ROOT_OFFSET and the offset of the changed paths list in
* *CHANGES_OFFSET. Offsets are relative to the revision's start offset.
* ROOT_OFFSET and / or CHANGES_OFFSET may be NULL.
- *
+ *
* Note that REV is only used to construct nicer error objects.
*/
svn_error_t *
@@ -66,7 +66,7 @@ svn_fs_fs__unparse_revision_trailer(apr_
* and return the start offsets of the index data in *L2P_OFFSET and
* *P2L_OFFSET, respectively. Also, return the expected checksums in
* in *L2P_CHECKSUM and *P2L_CHECKSUM.
- *
+ *
* Note that REV is only used to construct nicer error objects that
* mention this revision. Allocate the checksums in RESULT_POOL.
*/
