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 2013/04/24 16:43:43 UTC
svn commit: r1471443 - in /subversion/trunk/subversion/svn: cl.h notify.c
resolve-cmd.c
Author: julianfoad
Date: Wed Apr 24 14:43:42 2013
New Revision: 1471443
URL: http://svn.apache.org/r1471443
Log:
Remove some unused code in 'svn'.
* subversion/svn/cl.h,
subversion/svn/notify.c
(svn_cl__notifier_reset_conflict_stats): Delete this unused function.
* subversion/svn/resolve-cmd.c
(svn_cl__resolve): Don't re-install the conflict resolver callback, since
the one and only callback is already installed.
Modified:
subversion/trunk/subversion/svn/cl.h
subversion/trunk/subversion/svn/notify.c
subversion/trunk/subversion/svn/resolve-cmd.c
Modified: subversion/trunk/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1471443&r1=1471442&r2=1471443&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Wed Apr 24 14:43:42 2013
@@ -551,13 +551,7 @@ svn_cl__check_externals_failed_notify_wr
const svn_wc_notify_t *n,
apr_pool_t *pool);
-/* Reset to zero the conflict stats accumulated in BATON, which is the
- * notifier baton from svn_cl__get_notifier().
- */
-svn_error_t *
-svn_cl__notifier_reset_conflict_stats(void *baton);
-
- /* Print the conflict stats accumulated in BATON, which is the
+/* Print the conflict stats accumulated in BATON, which is the
* notifier baton from svn_cl__get_notifier().
* Return any error encountered during printing.
*/
@@ -565,7 +559,7 @@ svn_error_t *
svn_cl__notifier_print_conflict_stats(void *baton, apr_pool_t *scratch_pool);
-/*** Log message callback stuffs. ***/
+ /*** Log message callback stuffs. ***/
/* Allocate in POOL a baton for use with svn_cl__get_log_message().
Modified: subversion/trunk/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1471443&r1=1471442&r2=1471443&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Wed Apr 24 14:43:42 2013
@@ -74,21 +74,6 @@ store_path(struct notify_baton *nb, apr_
svn_hash_sets(hash, apr_pstrdup(nb->stats_pool, path), "");
}
-svn_error_t *
-svn_cl__notifier_reset_conflict_stats(void *baton)
-{
- struct notify_baton *nb = baton;
-
- apr_hash_clear(nb->text_conflicts);
- apr_hash_clear(nb->prop_conflicts);
- apr_hash_clear(nb->tree_conflicts);
- nb->text_conflicts_resolved = 0;
- nb->prop_conflicts_resolved = 0;
- nb->tree_conflicts_resolved = 0;
- nb->skipped_paths = 0;
- return SVN_NO_ERROR;
-}
-
static const char *
remaining_str(apr_pool_t *pool, int n_remaining)
{
Modified: subversion/trunk/subversion/svn/resolve-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/resolve-cmd.c?rev=1471443&r1=1471442&r2=1471443&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/resolve-cmd.c (original)
+++ subversion/trunk/subversion/svn/resolve-cmd.c Wed Apr 24 14:43:42 2013
@@ -52,9 +52,6 @@ svn_cl__resolve(apr_getopt_t *os,
int i;
apr_pool_t *iterpool;
svn_boolean_t had_error = FALSE;
- svn_wc_conflict_resolver_func2_t conflict_func2;
- void *conflict_baton2;
- svn_cl__interactive_conflict_baton_t *b;
switch (opt_state->accept_which)
{
@@ -106,21 +103,6 @@ svn_cl__resolve(apr_getopt_t *os,
SVN_ERR(svn_cl__check_targets_are_local_paths(targets));
- /* Store old state */
- conflict_func2 = ctx->conflict_func2;
- conflict_baton2 = ctx->conflict_baton2;
-
- /* This subcommand always uses the interactive resolver function. */
- ctx->conflict_func2 = svn_cl__conflict_func_interactive;
- SVN_ERR(svn_cl__get_conflict_func_interactive_baton(&b,
- opt_state->accept_which,
- ctx->config,
- opt_state->editor_cmd,
- ctx->cancel_func,
- ctx->cancel_baton,
- scratch_pool));
- ctx->conflict_baton2 = b;
-
iterpool = svn_pool_create(scratch_pool);
for (i = 0; i < targets->nelts; i++)
{
@@ -140,10 +122,6 @@ svn_cl__resolve(apr_getopt_t *os,
}
svn_pool_destroy(iterpool);
- /* Restore state */
- ctx->conflict_func2 = conflict_func2;
- ctx->conflict_baton2 = conflict_baton2;
-
if (had_error)
return svn_error_create(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS, NULL,
_("Failure occurred resolving one or more "