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 2010/03/19 01:58:23 UTC
svn commit: r925061 - in /subversion/trunk/subversion: include/svn_wc.h
libsvn_client/switch.c libsvn_client/update.c libsvn_wc/deprecated.c
libsvn_wc/update_editor.c
Author: julianfoad
Date: Fri Mar 19 00:58:23 2010
New Revision: 925061
URL: http://svn.apache.org/viewvc?rev=925061&view=rev
Log:
Revert the parameter-order-changing part of my recent r924722. The
target_revision parameter is regarded as an output parameter (it's for an
output of the editor drive) and thus should come before wc_ctx.
* subversion/include/svn_wc.h
(svn_wc_get_update_editor4, svn_wc_get_switch_editor4): Swap revision and
wc_ctx parameters.
* subversion/libsvn_client/switch.c
(switch_internal): Swap revision and wc_ctx parameters.
* subversion/libsvn_client/update.c
(update_internal): Swap revision and wc_ctx parameters.
* subversion/libsvn_wc/deprecated.c
(svn_wc_get_update_editor3, svn_wc_get_switch_editor3): Swap revision and
wc_ctx parameters.
* subversion/libsvn_wc/update_editor.c
(svn_wc_get_update_editor4, svn_wc_get_switch_editor4): Swap revision and
wc_ctx parameters.
Modified:
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/libsvn_client/switch.c
subversion/trunk/subversion/libsvn_client/update.c
subversion/trunk/subversion/libsvn_wc/deprecated.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=925061&r1=925060&r2=925061&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Fri Mar 19 00:58:23 2010
@@ -5263,8 +5263,8 @@ svn_wc_get_actual_target(const char *pat
svn_error_t *
svn_wc_get_update_editor4(const svn_delta_editor_t **editor,
void **edit_baton,
- svn_wc_context_t *wc_ctx,
svn_revnum_t *target_revision,
+ svn_wc_context_t *wc_ctx,
const char *anchor_abspath,
const char *target_basename,
svn_boolean_t use_commit_times,
@@ -5389,8 +5389,8 @@ svn_wc_get_update_editor(svn_revnum_t *t
svn_error_t *
svn_wc_get_switch_editor4(const svn_delta_editor_t **editor,
void **edit_baton,
- svn_wc_context_t *wc_ctx,
svn_revnum_t *target_revision,
+ svn_wc_context_t *wc_ctx,
const char *anchor_abspath,
const char *target_basename,
const char *switch_url,
Modified: subversion/trunk/subversion/libsvn_client/switch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/switch.c?rev=925061&r1=925060&r2=925061&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/switch.c (original)
+++ subversion/trunk/subversion/libsvn_client/switch.c Fri Mar 19 00:58:23 2010
@@ -189,7 +189,7 @@ switch_internal(svn_revnum_t *result_rev
efb.ambient_depths = apr_hash_make(pool);
efb.result_pool = pool;
SVN_ERR(svn_wc_get_switch_editor4(&switch_editor, &switch_edit_baton,
- ctx->wc_ctx, &revnum, anchor_abspath,
+ &revnum, ctx->wc_ctx, anchor_abspath,
target, switch_rev_url, use_commit_times,
depth,
depth_is_sticky, allow_unver_obstructions,
Modified: subversion/trunk/subversion/libsvn_client/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/update.c?rev=925061&r1=925060&r2=925061&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/update.c (original)
+++ subversion/trunk/subversion/libsvn_client/update.c Fri Mar 19 00:58:23 2010
@@ -221,7 +221,7 @@ update_internal(svn_revnum_t *result_rev
/* Fetch the update editor. If REVISION is invalid, that's okay;
the RA driver will call editor->set_target_revision later on. */
SVN_ERR(svn_wc_get_update_editor4(&update_editor, &update_edit_baton,
- ctx->wc_ctx, &revnum, anchor_abspath,
+ &revnum, ctx->wc_ctx, anchor_abspath,
target, use_commit_times, depth,
depth_is_sticky, allow_unver_obstructions,
diff3_cmd, preserved_exts,
Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=925061&r1=925060&r2=925061&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Fri Mar 19 00:58:23 2010
@@ -2751,8 +2751,8 @@ svn_wc_get_update_editor3(svn_revnum_t *
}
SVN_ERR(svn_wc_get_update_editor4(editor, edit_baton,
- wc_ctx,
target_revision,
+ wc_ctx,
svn_wc__adm_access_abspath(anchor),
target,
use_commit_times,
@@ -2868,8 +2868,8 @@ svn_wc_get_switch_editor3(svn_revnum_t *
}
SVN_ERR(svn_wc_get_switch_editor4(editor, edit_baton,
- wc_ctx,
target_revision,
+ wc_ctx,
svn_wc__adm_access_abspath(anchor),
target, switch_url,
use_commit_times,
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=925061&r1=925060&r2=925061&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri Mar 19 00:58:23 2010
@@ -5352,8 +5352,8 @@ make_editor(svn_revnum_t *target_revisio
svn_error_t *
svn_wc_get_update_editor4(const svn_delta_editor_t **editor,
void **edit_baton,
- svn_wc_context_t *wc_ctx,
svn_revnum_t *target_revision,
+ svn_wc_context_t *wc_ctx,
const char *anchor_abspath,
const char *target_basename,
svn_boolean_t use_commit_times,
@@ -5390,8 +5390,8 @@ svn_wc_get_update_editor4(const svn_delt
svn_error_t *
svn_wc_get_switch_editor4(const svn_delta_editor_t **editor,
void **edit_baton,
- svn_wc_context_t *wc_ctx,
svn_revnum_t *target_revision,
+ svn_wc_context_t *wc_ctx,
const char *anchor_abspath,
const char *target_basename,
const char *switch_url,