subversion

Checkout Tools
  • last updated 4 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Delete the 'svnpatch-diff' branch which was merged to trunk in r36404.

On the 'svnpatch-diff' branch:

Merge r36389:36402 from trunk.

On the 'svnpatch-diff' branch:

Store temporary files in 'tmp' directory of administrative area.

* subversion/libsvn_client/diff.c

(SVNPATCH_DELETE_WHEN): Define.

(svn_client_diff5, svn_client_diff_peg5): Store temporary files in 'tmp'

directory of administrative area.

* subversion/libsvn_client/patch.c

(SVNPATCH_DELETE_WHEN): Define.

(extract_svnpatch): Add 'adm_access' argument. Store temporary files in 'tmp'

directory of administrative area.

(svn_client_patch): Update call to adm_access().

On the 'svnpatch-diff' branch:

Delete svn_stringbuf_appendf() which is now used only in 1 test.

* subversion/include/svn_string.h

(svn_stringbuf_appendf): Delete declaration.

* subversion/libsvn_subr/svn_string.c

(svn_stringbuf_appendf): Delete definition.

* subversion/tests/libsvn_subr/string-test.c

(test24): Delete.

(test_funcs): Delete test24.

On the 'svnpatch-diff' branch:

Merge r35906:36389 from trunk.

  1. … 188 more files in changeset.
On the 'svnpatch-diff' branch:

* subversion/libsvn_client/repos_diff.c

(close_file): Update comment.

* subversion/libsvn_wc/copy.c

(copy_file_administratively): Fix indentation.

* subversion/libsvn_wc/diff.c

(file_diff, dir_diff, report_wc_file_as_added, close_file): Update comments.

* subversion/svn/patch-cmd.c

(svn_cl__patch): Fix indentation.

On the 'svnpatch-diff' branch:

* subversion/tests/cmdline/patch_tests.py

(append_newline): Delete.

(svnpatch_encode): Simplify.

On the 'svnpatch-diff' branch:

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

(run_and_verify_patch): For compatibility with Python 3 update calls to

print() and don't use map().

On the 'svnpatch-diff' branch:

* subversion/include/svn_client.h

(svn_client_diff5): Update @since tag.

(svn_client_diff4): Update @deprecated tag.

(svn_client_diff_peg5): Update @since tag.

(svn_client_diff_peg4): Update @deprecated tag.

(svn_client_patch): Update @since tag.

* subversion/include/svn_wc.h

(svn_wc_diff_callbacks4_t): New.

(svn_wc_diff_callbacks3_t): Deprecate.

(svn_wc_diff_callbacks2_t): Fix doc strings.

(svn_wc_get_diff_editor6): New.

(svn_wc_get_diff_editor5): Deprecate.

(svn_wc_diff6): New.

(svn_wc_diff5): Deprecate.

(svn_wc_diff4): Fix doc string.

* subversion/libsvn_client/client.h

(svn_client__get_diff_editor): Update arguments.

* subversion/libsvn_client/diff.c

(diff_cmd_baton.revnum1, diff_cmd_baton.revnum2): Update doc strings.

(diff_props_changed, diff_file_changed, diff_file_added,

diff_file_deleted_with_diff, diff_file_deleted_no_diff, diff_dir_added,

diff_dir_deleted, diff_dir_opened, diff_dir_closed): Update doc strings.

(diff_wc_wc): Update arguments. Call svn_wc_diff6() instead of svn_wc_diff5().

(diff_repos_repos): Update arguments.

(diff_repos_wc): Update arguments. Call svn_wc_get_diff_editor6() instead of

svn_wc_get_diff_editor5().

(do_diff): Update arguments.

(svn_client_diff5, svn_client_diff_peg5): Update types of variables.

* subversion/libsvn_client/merge.c

(merge_props_changed, merge_file_changed, merge_file_added,

merge_file_deleted, merge_dir_added, merge_dir_deleted,

merge_dir_opened, merge_dir_closed): Update doc strings.

(merge_callbacks): Update type.

(drive_merge_report_editor): Update doc string and arguments.

* subversion/libsvn_client/patch.c

(merge_props_changed, merge_file_changed, merge_file_added,

merge_file_deleted, merge_dir_added, merge_dir_deleted): Update doc strings.

(patch_callbacks): Update type.

(edit_baton.diff_callbacks): Update type.

(make_editor_baton): Update arguments.

* subversion/libsvn_client/repos_diff.c

(edit_baton.diff_callbacks): Update type.

(svn_client__get_diff_editor): Update arguments.

* subversion/libsvn_wc/deprecated.c

(file_changed, file_deleted, dir_deleted,

dir_props_changed, dir_opened, dir_closed): Update doc strings.

(file_added, dir_added): Fix arguments.

(callbacks3_wrapper_baton): New.

(file_added3): New.

(dir_added3): New.

(callbacks3_wrapper): New.

(svn_wc_get_diff_editor5): Define.

(svn_wc_get_diff_editor4): Update call to svn_wc_get_diff_editor5().

(svn_wc_get_diff_editor2): Update call to svn_wc_get_diff_editor5().

(svn_wc_diff5): Define.

(svn_wc_diff4): Update call to svn_wc_diff5().

(svn_wc_diff2): Update call to svn_wc_diff5().

* subversion/libsvn_wc/diff.c

(edit_baton.callbacks): Update type.

(make_editor_baton): Update arguments.

(get_svnpatch_diff_editor): Update doc string.

(svn_wc_get_diff_editor5): Don't define.

(svn_wc_get_diff_editor6): New.

(svn_wc_diff5): Don't define.

(svn_wc_diff6): New.

On the 'svnpatch-diff' branch:

* subversion/include/svn_error_codes.h

(SVN_ERR_EXTERNAL_PROGRAM_MISSING): Update @since tag.

On the 'svnpatch-diff' branch:

Merge r35608:35906 from trunk.

  1. … 225 more files in changeset.
On the 'svnpatch-diff' branch:

Merge r35462:35608 from trunk.

  1. … 116 more files in changeset.
On the 'svnpatch-diff' branch:

Merge r35300:35462 from trunk.

    • ?
    /branches/svnpatch-diff/subversion/libsvn_subr/quoprint.c
  1. … 191 more files in changeset.
On the 'svnpatch-diff' branch:

Merge r35200:35300 from trunk.

  1. … 97 more files in changeset.
On the 'svnpatch-diff' branch:

Merge r35001:35200 from trunk.

  1. … 113 more files in changeset.
On the 'svnpatch-diff' branch:

Merge r34929:35001 from trunk.

  1. … 47 more files in changeset.
On the 'svnpatch-diff' branch:

Use svn_wc_add3() instead of deprecated svn_wc_add2().

* subversion/libsvn_client/patch.c

(merge_file_added, merge_dir_added): Use svn_wc_add3() instead of deprecated

svn_wc_add2().

On the 'svnpatch-diff' branch:

Use svn_client_args_to_target_array() instead of deprecated

svn_opt_args_to_target_array2().

* subversion/svn/patch-cmd.c

(svn_cl__patch): Use svn_client_args_to_target_array() instead of deprecated

svn_opt_args_to_target_array2().

On the 'svnpatch-diff' branch:

Use svn_io_file_checksum2() instead of deprecated svn_io_file_checksum().

Use svn_checksum_to_cstring_display() instead of deprecated

svn_md5_digest_to_cstring_display().

* subversion/libsvn_wc/diff.c

(close_file): Use svn_io_file_checksum2() instead of deprecated

svn_io_file_checksum(). Use svn_checksum_to_cstring_display() instead of

deprecated svn_md5_digest_to_cstring_display().

On the 'svnpatch-diff' branch:

Merge r34781:34929 from trunk.

  1. … 123 more files in changeset.
On the 'svnpatch-diff' branch:

Merge r34594:r34781 from trunk.

  1. … 89 more files in changeset.
On the 'svnpatch-diff' branch:

Merge r34400:34594 from trunk.

  1. … 93 more files in changeset.
On the 'svnpatch-diff' branch:

Merge r34300:34400 from trunk.

  1. … 96 more files in changeset.
On the 'svnpatch-diff' branch:

Fix diff_tests.py 51.

* subversion/tests/cmdline/diff_tests.py

(diff_svnpatch): Update expected output.

On the 'svnpatch-diff' branch:

* subversion/tests/cmdline/diff_tests.py

(diff_svnpatch.re_svnpatch): Moved here from ...

(diff_svnpatch.extract_svnpatch.re_svnpatch): ... here.

(diff_svnpatch.append_newline): Delete.

(diff_svnpatch.svnpatch_encode): Simplify and use list comprehension instead

of map() for compatibility with Python 3.

(diff_svnpatch.svnpatch_decode): Simplify.

(diff_svnpatch.compare_svnpatch): Rename to ...

(diff_svnpatch.verify_svnpatch): ... this and don't print svnpatches without

the '--verbose' option.

(diff_svnpatch): Use verify_svnpatch() instead of compare_svnpatch().

On the 'svnpatch-diff' branch:

Improve comparison of svnpatches in diff_tests.py.

* subversion/tests/cmdline/diff_tests.py

(diff_svnpatch.svnpatch_decode, diff_svnpatch.compare_svnpatch): New.

(diff_svnpatch): Use diff_svnpatch.compare_svnpatch().

On the 'svnpatch-diff' branch:

Follow-up to r34484:

Delete svn:mergeinfo on some files.

On the 'svnpatch-diff' branch:

Merge r34200:34300 from trunk.

    • ?
    /branches/svnpatch-diff/www/faq.zh.html
  1. … 64 more files in changeset.
On the 'svnpatch-diff' branch:

Follow-up to r34481:

Record '/trunk:r28217-28961' in svn:mergeinfo.

On the 'svnpatch-diff' branch:

Follow-up to r34481:

* subversion/libsvn_client/patch.c: Fix compilation.