Author: julianfoad
Date: Tue Feb 20 20:19:03 2024
New Revision: 1915903
URL: http://svn.apache.org/viewvc?rev=1915903&view=rev
Log:
Remove experimental move-tracking development.
The former state is now preserved in the branch 'move-tracking-3'.
This approach to move tracking is no longer being pursued.
No impact on public functionality. It was exposed only through one
stand-alone dev tool 'tools/dev/svnmover' and through one undocumented
environment variable 'SVN_ELEMENT_MERGE' which hooks the code in to the
'svn merge' command.
Removed:
subversion/trunk/notes/move-tracking/
subversion/trunk/subversion/include/private/svn_branch.h
subversion/trunk/subversion/include/private/svn_branch_compat.h
subversion/trunk/subversion/include/private/svn_branch_impl.h
subversion/trunk/subversion/include/private/svn_branch_nested.h
subversion/trunk/subversion/include/private/svn_branch_repos.h
subversion/trunk/subversion/include/private/svn_element.h
subversion/trunk/subversion/libsvn_client/merge_elements.c
subversion/trunk/subversion/libsvn_delta/branch.c
subversion/trunk/subversion/libsvn_delta/branch_compat.c
subversion/trunk/subversion/libsvn_delta/branch_migrate.c
subversion/trunk/subversion/libsvn_delta/branch_nested.c
subversion/trunk/subversion/libsvn_delta/branch_repos.c
subversion/trunk/subversion/libsvn_delta/element.c
subversion/trunk/subversion/tests/cmdline/svnmover_tests.py
subversion/trunk/tools/dev/svnmover/
Modified:
subversion/trunk/LICENSE
subversion/trunk/build.conf
subversion/trunk/build/generator/gen_base.py
subversion/trunk/subversion/libsvn_client/client.h
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/tests/cmdline/svntest/actions.py
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/subversion/trunk/LICENSE?rev=1915903&r1=1915902&r2=1915903&view=diff
==============================================================================
--- subversion/trunk/LICENSE (original)
+++ subversion/trunk/LICENSE Tue Feb 20 20:19:03 2024
@@ -367,35 +367,6 @@ subversion/libsvn_subr/x509.h
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-For the (modified) 'linenoise' library in tools/dev/svnmover/linenoise
-
- Copyright (c) 2010-2014, Salvatore Sanfilippo <antirez at gmail dot com>
- Copyright (c) 2010-2013, Pieter Noordhuis <pcnoordhuis at gmail dot com>
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
For the (modified) LZ4 library files in subversion/libsvn_subr/lz4
LZ4 Library
Modified: subversion/trunk/build.conf
URL:
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1915903&r1=1915902&r2=1915903&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Tue Feb 20 20:19:03 2024
@@ -48,8 +48,6 @@ private-includes =
subversion/bindings/cxx/tests/*.hpp
subversion/bindings/javahl/native/*.hpp
subversion/bindings/javahl/native/jniwrapper/jni_*.hpp
- tools/dev/svnmover/linenoise/linenoise.h
- tools/dev/svnmover/linenoise/linenoise.c
subversion/libsvn_subr/utf8proc/utf8proc_internal.h
subversion/libsvn_subr/utf8proc/utf8proc.c
subversion/libsvn_subr/utf8proc/utf8proc_data.c
@@ -258,7 +256,7 @@ type = lib
install = fsmod-lib
path = subversion/libsvn_delta
libs = libsvn_subr aprutil apriconv apr zlib
-msvc-export = svn_delta.h private/svn_editor.h private/svn_delta_private.h
private/svn_element.h private/svn_branch.h private/svn_branch_compat.h
private/svn_branch_impl.h private/svn_branch_nested.h private/svn_branch_repos.h
+msvc-export = svn_delta.h private/svn_editor.h private/svn_delta_private.h
# Routines for diffing
[libsvn_diff]
@@ -1576,7 +1574,7 @@ libs = svn svnadmin svndumpfilter svnloo
svnversion
mod_authz_svn mod_dav_svn mod_dontdothat
svnauthz svnauthz-validate svnraisetreeconflict
- svnfsfs svnbench svnmover
+ svnfsfs svnbench
[__ALL_TESTS__]
type = project
@@ -1745,14 +1743,6 @@ sources = x509-parser.c
install = tools
libs = libsvn_subr apr
-[svnmover]
-description = Subversion Mover Command Client
-type = exe
-path = tools/dev/svnmover
-sources = *.c
-libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr
-install = tools
-
[svnconflict]
type = exe
path = tools/client-side/svnconflict
Modified: subversion/trunk/build/generator/gen_base.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_base.py?rev=1915903&r1=1915902&r2=1915903&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_base.py (original)
+++ subversion/trunk/build/generator/gen_base.py Tue Feb 20 20:19:03 2024
@@ -664,7 +664,7 @@ class TargetExe(TargetLinked):
TargetLinked.add_dependencies(self)
# collect test programs
- if 'svnauthz' in self.name or 'svnmover' in self.name: # special case
+ if 'svnauthz' in self.name: # special case
self.gen_obj.test_deps.append(self.filename)
self.gen_obj.test_helpers.append(self.filename)
elif self.install == 'test':
Modified: subversion/trunk/subversion/libsvn_client/client.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1915903&r1=1915902&r2=1915903&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/client.h (original)
+++ subversion/trunk/subversion/libsvn_client/client.h Tue Feb 20 20:19:03 2024
@@ -1198,22 +1198,6 @@ typedef struct merge_target_t
} merge_target_t;
-/*
- * Similar API to svn_client_merge_peg5().
- */
-svn_error_t *
-svn_client__merge_elements(svn_boolean_t *use_sleep,
- apr_array_header_t *merge_sources,
- merge_target_t *target,
- svn_ra_session_t *ra_session,
- svn_boolean_t diff_ignore_ancestry,
- svn_boolean_t force_delete,
- svn_boolean_t dry_run,
- const apr_array_header_t *merge_options,
- svn_client_ctx_t *ctx,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
/* Data for reporting when a merge aborted because of raising conflicts.
*
* ### TODO: More info, including the ranges (or other parameters) the user
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1915903&r1=1915902&r2=1915903&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Feb 20 20:19:03 2024
@@ -12016,21 +12016,6 @@ merge_peg_locked(svn_client__conflict_re
/* Do the real merge! (We say with confidence that our merge
sources are both ancestral and related.) */
- if (getenv("SVN_ELEMENT_MERGE")
- && same_repos
- && (depth == svn_depth_infinity || depth == svn_depth_unknown)
- && ignore_mergeinfo
- && !record_only)
- {
- err = svn_client__merge_elements(&use_sleep,
- merge_sources, target, ra_session,
- diff_ignore_ancestry, force_delete,
- dry_run, merge_options,
- ctx, result_pool, scratch_pool);
- /* ### Currently this merge just errors out on any conflicts */
- *conflict_report = NULL;
- }
- else
err = do_merge(NULL, NULL, conflict_report, &use_sleep,
merge_sources, target, ra_session,
TRUE /*sources_related*/, same_repos, ignore_mergeinfo,
Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1915903&r1=1915902&r2=1915903&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Tue Feb 20
20:19:03 2024
@@ -432,27 +432,6 @@ def run_and_verify_svnrdump(dumpfile_con
return output
-def run_and_verify_svnmover(expected_stdout, expected_stderr,
- *varargs):
- """Run svnmover command and check its output"""
-
- expected_exit = 0
- if expected_stderr is not None and expected_stderr != []:
- expected_exit = 1
- return run_and_verify_svnmover2(expected_stdout, expected_stderr,
- expected_exit, *varargs)
-
-def run_and_verify_svnmover2(expected_stdout, expected_stderr,
- expected_exit, *varargs):
- """Run svnmover command and check its output and exit code."""
-
- exit_code, out, err = main.run_svnmover(*varargs)
- verify.verify_outputs("Unexpected output", out, err,
- expected_stdout, expected_stderr)
- verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
- return exit_code, out, err
-
-
def run_and_verify_svnmucc(expected_stdout, expected_stderr,
*varargs):
"""Run svnmucc command and check its output"""
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1915903&r1=1915902&r2=1915903&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Tue Feb 20
20:19:03 2024
@@ -209,7 +209,6 @@ svnauthz_binary = os.path.abspath('../..
svnauthz_validate_binary = os.path.abspath(
'../../../tools/server-side/svnauthz-validate' + _exe
)
-svnmover_binary = os.path.abspath('../../../tools/dev/svnmover/svnmover' +
_exe)
# Where to find the libtool script created during build
libtool_script = os.path.abspath('../../../libtool')
@@ -905,12 +904,6 @@ def run_svnversion(*varargs):
as list of lines (including line terminators)."""
return run_command(svnversion_binary, 1, False, *varargs)
-def run_svnmover(*varargs):
- """Run svnmover with VARARGS, returns exit code as int; stdout, stderr as
- list of lines (including line terminators)."""
- return run_command(svnmover_binary, 1, False,
- *(_with_auth(_with_config_dir(varargs))))
-
def run_svnmucc(*varargs):
"""Run svnmucc with VARARGS, returns exit code as int; stdout, stderr as
list of lines (including line terminators). Use binary mode for output."""
@@ -2500,7 +2493,6 @@ def execute_tests(test_list, serial_only
global svnsync_binary
global svndumpfilter_binary
global svnversion_binary
- global svnmover_binary
global svnmucc_binary
global svnauthz_binary
global svnauthz_validate_binary
@@ -2610,7 +2602,6 @@ def execute_tests(test_list, serial_only
svnauthz_binary = os.path.join(options.tools_bin, 'svnauthz' + _exe)
svnauthz_validate_binary = os.path.join(options.tools_bin,
'svnauthz-validate' + _exe)
- svnmover_binary = os.path.join(options.tools_bin, 'svnmover' + _exe)
######################################################################
