You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/07/22 12:21:54 UTC
svn commit: r1149546 - in /subversion/trunk/subversion/libsvn_client:
client.h diff.c merge.c repos_diff.c
Author: julianfoad
Date: Fri Jul 22 10:21:53 2011
New Revision: 1149546
URL: http://svn.apache.org/viewvc?rev=1149546&view=rev
Log:
Remove redundant parameters from a private API.
* subversion/libsvn_client/client.h,
(svn_client__get_diff_editor): Remove 'dry_run' and 'scratch_pool'
parameters.
* subversion/libsvn_client/repos_diff.c
(edit_baton): Remove 'dry_run' member.
(close_directory): Remove an obsolete comment.
(svn_client__get_diff_editor): Remove 'dry_run' and 'scratch_pool'
parameters.
* subversion/libsvn_client/diff.c
(diff_repos_repos): Adjust caller.
* subversion/libsvn_client/merge.c
(drive_merge_report_editor): Adjust caller.
Modified:
subversion/trunk/subversion/libsvn_client/client.h
subversion/trunk/subversion/libsvn_client/diff.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/repos_diff.c
Modified: subversion/trunk/subversion/libsvn_client/client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1149546&r1=1149545&r2=1149546&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/client.h (original)
+++ subversion/trunk/subversion/libsvn_client/client.h Fri Jul 22 10:21:53 2011
@@ -595,8 +595,6 @@ svn_client__switch_internal(svn_revnum_t
DEPTH is the depth to recurse.
- DRY_RUN is set if this is a dry-run merge. It is not relevant for diff.
-
RA_SESSION defines the additional RA session for requesting file
contents.
@@ -615,15 +613,13 @@ svn_client__get_diff_editor(const svn_de
svn_ra_session_t *ra_session,
svn_revnum_t revision,
svn_boolean_t walk_deleted_dirs,
- svn_boolean_t dry_run,
const svn_wc_diff_callbacks4_t *diff_callbacks,
void *diff_cmd_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+ apr_pool_t *result_pool);
/* ---------------------------------------------------------------- */
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1149546&r1=1149545&r2=1149546&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Fri Jul 22 10:21:53 2011
@@ -1737,11 +1737,11 @@ diff_repos_repos(const svn_wc_diff_callb
SVN_ERR(svn_client__get_diff_editor(
&diff_editor, &diff_edit_baton,
NULL, "", depth,
- extra_ra_session, rev1, TRUE, FALSE,
+ extra_ra_session, rev1, TRUE,
callbacks, callback_baton,
ctx->cancel_func, ctx->cancel_baton,
NULL /* no notify_func */, NULL /* no notify_baton */,
- pool, pool));
+ pool));
/* We want to switch our txn into URL2 */
SVN_ERR(svn_ra_do_diff3
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1149546&r1=1149545&r2=1149546&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Jul 22 10:21:53 2011
@@ -5023,12 +5023,12 @@ drive_merge_report_editor(const char *ta
merge_b->ctx->wc_ctx, target_abspath,
depth,
merge_b->ra_session2, revision1,
- FALSE, merge_b->dry_run,
+ FALSE,
&merge_callbacks, merge_b,
merge_b->ctx->cancel_func,
merge_b->ctx->cancel_baton,
notification_receiver, notify_b,
- scratch_pool, scratch_pool));
+ scratch_pool));
SVN_ERR(svn_ra_do_diff3(merge_b->ra_session1,
&reporter, &report_baton, revision2,
"", depth, merge_b->ignore_ancestry,
Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1149546&r1=1149545&r2=1149546&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Fri Jul 22 10:21:53 2011
@@ -67,9 +67,6 @@ struct edit_baton {
const svn_wc_diff_callbacks4_t *diff_callbacks;
void *diff_cmd_baton;
- /* DRY_RUN is TRUE if this is a dry-run diff, false otherwise. */
- svn_boolean_t dry_run;
-
/* RA_SESSION is the open session for making requests to the RA layer */
svn_ra_session_t *ra_session;
@@ -1113,9 +1110,6 @@ close_directory(void *dir_baton,
if (!b->added && b->propchanges->nelts > 0)
remove_non_prop_changes(b->pristine_props, b->propchanges);
- /* Don't do the props_changed stuff if this is a dry_run and we don't
- have an access baton, since in that case the directory will already
- have been recognised as added, in which case they cannot conflict. */
if (b->propchanges->nelts > 0)
{
svn_boolean_t tree_conflicted = FALSE;
@@ -1316,15 +1310,13 @@ svn_client__get_diff_editor(const svn_de
svn_ra_session_t *ra_session,
svn_revnum_t revision,
svn_boolean_t walk_deleted_dirs,
- svn_boolean_t dry_run,
const svn_wc_diff_callbacks4_t *diff_callbacks,
void *diff_cmd_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+ apr_pool_t *result_pool)
{
apr_pool_t *editor_pool = svn_pool_create(result_pool);
svn_delta_editor_t *tree_editor = svn_delta_default_editor(editor_pool);
@@ -1339,7 +1331,6 @@ svn_client__get_diff_editor(const svn_de
eb->depth = depth;
eb->diff_callbacks = diff_callbacks;
eb->diff_cmd_baton = diff_cmd_baton;
- eb->dry_run = dry_run;
eb->ra_session = ra_session;
eb->revision = revision;