You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2011/10/24 22:29:57 UTC
svn commit: r1188360 - in /subversion/trunk/subversion/libsvn_client:
mergeinfo.c mergeinfo.h
Author: pburba
Date: Mon Oct 24 20:29:57 2011
New Revision: 1188360
URL: http://svn.apache.org/viewvc?rev=1188360&view=rev
Log:
Follow-up to r1188357, remove some dev-only code that slipped into that
commit.
* subversion/libsvn_client/mergeinfo.c
* subversion/libsvn_client/mergeinfo.h
Modified:
subversion/trunk/subversion/libsvn_client/mergeinfo.c
subversion/trunk/subversion/libsvn_client/mergeinfo.h
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1188360&r1=1188359&r2=1188360&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Mon Oct 24 20:29:57 2011
@@ -46,125 +46,6 @@
#include "mergeinfo.h"
#include "svn_private_config.h"
-svn_error_t *
-print_mergeinfo(svn_mergeinfo_t mergeinfo,
- const char *msg,
- apr_pool_t *pool)
-{
-#ifdef SVN_DEBUG
- svn_string_t *out;
- if (mergeinfo)
- {
- SVN_ERR(svn_mergeinfo_to_string(&out, mergeinfo, pool));
- printf("\n----- %s --------------------------------------\n", msg);
- printf("%s", out->data);
- printf("\n---------------------------------------------\n");
- }
- else
- {
- printf("----- %s --------------------------------------\n", msg);
- printf("NULL\n");
- printf("\n---------------------------------------------\n");
- }
-#endif
- return SVN_NO_ERROR;
-}
-svn_error_t *
-print_mergeinfo_cat(svn_mergeinfo_catalog_t mergeinfo_catalog,
- const char *msg,
- apr_pool_t *pool)
-{
-#ifdef SVN_DEBUG
- if (mergeinfo_catalog)
- {
- apr_hash_index_t *hi;
-
- printf("===== %s ========================================\n", msg);
-
- for (hi = apr_hash_first(pool, mergeinfo_catalog);
- hi;
- hi = apr_hash_next(hi))
- {
- const char *path = svn__apr_hash_index_key(hi);
- svn_mergeinfo_t mergeinfo = svn__apr_hash_index_val(hi);
- SVN_ERR(print_mergeinfo(mergeinfo, path, pool));
- }
- printf("=================================================\n");
- }
- else
- {
- printf("----- %s --------------------------------------\n", msg);
- printf("NULL\n");
- printf("\n---------------------------------------------\n");
- }
-#endif
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
-print_rangelist(apr_array_header_t *rangelist,
- const char *msg,
- apr_pool_t *pool)
-{
-#ifdef SVN_DEBUG
- svn_string_t *out;
- if (rangelist)
- {
- SVN_ERR(svn_rangelist_to_string(&out, rangelist, pool));
- printf("----- %s --------------------------------------\n", msg);
- printf("%s", out->data);
- printf("\n---------------------------------------------\n");
- }
- else
- {
- printf("----- %s --------------------------------------\n", msg);
- printf("NULL\n");
- printf("\n---------------------------------------------\n");
- }
-#endif
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
-print_cwmi(apr_array_header_t *children_with_mergeinfo,
- apr_pool_t *scratch_pool)
-{
- int i;
- for (i = 1; i < children_with_mergeinfo->nelts; i++)
- {
- svn_client__merge_path_t *child =
- APR_ARRAY_IDX(children_with_mergeinfo, i,
- svn_client__merge_path_t *);
- SVN_ERR(print_mergeinfo(child->pre_merge_mergeinfo, child->abspath, scratch_pool));
- }
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
-cwmi_to_mergeinfo_catlog(svn_mergeinfo_catalog_t *mergeinfo_catalog,
- apr_array_header_t *children_with_mergeinfo,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- int i;
-
- *mergeinfo_catalog = apr_hash_make(result_pool);
-
- for (i = 0; i < children_with_mergeinfo->nelts; i++)
- {
- svn_client__merge_path_t *child =
- APR_ARRAY_IDX(children_with_mergeinfo, i,
- svn_client__merge_path_t *);
- if (child->pre_merge_mergeinfo)
- {
- apr_hash_set(*mergeinfo_catalog,
- child->abspath,
- APR_HASH_KEY_STRING,
- child->pre_merge_mergeinfo);
- }
- }
- return SVN_NO_ERROR;
-}
svn_client__merge_path_t *
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.h?rev=1188360&r1=1188359&r2=1188360&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.h (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.h Mon Oct 24 20:29:57 2011
@@ -365,27 +365,4 @@ svn_client__mergeinfo_status(svn_boolean
const char *local_abspath,
apr_pool_t *scratch_pool);
-svn_error_t *
-print_mergeinfo(svn_mergeinfo_t mergeinfo,
- const char *msg,
- apr_pool_t *pool);
-
-svn_error_t *
-print_mergeinfo_cat(svn_mergeinfo_catalog_t mergeinfo_catalog,
- const char *msg,
- apr_pool_t *pool);
-svn_error_t *
-print_rangelist(apr_array_header_t *rangelist,
- const char *msg,
- apr_pool_t *pool);
-svn_error_t *
-print_cwmi(apr_array_header_t *children_with_mergeinfo,
- apr_pool_t *scratch_pool);
-
-svn_error_t *
-cwmi_to_mergeinfo_catlog(svn_mergeinfo_catalog_t *mergeinfo_catalog,
- apr_array_header_t *children_with_mergeinfo,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
#endif /* SVN_LIBSVN_CLIENT_MERGEINFO_H */