Checkout
sbutler
committed
on 16 Jun 12
Accept dump format v3, except for property deltas, in svndumpfilter.

Replace the hardcoded version number ("2") with a parser callback for… Show more
Accept dump format v3, except for property deltas, in svndumpfilter.

Replace the hardcoded version number ("2") with a parser callback for

the dump file format version number.  Used by svndumpfilter only (so

far).

Add an API option to treat text-deltas as text instead of applying

them.  TRUE for svndumpfilter only.

* subversion/tests/cmdline/svndumpfilter_tests.py

 (with_deltas): New test.

 (test_list): Add the test.

* subversion/tests/cmdline/svndumpfilter_tests_data/simple_v3.dump

 New file.

* subversion/include/svn_repos.h

 (magic_header_record): New callback declaration.

 (svn_repos_parse_fns3_t): Add the new callback declaration.

 (svn_repos_parse_dumpstream3): Add the text-delta option.

* subversion/libsvn_repos/load.c

 (parse_format_version):  While we're here, put the "output" argument

  first.

 (svn_repos_parse_dumpstream3): Implement the text-delta-as-text option.

  Pass the format version to the new callback.  Don't reject v3 dumpfiles

  anymore.

* subversion/svndumpfilter/main.c

 (magic_header_record): New callback.

 (svn_repos_parse_fns3_t): Add the new callback.

 (parse_baton_initialize): Remove the hard-coded format-version output.

 (do_filter): Treat text-deltas as text.

* subversion/svnrdump/load_editor.c

 (magic_header_record): New callback.

 (svn_rdump__load_dumpstream): Use the new callback.

* subversion/libsvn_repos/deprecated.c

 (fns3_from_fns2): Set the new callback.

 (svn_repos_get_fs_build_parser3): Add the text-delta option.

* subversion/libsvn_repos/load-fs-vtable.c

 (magic_header_record): New callback.

 (svn_repos_get_fs_build_parser4): Use the new callback.

 (svn_repos_load_fs4): Add the text-delta option.

Show less