subversion

Checkout Tools
  • last updated 37 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1689729 is being indexed.

Make Ruby bindings build on Windows with Visual Studio 2015.

* build/generator/gen_win_dependencies.py

(SVNCommonLibrary._find_ruby): Do not define snprintf for VS2015+ because

it's a proper function in that (and presumably newer) versions.

Fix detection of Ruby on Windows for Ruby 2.2+.

* build/generator/gen_win_dependencies.py

(SVNCommonLibrary._find_ruby): Use the RbConfig module, not the deprecated Config

module; this aligns Ruby detection on Windows with the way it's done in swig.m4.

On the svn-mergeinfo-normalizer branch:

Add a summary of deleted branches to the 'analyze' output.

* tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h

(svn_min__branch_deleted_list): Declare new function.

* tools/client-side/svn-mergeinfo-normalizer/missing-branches.c

(svn_min__branch_deleted_list): Implement it.

* tools/client-side/svn-mergeinfo-normalizer/logic.c

(show_obsoletes_summary): New console output utility.

(svn_min__run_normalize): Call the new function.

On the svn-mergeinfo-normalizer branch:

Follow-up to r1689551.

* tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c

(svn_min__write_mergeinfo): Make code compile again.

On the svn-mergeinfo-normalizer branch:

Implement the 'analyze' sub-command using the common logic.c code.

It has now the same flexibility as the 'normalize' command.

* tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.c

(remove_obsolete_lines,

find_reverse_ranges,

print_ranges,

remove_lines,

analyze): Drop redundant code.

(svn_min__analyze): Simply call into logic.c with appropriate parameters.

* tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c

(svn_min__cmd_table): 'analyze' now supports -v and selective analysis.

On the svn-mergeinfo-normalizer branch:

Show the correct results in "dry-run" mode as well.

* tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h

(svn_min__remove_empty_mergeinfo): Declare new utility.

* tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c

(svn_min__write_mergeinfo): Don't modify the mergeinfo here.

(svn_min__remove_empty_mergeinfo): Do it here instead.

* tools/client-side/svn-mergeinfo-normalizer/logic.c

(svn_min__run_normalize): Even if we don't write to w/c, update the

mergeinfo count.

On the svn-mergeinfo-normalizer branch:

Add a "run-analysis" flag to the command options. This will produce a

condensed variant of the verbose output, only showing the "problematic"

parts. Future commits will switch the analysis command to using this code.

* tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h

(svn_min__opt_state_t): Add RUN_ANALYSIS flag.

* tools/client-side/svn-mergeinfo-normalizer/logic.c

(show_missing_parent,

show_reverse_ranges

show_branch_elision,

show_elision_header,

show_elision_result): Show a reduced output in "analysis" mode without

the "verbose" flag being set.

(normalize): Don't show progress in "analysis" mode.

On the svn-mergeinfo-normalizer branch:

Fix a major snafu with the m/i redundancy check.

* tools/client-side/svn-mergeinfo-normalizer/logic.c

(remove_lines): Get the filtered the sub-tree info by filtering the

sub-tree info - not the parent info. Add commentary.

On the svn-mergeinfo-normalizer branch:

In case a sub-tree mergeinfo cannot be elided, obsolete branches may

be amongst those previously reported as "elided". Therefore, log the

second removal in a separate section. Also, don't count the branch

removal if it part of removing whole nodes.

* tools/client-side/svn-mergeinfo-normalizer/logic.c

(remove_obsolete_line): Make the PROGRESS counter optional.

(remove_lines): Don't count removals of obsolete branches here.

(show_removing_obsoletes): New console output utility.

(normalize): Update caller. Show the obsolete branch removal after

failed elision under a separate header. Count removals.

On the svn-mergeinfo-normalizer branch:

Interweave removal of obsolete branches with ordinary branch elision.

Before we report an elision as failed, try to remove that entry as obsolete.

With this patch, we will report branches only once and in sorted order, if

the whole sub-tree mergeinfo could be elided.

* tools/client-side/svn-mergeinfo-normalizer/logic.c

(remove_lines): Add parameters needed to call remove_obsolete_line.

At the very beginning and at all stages that might report

an elision failure, try to remove the branch entry as

obsolete.

(normalize): Update caller. We only need to call obsolete branch removal

if m/i can't be elided.

On the svn-mergeinfo-normalizer branch:

Prepare the code to produce a clearer processing log (-v) in later commit.

This patch sorts mergeinfo by path before evaluating lines. It also

reorders the remove_* functions to get a better grouping in the source.

* tools/client-side/svn-mergeinfo-normalizer/logic.c

(progress_t,

show_removed_branch): Move definitions here. No further change.

(remove_obsolete_line): Factored out from ...

(remove_obsolete_lines): ... this. Process m/i in sorted order and

simplify the code since we no longer iterate

over the container that we modify. Move function

up here.

(remove_lines): Process m/i in sorted order.

Fix svnadmin_tests.py tests 34 and 35 to pass when sharded, skip

tests 32, 33 and 34 when packed.

* subversion/tests/cmdline/svnadmin_tests.py

(verify_keep_going, verify_keep_going_quiet): Skip when packed.

(verify_invalid_path_changes): Adjust expected output for sharding,

skip when packed.

(verify_denormalized_names): Adjust expected output for sharding.

* tools/dist/release.py

(tool_versions): Update to libtool 2.4.6 for trunk/1.9.

(LibtoolDep.build): New, create glibtool symlinks.

Tagging release 1.9.0-rc3
Merge the r1686175 group from trunk:

* r1686175, r1687029, r1688258

Fix part of issue #4582, "reintegrate complains about missing ranges

from node unrelated to branch"

Justification:

Reintegrate merge is impossible after the default conflict resolution

option is applied to a particular tree conflict during a sync merge.

Votes:

+1: stsp, philip, brane

On the 1.9.x branch: Merge r1689216 from trunk.

* CHANGES: Fix wrong change description.

* CHANGES: Fix wrong change description.

On the 1.9.x branch: Merged r1689214 from trunk.

* CHANGES: Update for 1.9.0-RC3

* CHANGES: Update for 1.9.0-RC3

* branches/1.9.x/STATUS: Approve the r1686175 group.
On the 'move-tracking-2' branch: catch up to trunk@1689123.
  1. … 7 more files in changeset.
On the svn-mergeinfo-normalizer branch:

In verbose mode, also log the removal of obsolete branch mergeinfo.

* tools/client-side/svn-mergeinfo-normalizer/logic.c

(show_removed_branch): New console output function.

(remove_obsolete_lines): Invoke the new function.

(normalize): Don't remove branches from the parent mergeinfo as it

only confuses the verbose output and does not contribute

to the elision process anymore.

On the svn-mergeinfo-normalizer branch:

In verbose mode, log the mergeinfo elision process.

* tools/client-side/svn-mergeinfo-normalizer/logic.c

(all_positive_ranges): Replace by ...

(find_reverse_ranges): ... this similar function but returning a full

list of "offending" ranges.

(print_ranges,

show_missing_parent,

show_reverse_ranges,

show_branch_elision): New console output functions. Logic mostly taken

from analyze-cmd.c .

(get_parent_path): New utility function.

(remove_lines): Invoke the new output functions. Change the traversal

logic from "lookup-by-parent-mi" to "lookup-by-subtree-mi"

which allows us to directly detect missing parent entries.

(shorten_lines): Update caller.

(show_elision_result): Add newline between details and summary.

(normalize): Update caller.

On the svn-mergeinfo-normalizer branch:

Add a '--verbose' option to the 'normalize' sub-command.

In this first stage, we show a header and a footer for each node that

we process. The logic is taken from the 'analyze' output.

* tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h

(svn_min__opt_state_t): Add VERBOSE flag.

* tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c

(svn_min__cmd_table): Make '-v' option available to 'normalize'.

(sub_main): Process -v option.

* tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c

(svn_min__get_mergeinfo_pair): Improve usability by also providing path

info in case there only a single node.

* tools/client-side/svn-mergeinfo-normalizer/logic.c

(show_elision_header,

show_elision_result): New console output functions. Their code taken

from analyze-cmd.c .

(normalize): Invoke the new output functions. Show progress only if

there is no other output.

On the svn-mergeinfo-normalizer branch:

Revert most of r1689076 and try a slightly different approach.

Let the svn_min__get_mergeinfo_pair do all the heavy lifting such that

the return parameters always get initialized instead of handling the

various cases in the caller.

* tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h

(svn_min__get_mergeinfo_pair,

svn_min__get_parent_mergeinfo): Revert rename and drop the boolean return.

* tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c

(svn_min__get_mergeinfo_pair,

svn_min__get_parent_mergeinfo): Revert rename and always set all return

arguments.

* tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.c

(analyze): Simplify caller.

* tools/client-side/svn-mergeinfo-normalizer/logic.c

(normalize): Same.

On the svn-mergeinfo-normalizer branch:

Minor refactoring removing redundant access to mergeinfo.

* tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h

(svn_min__get_mergeinfo_pair): Rename to ...

(svn_min__get_parent_mergeinfo): ... this and don't return the sub-tree

mergeinfo anymore.

* tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c

(svn_min__get_mergeinfo_pair,

svn_min__get_parent_mergeinfo): Update implementation.

* tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.c

(analyze): Update caller. Assign the sub-tree mergeinfo only once.

* tools/client-side/svn-mergeinfo-normalizer/logic.c

(normalize): Update caller.

* STATUS: vote for issue 4582 partial fix.
* STATUS: Add r1688258 for issue #4285 fix.

On move-tracking-2 branch: add State.rename to testsuite and use it in a test.

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

(State.rename): New.

* subversion/tests/cmdline/svnmover_tests.py

(merge_swap_abc): Use new function.

* branches/1.9.x/STATUS: Vote for the r1686175 group.