Checkout
rooneg
committed
on 03 Feb 03
move the notification callback/baton pairs into svn_client_ctx_t instead of
passing it explicitly to each client function.

* subversion/in… Show more
move the notification callback/baton pairs into svn_client_ctx_t instead of

passing it explicitly to each client function.

* subversion/include/svn_client.h

 (svn_client_ctx_t): add notification function and baton member variables.

 (svn_client_checkout, svn_client_update, svn_client_switch, svn_client_mkdir,

  svn_client_delete, svn_client_import, svn_client_commit, svn_client_status,

  svn_client_merge, svn_client_revert, svn_client_copy, svn_client_move,

  svn_client_export): remove notification callback and baton args.

 (svn_client_add, svn_client_resolve): remove notification callback and baton

  args, add a context arg.

* subversion/libsvn_client/add.c

 (svn_client_add): remove notify function/baton arguments and use the ones

  in ctx instead.

* subversion/libsvn_client/checkout.c

 (svn_client_checkout): ditto.

* subversion/libsvn_client/client.h

 (svn_client__do_commit): remove notification function/baton arguments.  add

  a context argument.

 (svn_client__handle_externals): remove notification function/baton arguments.

* subversion/libsvn_client/commit.c

 (import_file): trade our notification function/baton arguments for a context

  argument, and call the notification function in the context when we need it.

 (import_dir): ditto, plus update calls to import_dir and import_file.

 (import): ditto.

 (svn_client_import): remove notification function/baton arguments, update

  call to import.

 (svn_client_commit): remove notification function/baton arguments, update

  call to svn_client__do_commit.

* subversion/libsvn_client/commit_util.c

 (do_item_commit): remove notification function/baton args and pass a context

  instead.  use notification function/baton in the context when needed.

 (svn_client__do_commit): ditto.

* subversion/libsvn_client/copy.c

 (wc_to_wc_copy): take a context instead of a notification callback/baton.

  use the notification function/baton in the context when needed.

 (repos_to_repos_copy): take a context instead of a notification callback

  and baton, pass context to svn_client__do_commit.

 (wc_to_repos_copy): remove notification function/baton and use the ones in

  the context instead.

 (repos_to_wc_copy): ditto.

 (setup_copy): remove notification function/baton, update calls to functions

  in this file that changed.

 (svn_client_copy): remove notification function/baton args, update call to

  setup_copy.

 (svn_client_move): ditto.

* subversion/libsvn_client/delete.c

 (svn_client_delete): remove notification callback/baton args and use the

  ones in the context instead.

* subversion/libsvn_client/diff.c

 (merge_file_added): update call to svn_client_copy (and pass in ctx

  where we were passing NULL).

 (merge_dir_added): ditto.

 (merge_file_deleted): update call to svn_client_delete (and pass in ctx

  where we were passing NULL).

 (merge_dir_deleted): ditto.

 (do_merge): remove notification callback/baton args and use the ones in

  ctx instead.

 (do_single_file_merge): ditto (except ctx is inside merge_b).

 (svn_client_merge): remove notification callback/baton args and update

  calls to do_single_file_merge and do_merge.

* subversion/libsvn_client/export.c

 (svn_client_export): remove notification callback/baton args, update call to

  svn_client_checkout.

* subversion/libsvn_client/externals.c

 (handle_external_item_change_baton): remove notification callback and baton

  member variables.

 (handle_external_item_change): use notification func/baton in ib's context,

  and add a check to see if it's null before we call it.  update calls to

  svn_client_checkout and svn_client_update.

 (handle_externals_desc_change_baton): remove notification callback and

  baton member variables.

 (handle_externals_desc_change): remove initialization of member variables

  we removed.

 (svn_client__handle_externals): remove notification function and baton args,

  remove initialization of variables that no longer exist.

* subversion/libsvn_client/resolve.c

 (svn_client_resolve): remove notification function and baton args, replace

  them with a svn_client_ctx_t argument.  use the notification function and

  baton in the context when we need them.

* subversion/libsvn_client/revert.c

 (svn_client_revert): ditto.

* subversion/libsvn_client/status.c

 (svn_client_status): remove notification function/baton arguments.  use the

  ones in ctx instead.

* subversion/libsvn_client/switch.c

 (svn_client_switch): ditto, plus update call to svn_client__handle_externals.

* subversion/libsvn_client/update.c

 (svn_client_update): ditto.

* subversion/clients/cmdline/add-cmd.c

* subversion/clients/cmdline/checkout-cmd.c

* subversion/clients/cmdline/commit-cmd.c

* subversion/clients/cmdline/copy-cmd.c

* subversion/clients/cmdline/delete-cmd.c

* subversion/clients/cmdline/export-cmd.c

* subversion/clients/cmdline/import-cmd.c

* subversion/clients/cmdline/merge-cmd.c

* subversion/clients/cmdline/mkdir-cmd.c

* subversion/clients/cmdline/move-cmd.c

* subversion/clients/cmdline/resolve-cmd.c

* subversion/clients/cmdline/revert-cmd.c

* subversion/clients/cmdline/status-cmd.c

* subversion/clients/cmdline/switch-cmd.c

* subversion/clients/cmdline/update-cmd.c

 (svn_cl__*): update calls to svn_client functions to account for move of

  notification function/baton's to svn_client_ctx_t.

* subversion/svnversion/main.c

 (main): update call to svn_client_status.

Show less