Checkout Tools
  • last updated 4 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Move deprecated svn_diff_mem_string_output_merge() into the deprecated file.

* subversion/libsvn_diff/diff_memory.c

(svn_diff_mem_string_output_merge): Remove from here...

* subversion/libsvn_diff/deprecated.c

(svn_diff_mem_string_output_merge): and put it here.

  1. … 1 more file in changeset.
Add svn_diff_file_output_merge3() with cancel support and update callers.

* subversion/include/svn_diff.h

(svn_diff_file_output_merge3): New function.

(svn_diff_file_output_merge2): Deprecate.

* subversion/libsvn_diff/diff_file.c

(svn_diff_file_output_merge2): Replace with ...

(svn_diff_file_output_merge3): that adds cancel support.

* subversion/libsvn_diff/deprecated.c

(svn_diff_file_output_merge2): New implementation that just uses

svn_diff_file_output_merge3().

* subversion/libsvn_wc/conflicts.h

(svn_wc__mark_resolved_text_conflict): Add cancel support.

* subversion/libsvn_wc/conflicts.c

(merge_showing_conflicts, eval_text_conflict_func_result,

resolve_text_conflict, svn_wc__mark_resolved_text_conflict):

Add cancel support.

(svn_wc__conflict_invoke_resolver): Pass cancel arguments to

resolve_text_conflict() and svn_wc__mark_resolved_text_conflict()

(resolve_text_conflict_on_node): Pass cancel arguments to

merge_showing_conflicts.

* subversion/libsvn_wc/merge.c

(do_text_merge): Add cancel support.

(merge_text_file): Update caller.

* subversion/libsvn_wc/adm_crawler.c

(restore_file): Update call to svn_wc__mark_resolved_text_conflict().

Did not add cancel support here.

* subversion/svn/conflict-callbacks.c

(show_conflicts, merge_prop_conflict, show_prop_conflict,

edit_prop_conflict): Add cancel support.

(handle_text_conflict): Update call to show_conflicts().

(handle_prop_conflict): Update call to show_prop_conflict().

* subversion/tests/libsvn_diff/diff-diff3-test.c

(three_way_merge): Switch to svn_diff_file_output_merge3().

* tools/diff/diff3.c

(do_diff3): Switch to svn_diff_file_output_merge3().

* tools/diff/diff4.c

(do_diff4): Switch to svn_diff_file_output_merge3().

  1. … 10 more files in changeset.
Following up on r1597983 and r1618839, expose configurable context size via

the now revved svn_diff_mem_string_output_unified3() function.

* subversion/include/private/svn_diff_private.h

(svn_diff__display_prop_diffs): Add context_size argument.

* subversion/include/svn_diff.h

(svn_diff_mem_string_output_unified3): Add context_size.

(svn_diff_mem_string_output_unified2): Tweak documentation.

* subversion/libsvn_client/diff.c

(display_prop_diffs): Update caller.

* subversion/libsvn_diff/deprecated.c

(svn_diff_mem_string_output_unified2): Update caller.

* subversion/libsvn_diff/diff_memory.c

(svn_diff_mem_string_output_unified3): Add argument.

* subversion/libsvn_diff/util.c

(svn_diff__display_prop_diffs): Add argument.

* subversion/svnlook/svnlook.c

(display_prop_diffs): Update caller.

  1. … 6 more files in changeset.
Add svn_diff_mem_string_output_unified3() with cancel support and adjust callers.

* subversion/include/svn_diff.h

(svn_diff_mem_string_output_unified3): New function that replaces...

(svn_diff_mem_string_output_unified, svn_diff_mem_string_output_unified2):

Deprecate.

* subversion/include/private/svn_diff_private.h

(svn_diff__display_prop_diffs): Add cancel support.

* subversion/libsvn_client/diff.c

(display_prop_diffs, diff_props_changed): Add cancel support.

* subversion/libsvn_diff/deprecated.c

(svn_diff_mem_string_output_unified, svn_diff_mem_string_output_unified2): Add

implementations that are based on svn_diff_mem_string_output_unified3().

* subversion/libsvn_diff/diff_memory.c

(svn_diff_mem_string_output_unified2): Replace with ...

(svn_diff_mem_string_output_unified3): New function with cancel support.

(svn_diff_mem_string_output_unified): Moved to deprecated.c.

* subversion/libsvn_diff/util.c

(svn_diff__display_prop_diffs): Add cancel support.

* subversion/svnlook/svnlook.c

(display_prop_diffs): Add cancel support.

  1. … 6 more files in changeset.
Use svn_error_trace() in implementation of svn_diff_mem_string_output_merge2().

* subversion/libsvn_diff/deprecated.c

(svn_diff_mem_string_output_merge2): Wrap in svn_error_trace().

Add svn_diff_mem_string_output_merge3() with cancel support.

* subversion/include/svn_diff.h

(svn_diff_mem_string_output_merge3): New function.

(svn_diff_mem_string_output_merge2): Deprecate.

* subversion/libsvn_diff/diff_memory.c

(svn_diff_mem_string_output_merge2): Convert into ...

(svn_diff_mem_string_output_merge3): New function with cancel support.

* subversion/libsvn_diff/deprecated.c

(svn_diff_mem_string_output_merge2): New implementation that calls

svn_diff_mem_string_output_merge3().

* subversion/libsvn_wc/conflicts.c

(generate_propconflict): Add cancel support and use *_merge3().

(svn_wc__conflict_invoke_resolver): Update to pass cancel args to

generate_propconflict.

* subversion/libsvn_wc/props.c

(prop_conflict_from_skel, append_prop_conflict, svn_wc__create_prejfile):

Add cancel support.

* subversion/libsvn_wc/props.h

(svn_wc__create_prejfile): Add cancel support.

* subversion/libsvn_wc/workqueue.c

(run_prej_install): Pass cancel func/baton to svn_wc__create_prejfile.

  1. … 6 more files in changeset.
Extend svn_diff_file_options_t and svn_diff_file_output_unified4() to allow

configuring the context size for file diffs.

* subversion/include/svn_diff.h

(svn_diff_file_options_t): Add variable.

(svn_diff_file_output_unified4): Add argument.

(svn_diff_file_output_unified3): Document legacy behavior.

* subversion/libsvn_client/diff.c

(diff_content_changed): Update caller.

* subversion/libsvn_diff/deprecated.c

(svn_diff_file_output_unified3): Update caller.

* subversion/libsvn_diff/diff_file.c

(svn_diff_file_options_create): Initialize with original default.

(svn_diff_file_output_unified4): Add argument. Update initialization.

* subversion/svn/conflict-callbacks.c

(show_diff): Update caller. Use options to document defaults.

* subversion/svnlook/svnlook.c

(print_diff_tree): Update caller.

  1. … 5 more files in changeset.
While working on diff, resolve a long standing personal issue by making it

possible to cancel unified diff output.

* subversion/include/svn_diff.h

(svn_diff_output2): New function.

(svn_diff_output): Deprecate function.

(svn_diff_file_output_unified4): New function.

(svn_diff_file_output_unified3): Deprecate function.

* subversion/libsvn_client/diff.c

(diff_writer_info_t): Add cancel callback.

(diff_content_changed): Update caller.

(svn_client_diff6,

svn_client_diff_peg6): Set cancel in baton.

* subversion/libsvn_diff/deprecated.c

(svn_diff_file_output_unified3,

svn_diff_output): New function.

* subversion/libsvn_diff/diff_file.c

(svn_diff_file_output_unified3): Rename to...

(svn_diff_file_output_unified4): ... and add cancel support.

* subversion/libsvn_diff/util.c

(svn_diff_output): Rename to...

(svn_diff_output2): ... and add cancel support.

  1. … 4 more files in changeset.
The semi-annual trailing whitespace cleansing ritual.

* everywhere:

for extsn in c h cpp java py pl rb; do

sed -i -e 's/[ \t]*$//' `find . -name "*.$extsn" | xargs grep '[ \t]$' -l`

done

  1. … 144 more files in changeset.
* subversion/libsvn_diff/deprecated.c

(datasources_open): Add SUFFIX_LINES parameter, to match signature defined

in svn_diff.h.

Found by: ivan

Remove several compiler warnings.

* subversion/libsvn_diff/deprecated.c

(datasources_open): Use apr_size_t to remove warning about

signed/unsigned mismatch.

(token_discard, token_discard_all): Do not return void. It seems Visual

Studio compiler doesn't like such syntax.

* subversion/libsvn_diff/deprecated.c

(datasources_open): Tweak declaration to match r1067964 and r1067960.

Reintegrate diff-optimizations-bytes branch with trunk.

  1. … 12 more files in changeset.
Test out my new and fancy ASF commit priviledges by changing the copyright

wording in our license headers to reflect ownership by the ASF.

* NOTICE:

Change terminology to ASF, and update a link.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Note that the product as a whole is

copyrighted by the ASF, and update the project website.

* everywhere:

Change license text to reflect ASF ownership.

  1. … 891 more files in changeset.
* subversion/libsvn_diff/deprecated.c

End the last line of the file with a newline.

Resolve two deprecation warnings by using dirent functions

and move four functions to deprecated.c

* subversion/libsvn_diff/deprecated.c

(svn_diff_file_diff,

svn_diff_file_diff3,

svn_diff_file_diff4,

svn_diff_file_output_merge): Move here..

* subversion/libsvn_diff/diff_file.c

(svn_diff_file_diff,

svn_diff_file_diff3,

svn_diff_file_diff4,

svn_diff_file_output_merge): From here..

(svn_diff_file_output_unified3): Use dirent functions and

platform localize paths in error messages.

  1. … 1 more file in changeset.
Relicense Subversion under the Apache License, Version 2.0.

* NOTICE: New.

* LICENSE: New.

* COPYING,

subversion/LICENSE: Remove.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Note that the product as a whole is

copyrighted by the SVN Corp, and that it contains contributions from

many people, as referenced in NOTICE.

* subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS:

Relicense the SVN parts under Apache 2.0.

* everywhere:

Change copyright notices in file headers to reflect the Apache 2.0 license.

  1. … 882 more files in changeset.
Remove false positive deprecation warnings for libsvn_diff. See r33904 for

further information.

* subversion/libsvn_diff/deprecated.c:

New.

* subversion/libsvn_diff/diff_file.c:

Move deprecated symbols out, as needed.

  1. … 1 more file in changeset.