philip@tigris.org writes:
> Log:
> Fix 'svn diff -rREV1:REV2 <http_url>'.
>
> The test is a bit of a guess, I cannot get any of the tests to run
> over ra_dav at present :-(
Yesterday I noticed that Subversion was *segfaulting* in the test
suite, using ra_local. This was on my home box, Debian Linux 2.4.
So I think the tests may be completely broken at the moment; if so,
first priority today is getting them to work both locally and over
dav.
-K
> * subversion/libsvn_client/diff.c (svn_client_diff): Pass a null anchor to
> svn_client__open_ra_session when the target is an URL.
>
> * subversion/libsvn_client/ra.c (open_tmp_file): Allow for a null anchor.
>
> * subversion/tests/clients/cmdline/diff_tests.py
> (diff_pure_repository_update_a_file): Add new test.
>
>
>
> Modified: trunk/subversion/libsvn_client/ra.c
> ==============================================================================
> --- OLD/trunk/subversion/libsvn_client/ra.c Sun Jan 20 17:31:12 2002
> +++ NEW/trunk/subversion/libsvn_client/ra.c Sun Jan 20 17:31:12 2002
> @@ -47,8 +47,14 @@
> void *callback_baton)
> {
> svn_client__callback_baton_t *cb = callback_baton;
> - svn_stringbuf_t *truepath = svn_stringbuf_dup (cb->base_dir, cb->pool);
> + svn_stringbuf_t *truepath;
> svn_stringbuf_t *ignored_filename;
> +
> + if (cb->base_dir)
> + truepath = svn_stringbuf_dup (cb->base_dir, cb->pool);
> + else
> + /* ### TODO: need better tempfile support */
> + truepath = svn_stringbuf_create (".", cb->pool);
>
> /* Tack on a made-up filename. */
> svn_path_add_component_nts (truepath, "tempfile");
>
> Modified: trunk/subversion/libsvn_client/diff.c
> ==============================================================================
> --- OLD/trunk/subversion/libsvn_client/diff.c Sun Jan 20 17:31:13 2002
> +++ NEW/trunk/subversion/libsvn_client/diff.c Sun Jan 20 17:31:13 2002
> @@ -191,10 +191,7 @@
> if (path_is_url)
> {
> URL = path;
> - /* Need to set anchor since the ra callbacks use it for creating
> - temporary files. */
> - /* ### TODO: Need apr temp file support */
> - anchor = svn_stringbuf_create(".", pool);
> + anchor = NULL;
> target = NULL;
> }
> else
>
> Modified: trunk/subversion/tests/clients/cmdline/diff_tests.py
> ==============================================================================
> --- OLD/trunk/subversion/tests/clients/cmdline/diff_tests.py Sun Jan 20 17:31:13 2002
> +++ NEW/trunk/subversion/tests/clients/cmdline/diff_tests.py Sun Jan 20 17:31:13 2002
> @@ -547,6 +547,28 @@
>
> return 0
>
> +# test 9
> +def diff_pure_repository_update_a_file(sbox):
> + "pure repository diff update a file"
> +
> + if sbox.build():
> + return 1
> +
> + wc_dir = sbox.wc_dir
> + was_cwd = os.getcwd()
> + os.chdir(wc_dir)
> + update_a_file()
> + svntest.main.run_svn(None, 'ci')
> + os.chdir(was_cwd)
> +
> + url = os.path.join(svntest.main.test_area_url,
> + svntest.main.general_repo_dir,
> + sbox.name)
> + print url
> +
> + diff_output, err_output = svntest.main.run_svn(None, 'diff', '-r1:2', url)
> +
> + return check_update_a_file(diff_output)
>
> ########################################################################
> # Run the tests
> @@ -562,6 +584,7 @@
> diff_non_recursive,
> diff_repo_subset,
> diff_non_version_controlled_file,
> + diff_pure_repository_update_a_file
> ]
>
> if __name__ == '__main__':
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:57 2006