You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2020/03/25 09:04:30 UTC
svn commit: r1875617 [1/3] - in /subversion/trunk: build/ build/generator/
subversion/bindings/javahl/native/ subversion/bindings/swig/python/svn/
subversion/bindings/swig/python/tests/ subversion/include/
subversion/include/private/ subversion/libsvn_...
Author: stsp
Date: Wed Mar 25 09:04:28 2020
New Revision: 1875617
URL: http://svn.apache.org/viewvc?rev=1875617&view=rev
Log:
* everywhere: Run tools/dev/remove-trailing-whitespace.sh to remove
trailing whitespace before we branch 1.14.
Modified:
subversion/trunk/build/generator/gen_vcnet_vcproj.py
subversion/trunk/build/generator/gen_win.py
subversion/trunk/build/generator/gen_win_dependencies.py
subversion/trunk/build/run_tests.py
subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/trunk/subversion/bindings/javahl/native/Path.cpp
subversion/trunk/subversion/bindings/swig/python/svn/fs.py
subversion/trunk/subversion/bindings/swig/python/tests/core.py
subversion/trunk/subversion/bindings/swig/python/tests/repository.py
subversion/trunk/subversion/bindings/swig/python/tests/wc.py
subversion/trunk/subversion/include/private/svn_branch.h
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/include/svn_diff.h
subversion/trunk/subversion/include/svn_ra_svn.h
subversion/trunk/subversion/include/svn_repos.h
subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
subversion/trunk/subversion/libsvn_client/blame.c
subversion/trunk/subversion/libsvn_client/conflicts.c
subversion/trunk/subversion/libsvn_client/mtcc.c
subversion/trunk/subversion/libsvn_diff/diff_file.c
subversion/trunk/subversion/libsvn_diff/parse-diff.c
subversion/trunk/subversion/libsvn_fs/fs-loader.h
subversion/trunk/subversion/libsvn_fs_fs/low_level.c
subversion/trunk/subversion/libsvn_fs_fs/pack.c
subversion/trunk/subversion/libsvn_fs_fs/revprops.c
subversion/trunk/subversion/libsvn_fs_fs/transaction.c
subversion/trunk/subversion/libsvn_fs_x/dag_cache.c
subversion/trunk/subversion/libsvn_fs_x/fs_x.c
subversion/trunk/subversion/libsvn_fs_x/low_level.c
subversion/trunk/subversion/libsvn_fs_x/revprops.c
subversion/trunk/subversion/libsvn_fs_x/transaction.c
subversion/trunk/subversion/libsvn_fs_x/verify.c
subversion/trunk/subversion/libsvn_ra_serf/replay.c
subversion/trunk/subversion/libsvn_ra_serf/serf.c
subversion/trunk/subversion/libsvn_ra_svn/editorp.c
subversion/trunk/subversion/libsvn_repos/authz.c
subversion/trunk/subversion/libsvn_repos/commit.c
subversion/trunk/subversion/libsvn_repos/config_file.c
subversion/trunk/subversion/libsvn_repos/config_file.h
subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c
subversion/trunk/subversion/libsvn_repos/log.c
subversion/trunk/subversion/libsvn_repos/replay.c
subversion/trunk/subversion/libsvn_subr/gpg_agent.c
subversion/trunk/subversion/libsvn_subr/io.c
subversion/trunk/subversion/libsvn_subr/object_pool.c
subversion/trunk/subversion/libsvn_subr/utf8proc/utf8proc_data.c
subversion/trunk/subversion/libsvn_subr/x509parse.c
subversion/trunk/subversion/libsvn_wc/conflicts.c
subversion/trunk/subversion/libsvn_wc/conflicts.h
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c
subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
subversion/trunk/subversion/mod_dav_svn/reports/list.c
subversion/trunk/subversion/mod_dav_svn/reports/log.c
subversion/trunk/subversion/mod_dav_svn/repos.c
subversion/trunk/subversion/svn/cl.h
subversion/trunk/subversion/svn/conflict-callbacks.c
subversion/trunk/subversion/svn/resolve-cmd.c
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/svnadmin/svnadmin.c
subversion/trunk/subversion/svnmucc/svnmucc.c
subversion/trunk/subversion/svnrdump/svnrdump.c
subversion/trunk/subversion/svnsync/svnsync.c
subversion/trunk/subversion/tests/afl/afl-svndiff.c
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/depth_tests.py
subversion/trunk/subversion/tests/cmdline/getopt_tests.py
subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py
subversion/trunk/subversion/tests/cmdline/mod_dav_svn_tests.py
subversion/trunk/subversion/tests/cmdline/move_tests.py
subversion/trunk/subversion/tests/cmdline/relocate_tests.py
subversion/trunk/subversion/tests/cmdline/stat_tests.py
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py
subversion/trunk/subversion/tests/cmdline/svnmover_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/actions.py
subversion/trunk/subversion/tests/cmdline/svntest/wc.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
subversion/trunk/subversion/tests/libsvn_fs/fs-test.c
subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
subversion/trunk/subversion/tests/libsvn_ra/ra-test.c
subversion/trunk/subversion/tests/libsvn_repos/authz-test.c
subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
subversion/trunk/subversion/tests/libsvn_subr/io-test.c
subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/log.c
subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c
subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c
subversion/trunk/tools/client-side/svnconflict/svnconflict.c
subversion/trunk/tools/dev/svnmover/scanlog.c
subversion/trunk/tools/dist/backport.pl
subversion/trunk/tools/dist/backport/merger.py
subversion/trunk/tools/dist/backport/status.py
subversion/trunk/tools/dist/backport_tests.py
subversion/trunk/tools/dist/checksums.py
subversion/trunk/tools/dist/release.py
subversion/trunk/tools/dist/security/_gnupg.py
subversion/trunk/tools/hook-scripts/validate-files.py
Modified: subversion/trunk/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_vcnet_vcproj.py?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/trunk/build/generator/gen_vcnet_vcproj.py Wed Mar 25 09:04:28 2020
@@ -125,7 +125,7 @@ class Generator(gen_win.WinGeneratorBase
if self.vcproj_extension == '.vcproj':
self.write_with_template(fname, 'templates/vcnet_vcproj.ezt', data)
- self.write_with_template(os.path.splitext(fname)[0] + '.vsprops',
+ self.write_with_template(os.path.splitext(fname)[0] + '.vsprops',
'templates/vcnet_vsprops.ezt', data)
else:
self.write_with_template(fname, 'templates/vcnet_vcxproj.ezt', data)
@@ -289,7 +289,7 @@ class Generator(gen_win.WinGeneratorBase
def quote_define(self, value):
"Properly quote special characters in a define (if needed)"
-
+
if self.vcproj_extension == '.vcproj':
return value.replace('"', '""')
else:
Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Wed Mar 25 09:04:28 2020
@@ -746,7 +746,7 @@ class WinGeneratorBase(gen_win_dependenc
fakedefines.append(self.quote_define('SVN_WIN32_CRASHREPORT_EMAIL="users@subversion.apache.org"'))
return fakedefines
-
+
def quote_define(self, value):
"Properly quote special characters in a define (if needed)"
return value
@@ -784,7 +784,7 @@ class WinGeneratorBase(gen_win_dependenc
lang_subdir = 'perl5'
else:
lang_subdir = target.lang
-
+
if target.lang == "python":
lib = self._libraries['py3c']
fakeincludes.extend(lib.include_dirs)
Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Wed Mar 25 09:04:28 2020
@@ -780,7 +780,7 @@ class GenDependenciesBase(gen_base.Gener
if self.bdb_path:
bdb_path = self.bdb_path
-
+
inc_path = os.path.join(bdb_path, 'include')
db_h_path = os.path.join(inc_path, 'db.h')
@@ -1036,10 +1036,10 @@ class GenDependenciesBase(gen_base.Gener
lib_dir = os.path.join(sysconfig.PREFIX, "libs")
except ImportError:
return
-
+
if sys.version_info[0] >= 3:
self.user_macros.append(UserMacro("SWIG_PY_OPTS", "-python -py3"))
- else:
+ else:
self.user_macros.append(UserMacro("SWIG_PY_OPTS", "-python -classic"))
self._libraries['python'] = SVNCommonLibrary('python', inc_dir, lib_dir, None,
@@ -1050,39 +1050,39 @@ class GenDependenciesBase(gen_base.Gener
show_warnings = True
# Assume a default path, unless otherwise specified
py3c_path = "py3c"
-
+
if self.py3c_path:
py3c_path = self.py3c_path
-
+
py3c_path = os.path.abspath(py3c_path)
inc_path = os.path.join(py3c_path, 'include')
py3c_hdr_path = os.path.join(inc_path, 'py3c.h')
-
+
pc_path = os.path.join(py3c_path, 'py3c.pc.in')
-
+
if not os.path.isfile(py3c_hdr_path):
if show_warnings:
print('WARNING: "%s" not found' % py3c_hdr_path)
print('Use "--with-py3c" to configure py3c location.')
return False
-
+
with open(pc_path) as fp:
txt = fp.read()
-
+
ver_match = re.search(r'Version:\s+([0-9.]+)', txt)
-
+
if not ver_match:
if show_warnings:
print("WARNING: Failed to find version in '%s'" % pc_path)
return False
-
+
py3c_version = ver_match.group(1)
-
+
self._libraries['py3c'] = SVNCommonLibrary('py3c', inc_path, None,
None, py3c_version)
-
+
return True
-
+
def _find_jdk(self, show_warnings):
"Find details about an installed jdk"
Modified: subversion/trunk/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Wed Mar 25 09:04:28 2020
@@ -390,7 +390,7 @@ class TestHarness:
lines = prog.stdout.readlines()
for i in range(0, len(lines) - 2):
- self.result.append(TestHarness.Job(i + 1, True, progabs,
+ self.result.append(TestHarness.Job(i + 1, True, progabs,
progdir, progbase))
prog.wait()
@@ -834,7 +834,7 @@ class TestHarness:
progabs, ('.py', 'U', imp.PY_SOURCE))
else:
spec = importlib.util.spec_from_file_location(progbase[:-3], progabs)
- prog_mod = importlib.util.module_from_spec(spec)
+ prog_mod = importlib.util.module_from_spec(spec)
sys.modules[progbase[:-3]] = prog_mod
spec.loader.exec_module(prog_mod)
except:
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp Wed Mar 25 09:04:28 2020
@@ -824,7 +824,7 @@ JNIUtil::checkJavaException(apr_status_t
else
err->message = _("Java exception");
-
+
/* ### TODO: Use apr_pool_userdata_set() on the pool we just created
for the error chain to keep track of the actual Java
exception while the error is inside Subversion.
Modified: subversion/trunk/subversion/bindings/javahl/native/Path.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Path.cpp?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Path.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Path.cpp Wed Mar 25 09:04:28 2020
@@ -33,7 +33,7 @@
#include "JNIStringHolder.h"
#include "Pool.h"
#include "svn_private_config.h"
-
+
/**
* Constructor
*
Modified: subversion/trunk/subversion/bindings/swig/python/svn/fs.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/svn/fs.py?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/svn/fs.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/svn/fs.py Wed Mar 25 09:04:28 2020
@@ -71,7 +71,7 @@ class _PopenStdoutWrapper(object):
try:
self._pobject.wait(10)
except _subprocess.TimeoutExpired:
- self._pobject.kill()
+ self._pobject.kill()
class FileDiff:
def __init__(self, root1, path1, root2, path2, pool=None, diffoptions=[]):
Modified: subversion/trunk/subversion/bindings/swig/python/tests/core.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/core.py?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/core.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/core.py Wed Mar 25 09:04:28 2020
@@ -235,7 +235,7 @@ class SubversionCoreTestCase(unittest.Te
svn.core.svn_stream_write(stream, ostr_unicode)
svn.core.svn_stream_close(stream)
- # As default codec of Python 2 is 'ascii', conversion from unicode to bytes
+ # As default codec of Python 2 is 'ascii', conversion from unicode to bytes
# will be success only if all characters of target strings are in the range
# of \u0000 ~ \u007f.
@unittest.skipUnless(IS_PY3, "test for Python 3 only")
Modified: subversion/trunk/subversion/bindings/swig/python/tests/repository.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/repository.py?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/repository.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/repository.py Wed Mar 25 09:04:28 2020
@@ -365,7 +365,7 @@ class SubversionRepositoryTestCase(unitt
if err != None:
self.assertEqual(err.apr_err, core.SVN_ERR_FS_PATH_ALREADY_LOCKED)
self.errors += 1
-
+
self.calls = 0
self.errors = 0
target = fs.lock_target_create(None, self.rev)
Modified: subversion/trunk/subversion/bindings/swig/python/tests/wc.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/wc.py?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/wc.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/wc.py Wed Mar 25 09:04:28 2020
@@ -182,7 +182,7 @@ class SubversionWorkingCopyTestCase(unit
def test_status_editor_callback_exception(self):
"""test case for status_editor call back not to be crashed by Python exception"""
def status_func(target, status):
- # Note: exception with in this call back doesn't propagate to
+ # Note: exception with in this call back doesn't propagate to
# the caller
raise AssertionError('intentional exception')
Modified: subversion/trunk/subversion/include/private/svn_branch.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_branch.h?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_branch.h (original)
+++ subversion/trunk/subversion/include/private/svn_branch.h Wed Mar 25 09:04:28 2020
@@ -98,7 +98,7 @@ extern "C" {
*
* An element may appear in any or all branches, and its EID is the same in
* each branch in which the element appears.
- *
+ *
* By definition, an element keeps the same EID for its whole lifetime, even
* if deleted from all branches and later 'resurrected'.
*
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=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Wed Mar 25 09:04:28 2020
@@ -1800,7 +1800,7 @@ svn_wc__resolve_conflicts(svn_wc_context
void *notify_baton,
apr_pool_t *scratch_pool);
-/**
+/**
* Resolve the text conflict at LOCAL_ABSPATH as per CHOICE, and then
* mark the conflict resolved.
* The working copy must already be locked for resolving, e.g. by calling
@@ -1817,7 +1817,7 @@ svn_wc__conflict_text_mark_resolved(svn_
void *notify_baton,
apr_pool_t *scratch_pool);
-/**
+/**
* Resolve the conflicted property PROPNAME at LOCAL_ABSPATH as per CHOICE,
* and then mark the conflict resolved. If MERGED_VALUE is not NULL, this is
* the new merged property, used when choosing #svn_wc_conflict_choose_merged.
@@ -1848,7 +1848,7 @@ svn_wc__conflict_prop_mark_resolved(svn_
*
* The tree conflict at LOCAL_ABSPATH must have the following properties or
* SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE will be returned:
- *
+ *
* operation: svn_wc_operation_update or svn_wc_operation_switch
* local change: svn_wc_conflict_reason_deleted or
* svn_wc_conflict_reason_replaced or
@@ -1885,7 +1885,7 @@ svn_wc__conflict_tree_update_break_moved
*
* The tree conflict at LOCAL_ABSPATH must have the following properties or
* SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE will be returned:
- *
+ *
* operation: svn_wc_operation_update or svn_wc_operation_switch
* local change: svn_wc_conflict_reason_deleted or
* svn_wc_conflict_reason_replaced
@@ -1921,7 +1921,7 @@ svn_wc__conflict_tree_update_raise_moved
*
* The tree conflict at LOCAL_ABSPATH must have the following properties or
* SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE will be returned:
- *
+ *
* operation: svn_wc_operation_update or svn_wc_operation_switch
* local change: svn_wc_conflict_reason_moved_away
* incoming change: svn_wc_conflict_action_edit
Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Mar 25 09:04:28 2020
@@ -761,7 +761,7 @@ typedef svn_error_t *(*svn_client_get_co
* of the byte sequences LF ("\n"), CR ("\n"), CR LF ("\r\n") ends a line
* and is not included in @a line. The @a line content can include all other
* byte values including zero (ASCII NUL).
- *
+ *
* @note That is how line splitting is done on the final file content, from
* which this callback is driven. It is not entirely clear whether the line
* splitting used to calculate diffs between each revision and assign a
@@ -4646,7 +4646,7 @@ typedef enum svn_client_conflict_option_
/**
* Set a merged property value on @a option to @a merged_propval.
- *
+ *
* Setting the merged value is required before resolving the property
* conflict using an option with ID svn_client_conflict_option_merged_text.
*
@@ -4715,7 +4715,7 @@ svn_client_conflict_option_get_moved_to_
*
* @a preferred_move_target_idx must be a valid index into the list returned
* by svn_client_conflict_option_get_moved_to_repos_relpath_candidates().
- *
+ *
* This function can be called multiple times.
* It affects the output of svn_client_conflict_tree_get_description() and
* svn_client_conflict_option_get_description(). Call these functions again
@@ -4756,7 +4756,7 @@ svn_client_conflict_option_set_moved_to_
* svn_client_conflict_option_get_moved_to_repos_relpath_candidates() before
* calling this function to let the user select a repository path first.
* Otherwise, one of the repository-side paths will be selected internally.
- *
+ *
* @a *possible_moved_to_abspaths is set to NULL if the @a option does not
* support multiple move targets. API users may assume that only one option
* among those which can be applied to a conflict supports move targets.
@@ -4798,10 +4798,10 @@ svn_client_conflict_option_get_moved_to_
/**
* Set the preferred moved target working copy path. If @a option is not
* applicable to a moved target working copy path, do nothing.
- *
+ *
* @a preferred_move_target_idx must be a valid index into the list
* returned by svn_client_conflict_option_get_moved_to_abspath_candidates2().
- *
+ *
* This function can be called multiple times.
* It affects the output of svn_client_conflict_tree_get_description() and
* svn_client_conflict_option_get_description(). Call these functions again
@@ -4847,7 +4847,7 @@ svn_client_conflict_option_find_by_id(
/**
* Return a conflict for the conflicted path @a local_abspath.
- *
+ *
* @since New in 1.10.
*/
svn_error_t *
@@ -4862,7 +4862,7 @@ svn_client_conflict_get(svn_client_confl
*
* The lifetime of @a conflict is limited. Its allocation in
* memory will not persist beyond this callback's execution.
- *
+ *
* @since New in 1.10.
*/
typedef svn_error_t *(*svn_client_conflict_walk_func_t)(
@@ -4875,12 +4875,12 @@ typedef svn_error_t *(*svn_client_confli
* Pass each conflict found during the walk to the @a conflict_walk_func
* callback, along with @a conflict_walk_func_baton.
* Use cancellation and notification support provided by client context @a ctx.
- *
+ *
* This callback may choose to resolve the conflict. If the act of resolving
* a conflict creates new conflicts within the walked working copy (as might
* be the case for some tree conflicts), the callback will be invoked for each
* such new conflict as well.
- *
+ *
* @since New in 1.10.
*/
svn_error_t *
@@ -4900,7 +4900,7 @@ svn_client_conflict_walk(const char *loc
* It contains the names of conflicted properties. If no property conflict
* exists, the array will contain no elements.
*
-* @since New in 1.10.
+* @since New in 1.10.
*/
svn_error_t *
svn_client_conflict_get_conflicted(svn_boolean_t *text_conflicted,
@@ -5083,7 +5083,7 @@ svn_client_conflict_option_get_descripti
* Client implementations which aim to avoid excessive interactive prompting
* may wish to try a recommended resolution option before falling back to
* asking the user which option to use.
- *
+ *
* Conflict resolution with a recommended option is not guaranteed to succeed.
* Clients should check for errors when trying to resolve a conflict and fall
* back to other options and/or interactive prompting when the recommended
@@ -5101,7 +5101,7 @@ svn_client_conflict_get_recommended_opti
* Return the absolute path to the conflicted working copy node described
* by @a conflict.
*
- * @since New in 1.10.
+ * @since New in 1.10.
*/
const char *
svn_client_conflict_get_local_abspath(svn_client_conflict_t *conflict);
@@ -5110,7 +5110,7 @@ svn_client_conflict_get_local_abspath(sv
* Return the operation during which the conflict described by @a
* conflict was recorded.
*
- * @since New in 1.10.
+ * @since New in 1.10.
*/
svn_wc_operation_t
svn_client_conflict_get_operation(svn_client_conflict_t *conflict);
@@ -5118,8 +5118,8 @@ svn_client_conflict_get_operation(svn_cl
/**
* Return the action an update, switch, or merge operation attempted to
* perform on the working copy node described by @a conflict.
- *
- * @since New in 1.10.
+ *
+ * @since New in 1.10.
*/
svn_wc_conflict_action_t
svn_client_conflict_get_incoming_change(svn_client_conflict_t *conflict);
@@ -5132,14 +5132,14 @@ svn_client_conflict_get_incoming_change(
* modifications in the working copy. During merge operations it may
* additionally be part of the history of the merge target branch, anywhere
* between the common ancestor revision and the working copy revision.
- *
- * @since New in 1.10.
+ *
+ * @since New in 1.10.
*/
svn_wc_conflict_reason_t
svn_client_conflict_get_local_change(svn_client_conflict_t *conflict);
/**
- * Return information about the repository associated with @a conflict.
+ * Return information about the repository associated with @a conflict.
* In case of a foreign-repository merge this will differ from the
* repository information associated with the merge target working copy.
*
@@ -5157,11 +5157,11 @@ svn_client_conflict_get_repos_info(const
* old version of the conflicted node described by @a conflict.
*
* If the repository-relative path is not available, the @a
- * *incoming_old_repos_relpath will be set to @c NULL,
+ * *incoming_old_repos_relpath will be set to @c NULL,
*
* If the peg revision is not available, @a *incoming_old_regrev will be
* set to SVN_INVALID_REVNUM.
- *
+ *
* If the node kind is not available or if the node does not exist at the
* specified path and revision, @a *incoming_old_node_kind will be set to
* svn_node_none.
@@ -5276,7 +5276,7 @@ svn_client_conflict_prop_get_reject_absp
* Return the set of property values involved in the conflict of property
* PROPNAME described by @a conflict. If a property value is unavailable the
* corresponding output argument is set to @c NULL.
- *
+ *
* A 3-way diff of these property values can be generated with
* svn_diff_mem_string_diff3(). A merged version with conflict
* markers can be generated with svn_diff_mem_string_output_merge3().
@@ -5344,11 +5344,11 @@ const char *
svn_client_conflict_text_get_mime_type(svn_client_conflict_t *conflict);
/**
- * Return absolute paths to the versions of the text-conflicted file
+ * Return absolute paths to the versions of the text-conflicted file
* described by @a conflict.
*
* If a particular content is not available, it is set to @c NULL.
- *
+ *
* ### Should this be returning svn_stream_t instead of paths?
* @since: New in 1.10.
*/
@@ -5619,7 +5619,7 @@ svn_client_copy7(const apr_array_header_
/**
* Similar to svn_client_copy7(), but doesn't support meta_data_only
* and cannot pin externals.
- *
+ *
*
* @since New in 1.7.
* @deprecated Provided for backward compatibility with the 1.8 API.
Modified: subversion/trunk/subversion/include/svn_diff.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_diff.h?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_diff.h (original)
+++ subversion/trunk/subversion/include/svn_diff.h Wed Mar 25 09:04:28 2020
@@ -711,7 +711,7 @@ svn_diff_file_output_unified(svn_stream_
* @a conflict_latest to be displayed as conflict markers in the output.
* If @a conflict_original, @a conflict_modified, @a conflict_latest and/or
* @a conflict_separator is @c NULL, a default marker will be displayed.
- * @a conflict_style dictates how conflicts are displayed.
+ * @a conflict_style dictates how conflicts are displayed.
* Uses @a scratch_pool for temporary allocations.
*
* If not @c NULL, call @a cancel_func with @a cancel_baton once or multiple
Modified: subversion/trunk/subversion/include/svn_ra_svn.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_ra_svn.h?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_ra_svn.h (original)
+++ subversion/trunk/subversion/include/svn_ra_svn.h Wed Mar 25 09:04:28 2020
@@ -201,7 +201,7 @@ typedef svn_error_t *(*svn_ra_svn_edit_c
* If @a max_out is not 0, error out and close the connection whenever more
* than @a max_out bytes have been send as response to some command.
*
- * @note The limits enforced may vary slightly by +/- the I/O buffer size.
+ * @note The limits enforced may vary slightly by +/- the I/O buffer size.
*
* @note If @a out_stream is an wrapped apr_file_t* the backing file will be
* used for some operations.
Modified: subversion/trunk/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Wed Mar 25 09:04:28 2020
@@ -679,7 +679,7 @@ svn_repos_fs_type(svn_repos_t *repos,
* The optional @a cancel_func callback will be invoked with
* @a cancel_baton as usual to allow the user to preempt this potentially
* lengthy operation.
- *
+ *
* Use @a scratch_pool for temporary allocations.
*
* @since New in 1.9.
@@ -3360,7 +3360,7 @@ svn_repos_dump_fs4(svn_repos_t *repos,
apr_pool_t *pool);
/**
- * Similar to svn_repos_dump_fs4(), but with @a include_revprops and
+ * Similar to svn_repos_dump_fs4(), but with @a include_revprops and
* @a include_changes both set to @c TRUE and @a filter_func and
* @a filter_baton set to @c NULL.
*
Modified: subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (original)
+++ subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Wed Mar 25 09:04:28 2020
@@ -120,10 +120,10 @@ password_get_gnome_keyring(svn_boolean_t
gchar *gpassword;
*done = FALSE;
-
+
if (!available_collection(non_interactive, pool))
return SVN_NO_ERROR;
-
+
gpassword = secret_password_lookup_sync(SECRET_SCHEMA_COMPAT_NETWORK, NULL,
&gerror,
"domain", realmstring,
@@ -140,7 +140,7 @@ password_get_gnome_keyring(svn_boolean_t
g_free(gpassword);
*done = TRUE;
}
-
+
return SVN_NO_ERROR;
}
@@ -158,7 +158,7 @@ password_set_gnome_keyring(svn_boolean_t
{
GError *gerror = NULL;
gboolean gstatus;
-
+
*done = FALSE;
if (!available_collection(non_interactive, pool))
@@ -182,7 +182,7 @@ password_set_gnome_keyring(svn_boolean_t
{
*done = TRUE;
}
-
+
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_client/blame.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/blame.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/blame.c (original)
+++ subversion/trunk/subversion/libsvn_client/blame.c Wed Mar 25 09:04:28 2020
@@ -456,7 +456,7 @@ file_rev_handler(void *baton, const char
SVN_ERR_CLIENT_IS_BINARY_FILE, NULL,
_("Cannot calculate blame information for binary file '%s'"),
(svn_path_is_url(frb->target)
- ? frb->target
+ ? frb->target
: svn_dirent_local_style(frb->target, pool)));
}
}
@@ -553,7 +553,7 @@ file_rev_handler(void *baton, const char
|| frb->include_merged_revisions);
/* The file existed before start_rev; generate no blame info for
- lines from this revision (or before).
+ lines from this revision (or before).
This revision specifies the state as it was at the start revision */
@@ -739,7 +739,7 @@ svn_client_blame6(svn_revnum_t *start_re
mime_type = svn_prop_get_value(props, SVN_PROP_MIME_TYPE);
}
- else
+ else
{
const svn_string_t *value;
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Mar 25 09:04:28 2020
@@ -383,7 +383,7 @@ add_new_move(struct repos_move_info **ne
const char *author,
apr_hash_t *moved_paths,
svn_ra_session_t *ra_session,
- const char *repos_root_url,
+ const char *repos_root_url,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -661,7 +661,7 @@ match_copies_to_deletion(const char *del
TRUE, iterpool));
if (!related)
continue;
-
+
/* Remember details of this move. */
SVN_ERR(add_new_move(&move, deleted_repos_relpath,
copy->copyto_path, copy->copyfrom_rev,
@@ -669,7 +669,7 @@ match_copies_to_deletion(const char *del
moved_paths, ra_session, repos_root_url,
result_pool, iterpool));
push_move(move, moves_table, result_pool);
- }
+ }
}
else
{
@@ -782,7 +782,7 @@ map_deleted_path_to_move(const char *del
{
const char *relpath;
struct repos_move_info *move;
-
+
move = APR_ARRAY_IDX(moves, i, struct repos_move_info *);
if (strcmp(move->moved_from_repos_relpath, deleted_relpath) == 0)
return move;
@@ -806,7 +806,7 @@ map_deleted_path_to_move(const char *del
if (closest_move)
{
const char *relpath;
-
+
/* See if we can find an even closer move for this moved-along path. */
relpath = svn_relpath_skip_ancestor(closest_move->moved_to_repos_relpath,
deleted_relpath);
@@ -967,7 +967,7 @@ cache_copied_item(apr_hash_t *copies, co
* This function answers the same question as svn_ra_get_deleted_rev() but
* works in cases where we do not already know a revision in which the deleted
* node once used to exist.
- *
+ *
* If the node was moved, rather than deleted, return move information
* in BATON->MOVE.
*/
@@ -1098,7 +1098,7 @@ find_deleted_rev(void *baton,
b->deleted_rev_author = apr_pstrdup(b->result_pool, author->data);
else
b->deleted_rev_author = _("unknown author");
-
+
b->replacing_node_kind = replacing_node_kind;
/* We're done. Abort the log operation. */
@@ -1173,7 +1173,7 @@ describe_local_file_node_change(const ch
const char *moved_to_abspath;
svn_error_t *err;
- err = svn_wc__node_was_moved_away(&moved_to_abspath, NULL,
+ err = svn_wc__node_was_moved_away(&moved_to_abspath, NULL,
ctx->wc_ctx,
conflict->local_abspath,
scratch_pool,
@@ -1257,7 +1257,7 @@ describe_local_file_node_change(const ch
{
const char *moved_from_abspath;
- SVN_ERR(svn_wc__node_was_moved_here(&moved_from_abspath, NULL,
+ SVN_ERR(svn_wc__node_was_moved_here(&moved_from_abspath, NULL,
ctx->wc_ctx,
conflict->local_abspath,
scratch_pool,
@@ -1398,7 +1398,7 @@ describe_local_dir_node_change(const cha
const char *moved_to_abspath;
svn_error_t *err;
- err = svn_wc__node_was_moved_away(&moved_to_abspath, NULL,
+ err = svn_wc__node_was_moved_away(&moved_to_abspath, NULL,
ctx->wc_ctx,
conflict->local_abspath,
scratch_pool,
@@ -1483,7 +1483,7 @@ describe_local_dir_node_change(const cha
{
const char *moved_from_abspath;
- SVN_ERR(svn_wc__node_was_moved_here(&moved_from_abspath, NULL,
+ SVN_ERR(svn_wc__node_was_moved_here(&moved_from_abspath, NULL,
ctx->wc_ctx,
conflict->local_abspath,
scratch_pool,
@@ -1581,7 +1581,7 @@ struct find_moves_baton
* rB: mv b->c
* rC: mv c->d
* we map each revision number to all the moves which happened in the
- * revision, which looks as follows:
+ * revision, which looks as follows:
* rA : [(x->z), (a->b)]
* rB : [(b->c)]
* rC : [(c->d)]
@@ -2628,7 +2628,7 @@ collect_sibling_move_candidates(apr_arra
svn_client_ctx_t *ctx,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
-{
+{
const char *basename;
apr_array_header_t *abspaths;
int i;
@@ -2774,7 +2774,7 @@ follow_move_chains(apr_hash_t *wc_move_t
ctx, victim_abspath, victim_node_kind,
victim_repos_relpath, victim_revision,
result_pool, iterpool));
-
+
}
svn_pool_destroy(iterpool);
}
@@ -2840,7 +2840,7 @@ conflict_tree_get_details_local_missing(
/* Pick the younger incoming node as our 'related node' which helps
* pin-pointing the deleted conflict victim in history. */
- related_repos_relpath =
+ related_repos_relpath =
(old_rev < new_rev ? new_repos_relpath : old_repos_relpath);
related_peg_rev = (old_rev < new_rev ? new_rev : old_rev);
@@ -3012,7 +3012,7 @@ conflict_tree_get_details_local_missing(
if (deleted_rev != SVN_INVALID_REVNUM)
details->deleted_repos_relpath = svn_relpath_join(parent_repos_relpath,
deleted_basename,
- conflict->pool);
+ conflict->pool);
details->moves = moves;
if (details->moves != NULL)
{
@@ -3058,7 +3058,7 @@ conflict_tree_get_details_local_missing(
details->wc_move_target_idx = 0;
}
}
-
+
details->sibling_moves = sibling_moves;
details->wc_siblings = wc_siblings;
if (details->wc_move_targets && apr_hash_count(details->wc_move_targets) == 1)
@@ -3244,7 +3244,7 @@ conflict_tree_get_description_local_miss
if (details->moves || details->sibling_moves)
{
struct repos_move_info *move;
-
+
*description = _("No such file or directory was found in the "
"merge target working copy.\n");
@@ -3924,7 +3924,7 @@ describe_incoming_deletion_upon_update(
struct repos_move_info *move;
move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
- description =
+ description =
apr_psprintf(result_pool,
_("Item updated from r%ld to r%ld was moved "
"to '^/%s' by %s in r%ld."), old_rev, new_rev,
@@ -4062,7 +4062,7 @@ describe_incoming_deletion_upon_switch(
result_pool,
scratch_pool);
}
- return description;
+ return description;
}
else if (victim_node_kind == svn_node_file ||
victim_node_kind == svn_node_symlink)
@@ -4215,7 +4215,7 @@ describe_incoming_deletion_upon_switch(
{
struct repos_move_info *move;
const char *description;
-
+
move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
description =
apr_psprintf(result_pool,
@@ -4846,7 +4846,7 @@ conflict_tree_get_description_incoming_d
action = describe_incoming_reverse_addition_upon_switch(
details, victim_node_kind, old_repos_relpath, old_rev,
new_repos_relpath, new_rev, result_pool);
-
+
}
}
else if (conflict_operation == svn_wc_operation_merge)
@@ -6190,7 +6190,7 @@ describe_incoming_edit_list_modified_rev
details->rev, details->author,
i < edits->nelts - 1 ? "," : "");
}
- }
+ }
else
s = apr_psprintf(result_pool, _("%s r%ld by %s%s"), s,
details->rev, details->author,
@@ -6339,7 +6339,7 @@ conflict_tree_get_description_incoming_e
"during reverse-merge of\n"
"'^/%s:%ld-%ld'"),
new_repos_relpath, new_rev + 1, old_rev);
-
+
else
action = apr_psprintf(scratch_pool,
_("Changes from the following revisions "
@@ -6374,7 +6374,7 @@ svn_client_conflict_tree_get_description
SVN_ERR(conflict->tree_conflict_get_local_description_func(
local_change_description,
conflict, ctx, result_pool, scratch_pool));
-
+
return SVN_NO_ERROR;
}
@@ -6989,7 +6989,7 @@ unlock_wc:
scratch_pool));
svn_io_sleep_for_timestamps(local_abspath, scratch_pool);
SVN_ERR(err);
-
+
if (ctx->notify_func2)
{
svn_wc_notify_t *notify;
@@ -8190,7 +8190,7 @@ ensure_local_edit_vs_incoming_deletion_c
SVN_ERR_ASSERT(operation == svn_wc_operation_update ||
operation == svn_wc_operation_switch);
-
+
SVN_ERR(svn_wc__node_get_origin(&is_copy, ©from_rev,
©from_repos_relpath,
NULL, NULL, NULL, NULL,
@@ -8533,7 +8533,7 @@ resolve_incoming_move_file_text_merge(sv
svn_client_conflict_option_incoming_move_file_text_merge ||
option_id ==
svn_client_conflict_option_both_moved_file_move_merge);
-
+
SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL,
conflict, scratch_pool,
scratch_pool));
@@ -8741,7 +8741,7 @@ resolve_incoming_move_file_text_merge(sv
goto unlock_wc;
incoming_abspath = NULL;
}
-
+
if (ctx->notify_func2)
{
svn_wc_notify_t *notify;
@@ -8862,7 +8862,7 @@ resolve_both_moved_file_text_merge(svn_c
option_id = svn_client_conflict_option_get_id(option);
SVN_ERR_ASSERT(option_id == svn_client_conflict_option_both_moved_file_merge);
-
+
SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL,
conflict, scratch_pool,
scratch_pool));
@@ -9061,7 +9061,7 @@ resolve_both_moved_dir_merge(svn_client_
option_id = svn_client_conflict_option_get_id(option);
SVN_ERR_ASSERT(option_id == svn_client_conflict_option_both_moved_dir_merge);
-
+
SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL,
conflict, scratch_pool,
scratch_pool));
@@ -9210,7 +9210,7 @@ resolve_both_moved_dir_move_merge(svn_cl
option_id = svn_client_conflict_option_get_id(option);
SVN_ERR_ASSERT(option_id ==
svn_client_conflict_option_both_moved_dir_move_merge);
-
+
SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL,
conflict, scratch_pool,
scratch_pool));
@@ -9364,7 +9364,7 @@ resolve_incoming_move_dir_merge(svn_clie
option_id = svn_client_conflict_option_get_id(option);
SVN_ERR_ASSERT(option_id ==
svn_client_conflict_option_incoming_move_dir_merge);
-
+
SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, &repos_uuid,
conflict, scratch_pool,
scratch_pool));
@@ -11160,7 +11160,7 @@ resolve_both_moved_file_update_keep_loca
option_id = svn_client_conflict_option_get_id(option);
SVN_ERR_ASSERT(option_id == svn_client_conflict_option_both_moved_file_merge);
-
+
SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL,
conflict, scratch_pool,
scratch_pool));
@@ -11371,7 +11371,7 @@ resolve_both_moved_file_update_keep_inco
option_id = svn_client_conflict_option_get_id(option);
SVN_ERR_ASSERT(option_id ==
svn_client_conflict_option_both_moved_file_move_merge);
-
+
SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL,
conflict, scratch_pool,
scratch_pool));
@@ -11537,7 +11537,7 @@ conflict_tree_get_details_update_local_m
details->wc_move_targets = apr_array_make(conflict->pool, 1,
sizeof(const char *));
-
+
/* Search the WC for copies of the conflict victim. */
SVN_ERR(svn_wc__find_copies_of_repos_path(&details->wc_move_targets,
conflict->local_abspath,
@@ -12114,7 +12114,7 @@ svn_client_conflict_option_set_moved_to_
operation = svn_client_conflict_get_operation(conflict);
incoming_change = svn_client_conflict_get_incoming_change(conflict);
local_change = svn_client_conflict_get_local_change(conflict);
-
+
if (operation == svn_wc_operation_merge &&
incoming_change == svn_wc_conflict_action_edit &&
local_change == svn_wc_conflict_reason_missing)
@@ -12732,7 +12732,7 @@ svn_client_conflict_get_recommended_opti
{
return conflict->recommended_option_id;
}
-
+
svn_error_t *
svn_client_conflict_text_resolve(svn_client_conflict_t *conflict,
svn_client_conflict_option_t *option,
@@ -12755,7 +12755,7 @@ svn_client_conflict_option_find_by_id(ap
{
svn_client_conflict_option_t *this_option;
svn_client_conflict_option_id_t this_option_id;
-
+
this_option = APR_ARRAY_IDX(options, i, svn_client_conflict_option_t *);
this_option_id = svn_client_conflict_option_get_id(this_option);
@@ -13316,7 +13316,7 @@ tree_conflict_collector(void *baton,
{
const char *tc_abspath;
apr_pool_t *hash_pool;
-
+
hash_pool = apr_hash_pool_get(cswb->unresolved_tree_conflicts);
tc_abspath = apr_pstrdup(hash_pool, notify->path);
svn_hash_sets(cswb->unresolved_tree_conflicts, tc_abspath, "");
@@ -13324,7 +13324,7 @@ tree_conflict_collector(void *baton,
}
}
-/*
+/*
* Record a tree conflict resolution failure due to error condition ERR
* in the RESOLVE_LATER hash table. If the hash table is not available
* (meaning the caller does not wish to retry resolution later), or if
@@ -13487,7 +13487,7 @@ svn_client_conflict_walk(const char *loc
if (err)
break;
}
-
+
if (!err && !cswb.resolved_a_tree_conflict && tc_abspath &&
apr_hash_count(cswb.unresolved_tree_conflicts))
{
Modified: subversion/trunk/subversion/libsvn_client/mtcc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mtcc.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mtcc.c (original)
+++ subversion/trunk/subversion/libsvn_client/mtcc.c Wed Mar 25 09:04:28 2020
@@ -604,7 +604,7 @@ mtcc_op_contains_non_delete(const mtcc_o
static svn_error_t *
mtcc_add_delete(const char *relpath,
svn_boolean_t for_move,
- svn_client__mtcc_t *mtcc,
+ svn_client__mtcc_t *mtcc,
apr_pool_t *scratch_pool)
{
mtcc_op_t *op;
@@ -636,7 +636,7 @@ mtcc_add_delete(const char *relpath,
{
/* Allow deleting directories, that are unmodified except for
one or more deleted descendants */
-
+
SVN_ERR(mtcc_op_find(&op, &created, relpath, mtcc->root_op, TRUE,
FALSE, FALSE, mtcc->pool, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_diff/diff_file.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/diff_file.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/diff_file.c (original)
+++ subversion/trunk/subversion/libsvn_diff/diff_file.c Wed Mar 25 09:04:28 2020
@@ -1253,7 +1253,7 @@ svn_diff_file_options_parse(svn_diff_fil
apr_array_cat(argv, args);
APR_ARRAY_PUSH(argv, const char *) = NULL;
- apr_getopt_init(&os, pool,
+ apr_getopt_init(&os, pool,
argv->nelts - 1 /* Exclude trailing NULL */,
(const char *const *) argv->elts);
Modified: subversion/trunk/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/parse-diff.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/parse-diff.c Wed Mar 25 09:04:28 2020
@@ -215,7 +215,7 @@ svn_diff_hunk__create_adds_single_line(s
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- SVN_ERR(add_or_delete_single_line(hunk_out, line, patch,
+ SVN_ERR(add_or_delete_single_line(hunk_out, line, patch,
(!patch->reverse),
result_pool, scratch_pool));
return SVN_NO_ERROR;
@@ -1235,7 +1235,7 @@ parse_next_hunk(svn_diff_hunk_t **hunk,
c = line->data[0];
if (c == ' '
|| ((original_lines > 0 && modified_lines > 0)
- && (
+ && (
/* Tolerate chopped leading spaces on empty lines. */
(! eof && line->len == 0)
/* Maybe tolerate chopped leading spaces on non-empty lines. */
@@ -2085,7 +2085,7 @@ parse_binary_patch(svn_patch_t *patch, a
else if (in_src)
{
patch->binary_patch = bpatch; /* SUCCESS! */
- break;
+ break;
}
else
{
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.h?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.h (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.h Wed Mar 25 09:04:28 2020
@@ -207,12 +207,12 @@ typedef struct fs_vtable_t
svn_error_t *(*revision_prop)(svn_string_t **value_p, svn_fs_t *fs,
svn_revnum_t rev, const char *propname,
svn_boolean_t refresh,
- apr_pool_t *result_pool,
+ apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
svn_error_t *(*revision_proplist)(apr_hash_t **table_p, svn_fs_t *fs,
svn_revnum_t rev,
svn_boolean_t refresh,
- apr_pool_t *result_pool,
+ apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
svn_error_t *(*change_rev_prop)(svn_fs_t *fs, svn_revnum_t rev,
const char *name,
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=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/low_level.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/low_level.c Wed Mar 25 09:04:28 2020
@@ -506,7 +506,7 @@ svn_fs_fs__read_changes(apr_array_header
SVN_ERR(read_change(&change, stream, result_pool, iterpool));
if (!change)
break;
-
+
APR_ARRAY_PUSH(*changes, change_t*) = change;
}
svn_pool_destroy(iterpool);
Modified: subversion/trunk/subversion/libsvn_fs_fs/pack.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/pack.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/pack.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/pack.c Wed Mar 25 09:04:28 2020
@@ -315,12 +315,12 @@ initialize_pack_context(pack_context_t *
context->file_props = apr_array_make(pool, max_items,
sizeof(svn_fs_fs__p2l_entry_t *));
SVN_ERR(svn_io_open_unique_file3(&context->file_props_file, NULL, temp_dir,
- svn_io_file_del_on_close,
+ svn_io_file_del_on_close,
context->info_pool, pool));
context->dir_props = apr_array_make(pool, max_items,
sizeof(svn_fs_fs__p2l_entry_t *));
SVN_ERR(svn_io_open_unique_file3(&context->dir_props_file, NULL, temp_dir,
- svn_io_file_del_on_close,
+ svn_io_file_del_on_close,
context->info_pool, pool));
/* noderev and representation item bucket */
Modified: subversion/trunk/subversion/libsvn_fs_fs/revprops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/revprops.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/revprops.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/revprops.c Wed Mar 25 09:04:28 2020
@@ -261,7 +261,7 @@ cache_revprops(svn_boolean_t *is_cached,
}
/* Read the non-packed revprops for revision REV in FS, put them into the
- * revprop cache if PROPULATE_CACHE is set and return them in *PROPERTIES.
+ * revprop cache if PROPULATE_CACHE is set and return them in *PROPERTIES.
*
* If the data could not be read due to an otherwise recoverable error,
* leave *PROPERTIES unchanged. No error will be returned in that case.
Modified: subversion/trunk/subversion/libsvn_fs_fs/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/transaction.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/transaction.c Wed Mar 25 09:04:28 2020
@@ -587,7 +587,7 @@ unparse_dir_entry(svn_fs_dirent_t *diren
: sizeof(SVN_FS_FS__KIND_DIR);
apr_size_t value_len = type_len + id_str->len;
- /* A buffer with sufficient space for
+ /* A buffer with sufficient space for
* - both string lines
* - 4 newlines
* - 2 lines K/V lines containing a number each
Modified: subversion/trunk/subversion/libsvn_fs_x/dag_cache.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag_cache.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/dag_cache.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/dag_cache.c Wed Mar 25 09:04:28 2020
@@ -807,7 +807,7 @@ get_copy_inheritance(svn_fs_x__copy_id_i
or if it is a branch point that we are accessing via its original
copy destination path. */
svn_fs_x__dag_get_copyroot(©root_rev, ©root_path, child->node);
- SVN_ERR(svn_fs_x__revision_root(©root_root, fs, copyroot_rev,
+ SVN_ERR(svn_fs_x__revision_root(©root_root, fs, copyroot_rev,
scratch_pool));
SVN_ERR(svn_fs_x__get_temp_dag_node(©root_node, copyroot_root,
copyroot_path, scratch_pool));
@@ -909,7 +909,7 @@ svn_fs_x__get_dag_path(svn_fs_x__dag_pat
{
/* If this was the last path component, and the caller
said it was optional, then don't return an error;
- just put a NULL node pointer in the path.
+ just put a NULL node pointer in the path.
*/
if ((flags & svn_fs_x__dag_path_last_optional)
&& (path_len == path.len))
Modified: subversion/trunk/subversion/libsvn_fs_x/fs_x.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs_x.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs_x.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs_x.c Wed Mar 25 09:04:28 2020
@@ -951,7 +951,7 @@ write_revision_zero(svn_fs_t *fs,
SVN_ERR(svn_io_file_open(&apr_file,
svn_fs_x__path_revprops(fs, 0, scratch_pool),
- APR_WRITE | APR_CREATE, APR_OS_DEFAULT,
+ APR_WRITE | APR_CREATE, APR_OS_DEFAULT,
scratch_pool));
SVN_ERR(svn_fs_x__write_non_packed_revprops(apr_file, proplist,
scratch_pool));
Modified: subversion/trunk/subversion/libsvn_fs_x/low_level.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/low_level.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/low_level.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/low_level.c Wed Mar 25 09:04:28 2020
@@ -998,7 +998,7 @@ svn_fs_x__read_changes(apr_array_header_
SVN_ERR(read_change(&change, stream, result_pool, iterpool));
if (!change)
break;
-
+
APR_ARRAY_PUSH(*changes, svn_fs_x__change_t*) = change;
}
svn_pool_destroy(iterpool);
Modified: subversion/trunk/subversion/libsvn_fs_x/revprops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/revprops.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/revprops.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/revprops.c Wed Mar 25 09:04:28 2020
@@ -449,7 +449,7 @@ verify_checksum(svn_stringbuf_t *content
content->len, scratch_pool));
if (!svn_checksum_match(actual, expected))
- SVN_ERR(svn_checksum_mismatch_err(expected, actual, scratch_pool,
+ SVN_ERR(svn_checksum_mismatch_err(expected, actual, scratch_pool,
"checksum mismatch"));
return SVN_NO_ERROR;
@@ -1424,7 +1424,7 @@ svn_fs_x__set_revision_proplist(svn_fs_t
scratch_pool));
else
SVN_ERR(write_non_packed_revprop(&final_path, &tmp_path,
- fs, rev, proplist, batch,
+ fs, rev, proplist, batch,
scratch_pool, scratch_pool));
/* We use the rev file of this revision as the perms reference,
Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Wed Mar 25 09:04:28 2020
@@ -881,7 +881,7 @@ unparse_dir_entry(svn_fs_x__dirent_t *di
apr_size_t to_write;
apr_size_t name_len = strlen(dirent->name);
- /* A buffer with sufficient space for
+ /* A buffer with sufficient space for
* - entry name + 1 terminating NUL
* - 1 byte for the node kind
* - 2 numbers in 7b/8b encoding for the noderev-id
Modified: subversion/trunk/subversion/libsvn_fs_x/verify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/verify.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/verify.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/verify.c Wed Mar 25 09:04:28 2020
@@ -179,7 +179,7 @@ verify_index_checksum(svn_fs_x__revision
SVN_ERR(svn_fs_x__rev_file_name(&file_name, file, scratch_pool));
SVN_ERR(svn_checksum_mismatch_err(index_info->checksum, actual,
- scratch_pool,
+ scratch_pool,
_("%s checksum mismatch in file %s"),
name, file_name));
}
Modified: subversion/trunk/subversion/libsvn_ra_serf/replay.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/replay.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/replay.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/replay.c Wed Mar 25 09:04:28 2020
@@ -666,7 +666,7 @@ svn_ra_serf__replay_range(svn_ra_session
apr_pool_t *subpool = svn_pool_create(scratch_pool);
if (session->http20) {
- /* ### Auch... this doesn't work yet...
+ /* ### Auch... this doesn't work yet...
This code relies on responses coming in in an exact order, while
http2 does everything to deliver responses as fast as possible.
Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Wed Mar 25 09:04:28 2020
@@ -363,7 +363,7 @@ load_config(svn_ra_serf__session_t *sess
{
apr_int64_t timeout;
svn_error_t *err;
-
+
err = svn_cstring_strtoi64(&timeout, timeout_str, 0, APR_INT64_MAX, 10);
if (err)
return svn_error_createf(SVN_ERR_BAD_CONFIG_VALUE, err,
Modified: subversion/trunk/subversion/libsvn_ra_svn/editorp.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/editorp.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/editorp.c Wed Mar 25 09:04:28 2020
@@ -118,7 +118,7 @@ make_token(char type,
char buffer[1 + SVN_INT64_BUFFER_SIZE];
buffer[0] = type;
len = 1 + svn__ui64toa(&buffer[1], eb->next_token++);
-
+
return svn_string_ncreate(buffer, len, pool);
}
Modified: subversion/trunk/subversion/libsvn_repos/authz.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/authz.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/authz.c (original)
+++ subversion/trunk/subversion/libsvn_repos/authz.c Wed Mar 25 09:04:28 2020
@@ -81,11 +81,11 @@ typedef struct limited_rights_t
*/
path_access_t access;
- /* Minimal access rights that the user has on this or any other node in
+ /* Minimal access rights that the user has on this or any other node in
* the sub-tree. This does not take inherited rights into account. */
authz_access_t min_rights;
- /* Maximal access rights that the user has on this or any other node in
+ /* Maximal access rights that the user has on this or any other node in
* the sub-tree. This does not take inherited rights into account. */
authz_access_t max_rights;
@@ -889,7 +889,7 @@ create_user_authz(authz_full_t *authz,
/* Use a separate sub-pool to keep memory usage tight. */
apr_pool_t *subpool = svn_pool_create(scratch_pool);
- /* Find all ACLs for REPOSITORY.
+ /* Find all ACLs for REPOSITORY.
* Note that repo-specific rules replace global rules,
* even if they don't apply to the current user. */
apr_array_header_t *acls = apr_array_make(subpool, authz->acls->nelts,
@@ -947,7 +947,7 @@ create_user_authz(authz_full_t *authz,
svn_pool_clear(subpool);
trim_tree(root, NO_SEQUENCE_NUMBER, subpool);
- /* Calculate recursive rights.
+ /* Calculate recursive rights.
*
* This is a bottom-up calculation of the range of access rights
* specified anywhere in the respective sub-tree, including the base
@@ -999,7 +999,7 @@ static lookup_state_t *
create_lookup_state(apr_pool_t *result_pool)
{
lookup_state_t *state = apr_pcalloc(result_pool, sizeof(*state));
-
+
state->next = apr_array_make(result_pool, 4, sizeof(node_t *));
state->current = apr_array_make(result_pool, 4, sizeof(node_t *));
Modified: subversion/trunk/subversion/libsvn_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/commit.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/commit.c (original)
+++ subversion/trunk/subversion/libsvn_repos/commit.c Wed Mar 25 09:04:28 2020
@@ -189,7 +189,7 @@ check_out_of_date(struct edit_baton *eb,
else if (base_rev > created_rev)
{
if (base_rev > svn_fs_txn_base_revision(eb->txn))
- return svn_error_createf(SVN_ERR_FS_NO_SUCH_REVISION, NULL,
+ return svn_error_createf(SVN_ERR_FS_NO_SUCH_REVISION, NULL,
_("No such revision %ld"),
base_rev);
}
Modified: subversion/trunk/subversion/libsvn_repos/config_file.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/config_file.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/config_file.c (original)
+++ subversion/trunk/subversion/libsvn_repos/config_file.c Wed Mar 25 09:04:28 2020
@@ -342,7 +342,7 @@ svn_repos__create_config_access(svn_repo
return result;
}
-void
+void
svn_repos__destroy_config_access(config_access_t *access)
{
svn_pool_destroy(access->pool);
Modified: subversion/trunk/subversion/libsvn_repos/config_file.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/config_file.h?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/config_file.h (original)
+++ subversion/trunk/subversion/libsvn_repos/config_file.h Wed Mar 25 09:04:28 2020
@@ -48,7 +48,7 @@ svn_repos__create_config_access(svn_repo
apr_pool_t *result_pool);
/* Release all resources allocated while using ACCESS. */
-void
+void
svn_repos__destroy_config_access(config_access_t *access);
/* Using ACCESS as a helper object, access the textual configuration at PATH,
Modified: subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c (original)
+++ subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c Wed Mar 25 09:04:28 2020
@@ -1421,7 +1421,7 @@ revprops_close_revision(void *baton)
* both of these values are #SVN_INVALID_REVNUM (in which case no
* revision-based filtering occurs at all), or both are valid revisions
* (where START_REV is older than or equivalent to END_REV).
- *
+ *
* START_REV and END_REV act as filters, the lower and upper (inclusive)
* range values of revisions which will
* be loaded. Either both of these values are #SVN_INVALID_REVNUM (in
Modified: subversion/trunk/subversion/libsvn_repos/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/log.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/log.c (original)
+++ subversion/trunk/subversion/libsvn_repos/log.c Wed Mar 25 09:04:28 2020
@@ -655,7 +655,7 @@ fs_mergeinfo_changed(svn_mergeinfo_catal
because that greatly influences the costs for log processing.
So, it is faster to iterate over the changes twice - in the worst
case b/c most times there is no m/i at all and we exit out early
- without any overhead.
+ without any overhead.
*/
while (change && (!any_mergeinfo || !any_copy))
{
@@ -1227,7 +1227,7 @@ typedef struct interesting_merge_baton_t
void *inner_baton;
} interesting_merge_baton_t;
-/* Implements svn_repos_path_change_receiver_t.
+/* Implements svn_repos_path_change_receiver_t.
* *BATON is a interesting_merge_baton_t.
*
* If BATON->REV a merged revision that is not already part of
Modified: subversion/trunk/subversion/libsvn_repos/replay.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/replay.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/replay.c (original)
+++ subversion/trunk/subversion/libsvn_repos/replay.c Wed Mar 25 09:04:28 2020
@@ -891,7 +891,7 @@ get_relevant_changes(apr_hash_t **change
}
/* If the base_path doesn't match the top directory of this path
- we don't want anything to do with it...
+ we don't want anything to do with it...
...unless this was a change to one of the parent directories of
base_path. */
if ( svn_relpath_skip_ancestor(base_relpath, path)
Modified: subversion/trunk/subversion/libsvn_subr/gpg_agent.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/gpg_agent.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/gpg_agent.c (original)
+++ subversion/trunk/subversion/libsvn_subr/gpg_agent.c Wed Mar 25 09:04:28 2020
@@ -108,7 +108,7 @@ escape_blanks(char *str)
#define is_hex(c) (((c) >= '0' && (c) <= '9') || ((c) >= 'A' && (c) <= 'F'))
#define hex_to_int(c) ((c) < '9' ? (c) - '0' : (c) - 'A' + 10)
-
+
/* Modify STR in-place. '%', CR and LF are always percent escaped,
other characters may be percent escaped, always using uppercase
hex, see https://www.gnupg.org/documentation/manuals/assuan.pdf */
Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Wed Mar 25 09:04:28 2020
@@ -1574,7 +1574,7 @@ reown_file(const char *path,
}
/* Determine what the PERMS for a new file should be by looking at the
- permissions of a temporary file that we create in DIRECTORY.
+ permissions of a temporary file that we create in DIRECTORY.
DIRECTORY can be NULL in which case the system temporary dir is used.
Unfortunately, umask() as defined in POSIX provides no thread-safe way
to get at the current value of the umask, so what we're doing here is
Modified: subversion/trunk/subversion/libsvn_subr/object_pool.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/object_pool.c?rev=1875617&r1=1875616&r2=1875617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/object_pool.c (original)
+++ subversion/trunk/subversion/libsvn_subr/object_pool.c Wed Mar 25 09:04:28 2020
@@ -321,7 +321,7 @@ svn_object_pool__insert(void **object,
{
*object = NULL;
SVN_MUTEX__WITH_LOCK(object_pool->mutex,
- insert(object, object_pool, key, item,
+ insert(object, object_pool, key, item,
item_pool, result_pool));
return SVN_NO_ERROR;
}