Author: kotkov
Date: Mon Dec 15 17:00:11 2025
New Revision: 1930598
Log:
* **/**
Run tools/dev/remove-trailing-whitespace.sh to remove all trailing whitespace
before we branch 1.15, like we did before creating previous branches.
Note: I manually excluded changes to the following locations, to avoid
changing more than necessary at this time:
tools/buildbot/slaves/*
tools/dev/awk/*
No functional changes intended.
Modified:
subversion/trunk/build/generator/gen_win_dependencies.py
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/trunk/subversion/bindings/swig/python/svn/fs.py
subversion/trunk/subversion/bindings/swig/python/tests/client.py
subversion/trunk/subversion/bindings/swig/python/tests/fs.py
subversion/trunk/subversion/bindings/swig/python/tests/mergeinfo.py
subversion/trunk/subversion/bindings/swig/python/tests/repository.py
subversion/trunk/subversion/include/private/svn_task.h
subversion/trunk/subversion/include/private/svn_thread_cond.h
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/libsvn_diff/diff_tree_debug.c
subversion/trunk/subversion/libsvn_subr/apr_escape.c
subversion/trunk/subversion/libsvn_subr/waitable_counter.c
subversion/trunk/subversion/libsvn_subr/xml_stream.c
subversion/trunk/subversion/libsvn_wc/revert.c
subversion/trunk/subversion/libsvn_wc/workqueue.c
subversion/trunk/subversion/svn/propedit-cmd.c
subversion/trunk/subversion/tests/cmdline/authz_tests.py
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/copy_tests.py
subversion/trunk/subversion/tests/cmdline/entries-dump.c
subversion/trunk/subversion/tests/cmdline/externals_tests.py
subversion/trunk/subversion/tests/cmdline/log_tests.py
subversion/trunk/subversion/tests/cmdline/prop_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/verify.py
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
subversion/trunk/tools/dev/contribulyze.py
subversion/trunk/tools/dist/backport/status.py
subversion/trunk/tools/dist/make-keys.sh
subversion/trunk/tools/dist/manage-backports.py
subversion/trunk/tools/dist/nominate-backport.py
Modified: subversion/trunk/build/generator/gen_win_dependencies.py
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -1374,7 +1374,7 @@ class GenDependenciesBase(gen_base.Gener
lib_name = 'serf-%d.lib' % (serf_ver_maj,)
else:
lib_name = 'serf.lib'
-
+
if self.shared_serf:
lib_name = 'lib' + lib_name
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Mon Dec 15 17:00:11 2025 (r1930598)
@@ -3324,7 +3324,7 @@ public class BasicTests extends SVNTests
/**
* Test getMessage in NativeException.
- * @throws Throwable
+ * @throws Throwable
*/
public void testGetMessage() throws Throwable
{
Modified: subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Mon Dec 15 17:00:11 2025 (r1930598)
@@ -513,7 +513,7 @@ void svn_swig_py_svn_exception(svn_error
/* First, we create the exception... */
svn_swig_py_build_svn_exception(&exc_class, &exc_ob, error_chain);
-
+
/* ...then, we raise it. If got only an exception class but no
instance, we'll raise the class without an instance. */
if (exc_class != NULL)
@@ -523,7 +523,7 @@ void svn_swig_py_svn_exception(svn_error
PyErr_SetObject(exc_class, exc_ob);
Py_DECREF(exc_ob);
}
- else
+ else
{
PyErr_SetNone(exc_class);
}
Modified: subversion/trunk/subversion/bindings/swig/python/svn/fs.py
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/svn/fs.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/bindings/swig/python/svn/fs.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -158,7 +158,7 @@ class FileDiff:
try:
p = _subprocess.Popen(cmd, stdout=_subprocess.PIPE, bufsize=-1,
close_fds=_sys.platform != "win32")
- # When removing Python 2 support: Change to FileNotFoundError and
+ # When removing Python 2 support: Change to FileNotFoundError and
# remove check for ENOENT (FileNotFoundError "Corresponds to errno
# ENOENT" according to documentation)
except OSError as err:
Modified: subversion/trunk/subversion/bindings/swig/python/tests/client.py
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/client.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/bindings/swig/python/tests/client.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -534,7 +534,7 @@ class SubversionClientTestCase(unittest.
target_prop = b'local_prop_test'
prop_val1 = b'foo'
- co_rev = client.checkout3(self.repos_uri, path, head, head,
+ co_rev = client.checkout3(self.repos_uri, path, head, head,
core.svn_depth_infinity, True, True,
self.client_ctx)
@@ -559,7 +559,7 @@ class SubversionClientTestCase(unittest.
self.assertEqual(props, { target_path : prop_val2 })
# Using str(unicode) and check if it uses 'utf-8' codecs on Python 3
- # (or Python 2, only if its default encoding is 'utf-8')
+ # (or Python 2, only if its default encoding is 'utf-8')
if utils.IS_PY3 or utils.is_defaultencoding_utf8():
# prop_val3 = '(checkmark)UNICODE'
prop_val3_str = (u'\u2705\U0001F1FA\U0001F1F3\U0001F1EE'
Modified: subversion/trunk/subversion/bindings/swig/python/tests/fs.py
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/fs.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/bindings/swig/python/tests/fs.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -308,7 +308,7 @@ class SubversionFSTestCase(unittest.Test
try:
diffout, differr = Popen(["diff"], stdin=PIPE, stderr=PIPE).communicate()
- # When removing Python 2 support: Change to FileNotFoundError and
+ # When removing Python 2 support: Change to FileNotFoundError and
# remove check for ENOENT (FileNotFoundError "Corresponds to errno
# ENOENT" according to documentation)
except OSError as err:
Modified: subversion/trunk/subversion/bindings/swig/python/tests/mergeinfo.py
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/mergeinfo.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/bindings/swig/python/tests/mergeinfo.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -141,7 +141,7 @@ class SubversionMergeinfoTestCase(unitte
# ....and now 3 (incref during iteration of each range object)
refcount = sys.getrefcount(r)
- # ....and finally, 4 (getrefcount() also increfs, unless deferred
+ # ....and finally, 4 (getrefcount() also increfs, unless deferred
# reference counting)
expected = 4
@@ -162,7 +162,7 @@ class SubversionMergeinfoTestCase(unitte
mergeinfo = core.svn_mergeinfo_parse(self.TEXT_MERGEINFO1)
merge_range_refdict = weakref.WeakValueDictionary()
merge_range_indexes = []
- n_merge_range = 0
+ n_merge_range = 0
for (path, rangelist) in core._as_list(mergeinfo.items()):
# ....and now 2 (incref during iteration of rangelist)
@@ -171,7 +171,7 @@ class SubversionMergeinfoTestCase(unitte
idx = (path, i)
merge_range_refdict[idx] = r
- merge_range_indexes.append(idx)
+ merge_range_indexes.append(idx)
n_merge_range += 1
# Note: if path and index are not '/trunk' and 0 respectively, then
@@ -192,7 +192,7 @@ class SubversionMergeinfoTestCase(unitte
gc.collect()
if merge_range_refdict:
# certainly memory leak, but we want to listing up leaked objects
- # before raise an assertion error.
+ # before raise an assertion error.
self.assertFalse(merge_range_refdict,
"Memory leak! All svn_merge_range_t object holded "
"by mergeinfo object should be removed, but at least "
Modified: subversion/trunk/subversion/bindings/swig/python/tests/repository.py
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/repository.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/bindings/swig/python/tests/repository.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -94,11 +94,11 @@ class BatonCollector(repos.ChangeCollect
"""determine expected refcount of batons within a batoun_tuple,
by using dumy object"""
self.open_root(-1, None)
- for baton_tuple in self.batons:
+ for baton_tuple in self.batons:
rc = sys.getrefcount(baton_tuple[2])
break
return rc
-
+
repos.ChangeCollector.__init__(self, fs_ptr, root, pool, notify_cb)
self.close_called = False
self.abort_called = False
Modified: subversion/trunk/subversion/include/private/svn_task.h
==============================================================================
--- subversion/trunk/subversion/include/private/svn_task.h Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/include/private/svn_task.h Mon Dec 15 17:00:11 2025 (r1930598)
@@ -47,7 +47,7 @@ extern "C" {
* consists of two functions. The first is the "process function" that
* should perform the bulk of the work, may be executed in some worker
* thread and may produce some result.
- *
+ *
* The latter is later passed into the second function, the "output function".
* This one is called in the main thread and strictly in post-order wrt.
* the position of the respective task within the tree. However, a task
@@ -56,9 +56,9 @@ extern "C" {
* code. Such partial outputs can be handed in whenever a new sub-task
* is being added and the output function will be called on them right
* before handling the output of the respective sub-task.
- *
+ *
* Both, process and output functions, may add further sub-tasks as needed.
- *
+ *
* Errors are detected in strictly in post-order, with only the first one
* being returned from the task runner. In particular, it may not be the
* first error that occurs timewise but only the first one encountered when
@@ -154,7 +154,7 @@ typedef svn_error_t *(*svn_task__thread_
* Construct the root of the task tree and start processing from there.
* This is the main API function and the only one to be called outside any
* task callback.
- *
+ *
* Employ up to @a thread_count worker threads, depending on APR threading
* support and processing needs. If the @a thread_count is set to 1 or if
* APR does not support multithreading, all tasks will be processed in the
Modified: subversion/trunk/subversion/include/private/svn_thread_cond.h
==============================================================================
--- subversion/trunk/subversion/include/private/svn_thread_cond.h Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/include/private/svn_thread_cond.h Mon Dec 15 17:00:11 2025 (r1930598)
@@ -86,7 +86,7 @@ svn_thread_cond__broadcast(svn_thread_co
/**
* Atomically release @a mutex and start waiting for @a cond. @a mutex will
* be locked again upon waking up this thread.
- *
+ *
* @note Wakeups are usually caused by @a cond being signalled but there may
* also be spurious wake-ups. I.e. the caller needs to verify whether the
* underlying event actually happened.
Modified: subversion/trunk/subversion/include/svn_wc.h
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/include/svn_wc.h Mon Dec 15 17:00:11 2025 (r1930598)
@@ -1328,7 +1328,7 @@ typedef enum svn_wc_notify_action_t
/** A file is readonly for the user but isn't svn:needs-lock.
* So we want to restore RW, but fail since the file has W bits,
- * just not for the current user.
+ * just not for the current user.
* @since New in 1.15. */
svn_wc_notify_revert_noaccess,
Modified: subversion/trunk/subversion/libsvn_diff/diff_tree_debug.c
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/diff_tree_debug.c Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/libsvn_diff/diff_tree_debug.c Mon Dec 15 17:00:11 2025 (r1930598)
@@ -129,7 +129,7 @@ debug_dir_opened(void **new_dir_baton,
copyfrom_source, scratch_pool));
SVN_ERR(write_action_property_source(b, "left_source",
left_source, scratch_pool));
- SVN_ERR(write_action_property_source(b, "right_source",
+ SVN_ERR(write_action_property_source(b, "right_source",
right_source, scratch_pool));
b->indent_level++;
@@ -171,7 +171,7 @@ debug_dir_deleted(const char *relpath,
SVN_ERR(write_action(b, "dir_deleted", relpath, scratch_pool));
SVN_ERR(write_action_property_source(b, "left_source",
left_source, scratch_pool));
-
+
return SVN_NO_ERROR;
}
@@ -260,7 +260,7 @@ debug_file_added(const char *relpath,
SVN_ERR(write_action(b, "file_added", relpath, scratch_pool));
SVN_ERR(write_action_property_source(b, "copyfrom_source",
copyfrom_source, scratch_pool));
- SVN_ERR(write_action_property_source(b, "right_source",
+ SVN_ERR(write_action_property_source(b, "right_source",
right_source, scratch_pool));
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_subr/apr_escape.c
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/apr_escape.c Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/libsvn_subr/apr_escape.c Mon Dec 15 17:00:11 2025 (r1930598)
@@ -48,7 +48,7 @@ static const unsigned char test_char_tab
222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
- 222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222
+ 222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222
};
/* from apr_encode_private.h */
Modified: subversion/trunk/subversion/libsvn_subr/waitable_counter.c
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/waitable_counter.c Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/libsvn_subr/waitable_counter.c Mon Dec 15 17:00:11 2025 (r1930598)
@@ -1,5 +1,5 @@
/* waitable_counter.c --- implement a concurrent waitable counter.
- *
+ *
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: subversion/trunk/subversion/libsvn_subr/xml_stream.c
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/xml_stream.c Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/libsvn_subr/xml_stream.c Mon Dec 15 17:00:11 2025 (r1930598)
@@ -45,12 +45,12 @@ xml_stream_write(void *baton, const char
xml_stream_baton_t *b = baton;
svn_error_t *err;
- /*
+ /*
* Check if the XML parser has already been freed.
* This can happen if an error occurs during XML parsing.
*/
if (b->parser == NULL)
- return NULL;
+ return NULL;
err = svn_xml_parse(b->parser, data, *len, FALSE);
Modified: subversion/trunk/subversion/libsvn_wc/revert.c
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/revert.c Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/libsvn_wc/revert.c Mon Dec 15 17:00:11 2025 (r1930598)
@@ -513,7 +513,7 @@ revert_wc_data(svn_boolean_t *run_wq,
#endif
*notify_noaccess = FALSE; /* notify_required is reset elsewhere */
-
+
/* Would be nice to use svn_io_dirent2_t here, but the performance
improvement that provides doesn't work, because we need the read
only and executable bits later on, in the most likely code path */
@@ -675,7 +675,7 @@ revert_wc_data(svn_boolean_t *run_wq,
{
/* If there is already W on the file, it is owned by
* some other user. Then svn_io_set_file_read_write
- * will return without making any changes and the
+ * will return without making any changes and the
* user will get a spurious "Reverted" message.
* Only checking for user's W since that is the only
* one set by svn_io_set_file_read_write()
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Mon Dec 15 17:00:11 2025 (r1930598)
@@ -584,11 +584,11 @@ run_file_install(work_item_baton_t *wqb,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
-
+
if (keywords_propval)
{
const char *url;
-
+
/* Handle special statuses (e.g. added) */
if (!repos_relpath)
SVN_ERR(svn_wc__db_read_repos_info(NULL, &repos_relpath,
Modified: subversion/trunk/subversion/svn/propedit-cmd.c
==============================================================================
--- subversion/trunk/subversion/svn/propedit-cmd.c Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/svn/propedit-cmd.c Mon Dec 15 17:00:11 2025 (r1930598)
@@ -143,7 +143,7 @@ svn_cl__propedit(apr_getopt_t *os,
SVN_ERR(svn_cmdline__edit_string_externally(
&propval, NULL,
opt_state->editor_cmd, temp_dir,
- propval,
+ propval,
apr_psprintf(pool, "svn-revprop-r%ld",
opt_state->start_revision.value.number),
ctx->config,
Modified: subversion/trunk/subversion/tests/cmdline/authz_tests.py
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/authz_tests.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/tests/cmdline/authz_tests.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -1755,7 +1755,7 @@ def delete_file_with_starstar_rules(sbox
# mod_dav_svn unnecessarily requires svn_authz_recursive access on DELETE of
# a file. See:
- #
+ #
# https://mail-archives.apache.org/mod_mbox/subversion-users/202107.mbox/%3C20210731004148.GA26581%40tarpaulin.shahaf.local2%3E
# https://mail-archives.apache.org/mod_mbox/subversion-dev/202107.mbox/%3C20210731004148.GA26581%40tarpaulin.shahaf.local2%3E
# (Both links go to the same message.)
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -3308,7 +3308,7 @@ def keep_local_reverted_properly(sbox):
svntest.main.run_svn(None, 'revert', *targets)
# Check that the modifications are absent
- #
+ #
# alpha and beta are still scheduled for deletion because 'revert' doesn't
# recurse by default.
expected_disk = svntest.main.greek_state.copy()
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -1291,7 +1291,7 @@ def wc_move_parent_into_child(sbox):
from_path = os.path.abspath(sbox.ospath(''))
to_path = os.path.abspath(sbox.ospath('F/B'))
os.chdir(wc_dir)
-
+
expected_error = "svn: E200007: Cannot move path '%s' into its own " \
"child '%s'" % (re.escape(from_path), re.escape(to_path))
svntest.actions.run_and_verify_svn(None, expected_error,
Modified: subversion/trunk/subversion/tests/cmdline/entries-dump.c
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/entries-dump.c Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/tests/cmdline/entries-dump.c Mon Dec 15 17:00:11 2025 (r1930598)
@@ -125,7 +125,7 @@ entries_dump(const char *dir_path, svn_w
svn_error_t *err;
svn_wc_context_t *wc_ctx = NULL;
const char *dir_abspath;
- apr_pool_t *iterpool = svn_pool_create(pool);
+ apr_pool_t *iterpool = svn_pool_create(pool);
SVN_ERR(svn_dirent_get_absolute(&dir_abspath, dir_path, pool));
@@ -178,7 +178,7 @@ entries_dump(const char *dir_path, svn_w
const char *key = apr_hash_this_key(hi);
const svn_wc_entry_t *entry = apr_hash_this_val(hi);
- svn_pool_clear(iterpool);
+ svn_pool_clear(iterpool);
SVN_ERR_ASSERT(strcmp(key, entry->name) == 0);
printf("e = Entry()\n");
str_value("name", entry->name, iterpool);
Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -70,12 +70,12 @@ def externals_test_setup(sbox):
Properties on 'A/B':
svn:externals
^/A/D/gamma gamma
-
+
Properties on 'A/C':
svn:externals
exdir_G <scheme>://<...>/<other_repos_basename>/A/D/G
../../../<other_repos_basename>/A/D/H@1 exdir_H
-
+
Properties on 'A/D':
svn:externals
^/../<other_repos_basename>/A exdir_A
Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/log_tests.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/tests/cmdline/log_tests.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -2782,7 +2782,7 @@ def log_on_deleted_deep(sbox):
@Issue(4711)
def log_with_merge_history_and_search(sbox):
"log --use-merge-history --search"
-
+
sbox.build()
# r2: create branch
@@ -2808,7 +2808,7 @@ def log_with_merge_history_and_search(sb
@Issue(4856)
def log_xml_with_merge_history(sbox):
"log --use-merge-history --xml"
-
+
sbox.build()
# r2-r4: create branches
Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/prop_tests.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -2857,7 +2857,7 @@ def tmpfile_name_matches_prop_type(sbox)
svntest.actions.run_and_verify_svn(
None,
'.*' + re.escape(non_editor) + r'.*svn-revprop-r1\.tmp.*',
- 'propedit', '--revprop',
+ 'propedit', '--revprop',
'--editor-cmd', non_editor,
'-r1', 'svn:log',
sbox.repo_url)
@@ -2865,7 +2865,7 @@ def tmpfile_name_matches_prop_type(sbox)
svntest.actions.run_and_verify_svn(
None,
'.*' + re.escape(non_editor) + r'.*svn-prop\.tmp.*',
- 'propedit',
+ 'propedit',
'--editor-cmd', non_editor,
'ignored-propname',
sbox.ospath('A/mu'))
Modified: subversion/trunk/subversion/tests/cmdline/svntest/verify.py
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/verify.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/tests/cmdline/svntest/verify.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -857,7 +857,7 @@ def compare_dump_files(label_expected, l
print('DIFF of raw dumpfiles (including expected differences)')
print('--- ' + (label_expected or 'expected'))
print('+++ ' + (label_actual or 'actual'))
- print(''.join(ndiff([repr(line) for line in expected],
+ print(''.join(ndiff([repr(line) for line in expected],
[repr(line) for line in actual])))
raise svntest.Failure('DIFF of parsed dumpfiles (ignoring expected differences)\n'
+ '\n'.join(ndiff(
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -60,7 +60,7 @@ def get_current_format():
def target_ver():
"""Get the default value of --compatible-version to use.
-
+
Compare svntest.main.wc_format()."""
return (svntest.main.options.wc_format_version or svntest.main.DEFAULT_COMPATIBLE_VERSION)
@@ -499,9 +499,9 @@ def basic_upgrade_1_0(sbox):
#
# ### This was originally added in r919021, during 1.7 development, because
# ### check_format() recursed into the separate working copy.
- # ###
+ # ###
# ### The remainder of the test passes if this call is removed.
- # ###
+ # ###
# ### So, for now, this call serves only as a smoke test, to confirm that the
# ### upgrade returns 0. However:
# ###
@@ -1523,9 +1523,9 @@ def upgrade_1_0_with_externals(sbox):
# ### This was originally added in r1702474, during 1.10 development, because
# ### check_format() recursed into the separate working copy. It was copied
# ### from basic_upgrade_1_0() above.
- # ###
+ # ###
# ### The remainder of the test passes if this call is removed.
- # ###
+ # ###
# ### So, for now, this call serves only as a smoke test, to confirm that the
# ### upgrade returns 0. However:
# ###
Modified: subversion/trunk/tools/dev/contribulyze.py
==============================================================================
--- subversion/trunk/tools/dev/contribulyze.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/tools/dev/contribulyze.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -723,7 +723,7 @@ def process_committers(committers):
c.is_full_committer = in_full_committers
line = committers.readline()
svn_role = Contributor.parse('svn-role <svnsvn{_AT_}svn-qavm.apache.org>')
- Contributor.get(*svn_role).is_committer = True
+ Contributor.get(*svn_role).is_committer = True
Contributor.get(*svn_role).is_full_committer = True # elide it from the listing
Modified: subversion/trunk/tools/dist/backport/status.py
==============================================================================
--- subversion/trunk/tools/dist/backport/status.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/tools/dist/backport/status.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -143,7 +143,7 @@ class Paragraph:
def unparse(self, stream):
"Write this paragraph to STREAM, an open file-like object."
stream.write(self.__str__())
-
+
def __str__(self):
s = ""
if self.kind in (Kind.preamble, Kind.section_header, Kind.unknown):
Modified: subversion/trunk/tools/dist/make-keys.sh
==============================================================================
--- subversion/trunk/tools/dist/make-keys.sh Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/tools/dist/make-keys.sh Mon Dec 15 17:00:11 2025 (r1930598)
@@ -43,7 +43,7 @@ cd $TMP
for availid in $( perl -anE 'say $F[0] if (/^Blanket/../END ACTIVE FULL.*SCRIPTS LOOK FOR IT/ and /@/)' < $COMMITTERS )
do
key_url=https://people.apache.org/keys/committer/${availid}.asc
-
+
echo -n "Fetching ${key_url}..."
curl -sSfO ${key_url} 2> /dev/null
Modified: subversion/trunk/tools/dist/manage-backports.py
==============================================================================
--- subversion/trunk/tools/dist/manage-backports.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/tools/dist/manage-backports.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -74,18 +74,18 @@ def check_local_mods_to_STATUS():
sys.exit(1)
input("Press Enter to continue or Ctrl-C to abort...")
return True
-
+
return False
def get_availid():
"""Try to get the AVAILID of the current user"""
SVN_A_O_REALM = '<https://svn.apache.org:443> ASF Committers'
-
+
try:
# First try to get the ID from an environment variable
return os.environ["AVAILID"]
-
+
except KeyError:
try:
# Failing, try executing svn auth
@@ -250,7 +250,7 @@ def main():
else:
print("Please use one of the options in brackets (N to continue with next item)!")
backport.merger.run_svn_quiet(["revert", ".", "--depth=infinity"])
-
+
elif a == "l":
# Show logs for entries being nominated
if e._entry.branch != None:
@@ -266,15 +266,15 @@ def main():
elif a == "q":
# Quit the "for each entry" loop.
break
-
+
elif len(a) == 2 and a[0] in "+-" and a[1] in "01":
print("Voting " + a)
-
+
elif a == "a":
# Approve the entry
sf.remove(e._entry)
sf.insert(e._entry, "Approved changes")
-
+
elif a == "e":
# Edit the entry in EDITOR
subprocess.run([EDITOR, STATUS])
@@ -282,26 +282,26 @@ def main():
elif a == "N":
# Move to next entry and don't prompt for this entry ever again
break
-
+
elif a == "":
# Move to next entry
break
-
+
elif a == "?":
# Print help
print(BACKPORT_OPTIONS_HELP)
else:
print("Please use one of the options in brackets (q to quit)!")
-
+
if a == "q":
# Quit the "for each entry" loop.
break
-
+
with open(STATUS, mode='w', encoding='UTF-8') as f:
sf.unparse(f)
sys.exit(0)
-
+
revisions = [int(''.join(filter(str.isdigit, revision))) for revision in sys.argv[1].split()]
justification = sys.argv[2]
@@ -324,15 +324,15 @@ def main():
answer = input("Commit this nomination [y/N]? ")
if answer.lower() == "y":
subprocess_output(['svn', 'commit', STATUS, '-m',
- '* STATUS: Nominate r' +
+ '* STATUS: Nominate r' +
', r'.join(map(str, revisions))])
else:
answer = input("Revert STATUS (destroying local mods) [y/N]? ")
if answer.lower() == "y":
subprocess_output(['svn', 'revert', STATUS])
-
+
sys.exit(0)
-
+
AVAILID = get_availid()
# Load the various knobs
@@ -348,7 +348,7 @@ except:
if __name__ == "__main__":
# print("Starting subshell!\n")
-
+
try:
main()
except KeyboardInterrupt:
Modified: subversion/trunk/tools/dist/nominate-backport.py
==============================================================================
--- subversion/trunk/tools/dist/nominate-backport.py Mon Dec 15 16:34:00 2025 (r1930597)
+++ subversion/trunk/tools/dist/nominate-backport.py Mon Dec 15 17:00:11 2025 (r1930598)
@@ -53,18 +53,18 @@ def check_local_mods_to_STATUS():
sys.exit(1)
input("Press Enter to continue or Ctrl-C to abort...")
return True
-
+
return False
def get_availid():
"""Try to get the AVAILID of the current user"""
SVN_A_O_REALM = '<https://svn.apache.org:443> ASF Committers'
-
+
try:
# First try to get the ID from an environment variable
return os.environ["AVAILID"]
-
+
except KeyError:
try:
# Failing, try executing svn auth
@@ -220,15 +220,15 @@ def main():
answer = input("Commit this nomination [y/N]? ")
if answer.lower() == "y":
backport.merger.run_svn_quiet(['commit', STATUS, '-m',
- '* STATUS: Nominate r' +
+ '* STATUS: Nominate r' +
', r'.join(map(str, revisions))])
else:
answer = input("Revert STATUS (destroying local mods) [y/N]? ")
if answer.lower() == "y":
backport.merger.run_svn_quiet(['revert', STATUS])
-
+
sys.exit(0)
-
+
AVAILID = get_availid()
# Load the various knobs
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.