Author: stefan2
Date: Tue Jun 30 18:14:47 2015
New Revision: 1688500
URL: http://svn.apache.org/r1688500
Log:
On the svn-mergeinfo-normalizer branch:
Internal sub-command API cleanup. There is no need to support different
normalizers anymore:
* tools/client-side/svn-mergeinfo-normalizer/logic.c
(default_processor): Rename to ...
(normalize): ... this.
(svn_min__run_command): Rename to ...
(svn_min__run_normalize): ... this. Always call 'normalize' instead of
a processor callback.
* tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
(svn_min__process_t): No longer needed.
(svn_min__run_command): Rename to ...
(svn_min__run_normalize): ... this. Drop the processor callback.
* tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c
(svn_min__normalize): Update caller.
Modified:
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c
Modified:
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c?rev=1688500&r1=1688499&r2=1688500&view=diff
==============================================================================
---
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
(original)
+++
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
Tue Jun 30 18:14:47 2015
@@ -288,11 +288,11 @@ progress_string(const progress_t *progre
}
static svn_error_t *
-default_processor(apr_array_header_t *wc_mergeinfo,
- svn_min__log_t *log,
- svn_ra_session_t *session,
- svn_min__opt_state_t *opt_state,
- apr_pool_t *scratch_pool)
+normalize(apr_array_header_t *wc_mergeinfo,
+ svn_min__log_t *log,
+ svn_ra_session_t *session,
+ svn_min__opt_state_t *opt_state,
+ apr_pool_t *scratch_pool)
{
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
progress_t progress = { 0 };
@@ -406,19 +406,15 @@ processing_title(svn_min__opt_state_t *o
/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
-svn_min__run_command(apr_getopt_t *os,
- void *baton,
- svn_min__process_t processor,
- apr_pool_t *pool)
+svn_min__run_normalize(apr_getopt_t *os,
+ void *baton,
+ apr_pool_t *pool)
{
svn_min__cmd_baton_t *cmd_baton = baton;
apr_pool_t *iterpool = svn_pool_create(pool);
apr_pool_t *subpool = svn_pool_create(pool);
int i;
- if (processor == NULL)
- processor = default_processor;
-
for (i = 0; i < cmd_baton->opt_state->targets->nelts; i++)
{
apr_array_header_t *wc_mergeinfo;
@@ -468,8 +464,8 @@ svn_min__run_command(apr_getopt_t *os,
subpool),
stdout, subpool));
- SVN_ERR((*processor)(wc_mergeinfo, log, session, cmd_baton->opt_state,
- subpool));
+ SVN_ERR(normalize(wc_mergeinfo, log, session, cmd_baton->opt_state,
+ subpool));
/* write results to disk */
svn_pool_clear(subpool);
Modified:
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h?rev=1688500&r1=1688499&r2=1688500&view=diff
==============================================================================
---
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
(original)
+++
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
Tue Jun 30 18:14:47 2015
@@ -179,17 +179,10 @@ svn_error_t *
svn_min__print_log_stats(svn_min__log_t *log,
apr_pool_t *scratch_pool);
-typedef svn_error_t *(* svn_min__process_t)(apr_array_header_t *wc_mergeinfo,
- svn_min__log_t *log,
- svn_ra_session_t *session,
- svn_min__opt_state_t *opt_state,
- apr_pool_t *scratch_pool);
-
svn_error_t *
-svn_min__run_command(apr_getopt_t *os,
- void *baton,
- svn_min__process_t processor,
- apr_pool_t *pool);
+svn_min__run_normalize(apr_getopt_t *os,
+ void *baton,
+ apr_pool_t *pool);
#ifdef __cplusplus
}
Modified:
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c?rev=1688500&r1=1688499&r2=1688500&view=diff
==============================================================================
---
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c
(original)
+++
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c
Tue Jun 30 18:14:47 2015
@@ -46,7 +46,7 @@ svn_min__normalize(apr_getopt_t *os,
&& !cmd_baton->opt_state->combine_ranges)
cmd_baton->opt_state->remove_redundants = TRUE;
- SVN_ERR(svn_min__run_command(os, baton, NULL, pool));
+ SVN_ERR(svn_min__run_normalize(os, baton, pool));
return SVN_NO_ERROR;
}
