subversion

Checkout Tools
  • last updated 8 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
On all branches:

.: Removed redundant SVN properties

  1. … 78 more files in changeset.
On the 'move-tracking-2' branch: Restore an svn:eol-style property that I

accidentally deleted in r1626177.

* subversion/libsvn_ra_local/ra_plugin.c

Add svn:eol-style=native.

On the 'move-tracking-2' branch: Elide redundant subtree mergeinfo by using

'svn-mergeinfo-normalizer normalize'.

  1. … 6 more files in changeset.
On the 'move-tracking-2' branch: Move log-scanning code out of libsvn_client

and into svnmover, to localize the experimental source code as much as

possible.

* subversion/include/private/svn_client_private.h

(svn_repos_move_info_t,

svn_repos_move_info_create,

svn_client__format_move_chain_for_display,

svn_client__get_repos_moves): Move to svnmover.h.

* subversion/libsvn_client/update.c

(svn_repos_move_info_create,

svn_client__format_move_chain_for_display,

scan_moves_log_receiver_baton,

copy_info,

check_ancestry,

scan_moves_log_receiver,

svn_client__get_repos_moves): Move to scanlog.c.

(update_internal): Tweak commented-out code such that it could be compiled.

* tools/dev/svnmover/scanlog.c

New file, with contents moved from update.c.

* tools/dev/svnmover/svnmover.h

(svn_repos_move_info_t,

svn_repos_move_info_create,

svn_client__format_move_chain_for_display,

svn_client__get_repos_moves): Move from svn_client_private.h..

    • ?
    /branches/move-tracking-2/tools/dev/svnmover/scanlog.c
On the 'move-tracking-2' branch: Revert a test expectation change that

matched an earlier version of editor shims.

This reverts a part of r1615064.

* subversion/tests/cmdline/copy_tests.py

(url_to_non_existent_url_path): Tweak a path in an expected error message.

On the 'move-tracking-2' branch: Move a description of the work from

BRANCH-README to notes/move-tracking/README.

* BRANCH-README

Move most of the notes from here...

* notes/move-tracking/README

... to this new file.

    • ?
    /branches/move-tracking-2/notes/move-tracking/README
On the 'move-tracking-2' branch: Rename a file.

* subversion/libsvn_delta/migrate.c

Rename...

* subversion/libsvn_delta/branch_migrate.c

... to this. Also remove unwanted 'svn:mime-type' property.

On the 'move-tracking-2' branch: Move RA functionality out of libsvn_ra and

into 'svnmover', to localize the experimental source code as much as

possible.

* subversion/include/private/svn_ra_private.h

(svn_ra_load_branching_state,

svn_ra_get_commit_txn): Move declarations from here.

(svn_ra_fetch): Remove declaration. (Rename to 'fetch'; make private.)

* subversion/libsvn_ra/ra_loader.c

(svn_ra_get_commit_editor3): Remove insertion of compatibility shims.

(read_rev_prop,

write_rev_prop,

branch_revision_fetch_info,

txn_fetch_payloads,

branch_repos_fetch_info,

branch_get_mutable_state,

store_repos_info,

ccw_baton,

commit_callback_wrapper,

remap_commit_callback,

fb_baton,

svn_ra_fetch,

svn_ra_load_branching_state,

svn_ra_get_commit_txn): Move from here...

* tools/dev/svnmover/ra.c

... to this new file.

* tools/dev/svnmover/svnmover.h

(svn_ra_load_branching_state,

svn_ra_get_commit_txn): Move declarations to here.

    • ?
    /branches/move-tracking-2/tools/dev/svnmover/ra.c
On the 'move-tracking-2' branch: catch up to trunk@1714533.
  1. … 11 more files in changeset.
On the 'move-tracking-2' branch: Adjust documentation following r1714181.

Found by: rhuijben

* subversion/tests/cmdline/svntest/main.py

(run_svnmover): Adjust the doc string.

On the 'move-tracking-2' branch: Let the test suite read the output from

'svnmover' in normal text mode, to normalize line endings on Windows, to

fix a failure of svnmover_tests 11 on Windows.

* subversion/tests/cmdline/svntest/main.py

(run_svnmover): Don't use 'binary' mode.

On the 'move-tracking-2' branch: Try again to fix the Windows build.

* tools/dev/svnmover/merge3.c

(brief_eid_and_name_or_nil): Remove erroneous unreachable code, found by

Windows buildbot.

* tools/dev/svnmover/svnmover.c

(linenoise_completion,

sub_main): Enable linenoise completion only if HAVE_LINENOISE is defined.

* tools/dev/svnmover/util.c

(svnmover_prompt_user): Fall back to normal prompting if HAVE_LINENOISE is

not defined.

    • ?
    /branches/move-tracking-2/tools/dev/svnmover/merge3.c
On the 'move-tracking-2' branch: Fix the Windows build.

* tools/dev/svnmover/svnmover.h

(HAVE_LINENOISE): Define here, but not on Windows.

(use_coloured_output): Define even on Windows where coloured output is not

currently implemented, so that the option-handling code can still

compile and run.

* tools/dev/svnmover/svnmover.c

(HAVE_LINENOISE): Don't define here.

* tools/dev/svnmover/util.c

(HAVE_LINENOISE): Don't define here.

    • ?
    /branches/move-tracking-2/tools/dev/svnmover/svnmover.c
    • ?
    /branches/move-tracking-2/tools/dev/svnmover/svnmover.h
On the 'move-tracking-2' branch: Fix the Windows build by updating the list

of exported header files, which is long out of date.

* build.conf

(libsvn_delta): Update the 'msvc-export' list.

On the 'move-tracking-2' branch: Move 'svnmover' into the 'tools/dev'

subdirectory, as it is not intended for end users.

* build.conf

(private-includes): Update the paths.

(svnmover): Move down to the 'tools' section of the file, and update the

paths.

(__ALL__): Move the 'svnmover' lib from here...

(__MORE__): ... to here.

* subversion/svnmover

Move from here...

* tools/dev/svnmover

... to here.

* subversion/tests/cmdline/svntest/main.py

(svnmover_binary): Update the default path.

(execute_tests): Update the path given by '--bin' and '--tools-bin' options.

* LICENSE

Update the path to the 'linenoise' library.

  1. /branches/move-tracking-2/tools/dev/svnmover
On the 'move-tracking-2' branch: A follow-up to the renames of r1713980.

* subversion/include/private/svn_ra_private.h

(svn_ra_fetch): Update the doc string to track a previous rename.

* subversion/libsvn_ra/ra_loader.c

(svn_branch_repos_fetch_info,

svn_branch_get_mutable_state,

svn_ra_load_branching_state): Rename, removing the 'svn_prefix' as these

are local (static) functions, and update the callers.

On the 'move-tracking-2' branch: Update a comment, following the renames of

r1713980.

* subversion/libsvn_wc/wc.h

(svn_wc__fetch_func): Update the doc string.

On the 'move-tracking-2' branch: Update our 'LICENSE' file to include the

licence of 'linenoise'.

* LICENSE:

Add the 'linenoise' licence text.

On the 'move-tracking-2' branch: Fix oddities in 'linenoise.c' to avoid

several compiler warnings.

* subversion/svnmover/linenoise/linenoise.c

(unsupported_term): Add 'const', as it is initialized with string

constants.

(linenoiseHistoryAdd): Don't redeclare, as it was already declared in the

header.

(linenoiseEditInsert,

linenoiseEditMoveLeft,

linenoiseEditMoveRight,

linenoiseEditMoveHome,

linenoiseEditMoveEnd,

linenoiseEditHistoryNext,

linenoiseEditDelete,

linenoiseEditBackspace,

linenoiseEditDeletePrevWord): Declare as 'static', as they are not

declared in the header.

On the 'move-tracking-2' branch: Move the 'linenoise' command-line input and

completion library from libsvn_subr into 'svnmover', as it is not (yet)

needed by any other part of Subversion.

* build.conf

Track the move of the 'linenoise' library files.

* subversion/libsvn_subr/prompt.c

(svn_cmdline_prompt_user2): Remove the linenoise' code from here.

* subversion/libsvn_subr/linenoise

Move from here...

* subversion/svnmover/linenoise

... to here.

* subversion/svnmover/svnmover.c

(read_words): Call svnmover_prompt_user() instead of

svn_cmdline_prompt_user2().

* subversion/svnmover/svnmover.h

(svnmover_prompt_user): New.

* subversion/svnmover/util.c

New file.

Include 'linenoise/linenoise.c' in order to build it.

(svnmover_prompt_user): New, moved out of svn_cmdline_prompt_user2().

On the 'move-tracking-2' branch: Factor out a duplicated function.

* subversion/svnmover/svnmover.h

(svnmover_element_differences): Move and rename to here...

* subversion/svnmover/merge3.c

(element_differences): ... from here (updating callers as well)...

* subversion/svnmover/svnmover.c

(element_differences): ... and from here (updating callers as well).

On the 'move-tracking-2' branch: Change top-of-file comments of the new

headers to say 'New in ???' instead of presuming 'New in 1.10'.

On the 'move-tracking-2' branch: Make all externally visible identifiers

private, by renaming them to contain a double underscore and begin with a

limited number of prefixes (svn_branch__, svn_element__, svn_eid__).

  1. … 10 more files in changeset.
On the 'move-tracking-2' branch: Remove the 'pathrev' data type and

functions from the public API.

* subversion/include/private/svn_element.h,

subversion/libsvn_delta/element.c

(svn_pathrev_t): Move to branch_compat.c.

(svn_pathrev_dup): Delete, as unused.

(svn_pathrev_equal): Move and rename into branch_compat.c.

* subversion/libsvn_delta/branch_compat.c

(svn_pathrev_t): Move to here.

(pathrev_equal): Move and rename to here.

(pathrev_str): Rename from 'peg_path_str' and comment out as the calls to

it are commented out.

(drive_changes_r): Track the renames.

On the 'move-tracking-2' branch: Remove/hide/replace all SVN_DBG calls.

* subversion/libsvn_delta/branch.c

Remove SVN_DBG calls.

* subversion/libsvn_delta/branch_compat.c

Comment out SVN_DBG calls.

* subversion/libsvn_delta/element.c

Remove SVN_DBG calls.

* subversion/libsvn_ra_local/ra_plugin.c

Remove SVN_DBG calls.

* subversion/libsvn_ra/ra_loader.c

Comment out SVN_DBG calls.

* subversion/libsvn_wc/update_editor.c

Comment out SVN_DBG calls.

* subversion/svnmover/merge3.c

Comment out SVN_DBG calls.

* subversion/svnmover/svnmover.c

Remove SVN_DBG calls.

(migrate_replay_rev_started,

migrate_replay_rev_finished): Convert SVN_DBG calls to notifications.

On the 'move-tracking-2' branch: Remove a special debug message suppression

control that I added to the branch in r1663372.

* subversion/include/private/svn_debug.h,

subversion/libsvn_subr/debug.c

(_quiet_mode,

svn_dbg__set_quiet_mode,

svn_dbg__quiet_mode): Delete.

(svn_dbg__preamble,

debug_vprintf): Return to just honouring the 'SVN_DBG_QUIET' env-var.

* subversion/svnmover/svnmover.c

(parse_actions,

sub_main): Let the '-v' option control the local notifications mode

instead of the debug message mode.

On the 'move-tracking-2' branch: Remove most of my special hash and array

iteration utilities, leaving just a few particularly useful variants.

* subversion/include/svn_iter.h,

subversion/libsvn_subr/iter.c

(svn_array_*,

svn_hash_*,

svn_iter_t,

etc.): Delete.

(svn_int_hash_get,

svn_int_hash_set,

svn_int_hash_this_key): Rename and move ...

* subversion/include/private/svn_element.h

subversion/libsvn_delta/element.c

(svn_eid_hash_get,

svn_eid_hash_set,

svn_eid_hash_this_key): ... to these.

(svn_eid__hash_iter_t,

svn_eid__hash_sorted_first,

svn_eid__hash_sorted_next,

svn_eid__hash_sort_compare_items_by_eid,

SVN_EID__HASH_ITER_SORTED,

SVN_EID__HASH_ITER_SORTED_BY_EID): New.

Update all callers to use either existing APR functions or the new

svn_eid_* functions.

On the 'move-tracking-2' branch: Update test expectations, following r1713718.

* subversion/tests/cmdline/svnmover_tests.py

(tree_conflict_detect): Expect the commit to raise an error, not the merge.

On the 'move-tracking-2' branch: Make 'svnmover revert' also discard all

conflicts, like 'svn revert' does, and don't raise an error when a merge

raises conflicts.

Also fix some memory allocation bugs.

* subversion/svnmover/merge3.c

(branch_merge_subtree_r): Allocate conflicts in the result pool.

* subversion/svnmover/svnmover.c

(do_switch): Don't raise an error just because there are conflicts.

(do_revert): Discard all conflicts.

(execute): After 'merge', don't raise an error just because there are

conflicts. Remember conflicts in the WC pool so they will persist beyond

this iteration of the command loop.

On the 'move-tracking-2' branch: Factor out conflict printing into separate

functions.

* subversion/svnmover/merge3.c

(element_merge3_conflict_str,

name_clash_conflict_str,

cycle_conflict_str,

orphan_conflict_str): New, extracted...

(svnmover_display_conflicts): ... from here.