You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/01/28 20:42:09 UTC
svn commit: r1064838 - in
/subversion/branches/ignore-mergeinfo-log/subversion: include/
libsvn_client/ libsvn_ra/ libsvn_ra_local/ libsvn_ra_neon/ libsvn_ra_serf/
libsvn_ra_svn/ libsvn_repos/ svn/
Author: hwright
Date: Fri Jan 28 19:42:09 2011
New Revision: 1064838
URL: http://svn.apache.org/viewvc?rev=1064838&view=rev
Log:
On the ignore-mergeinfo-log branch:
There really isn't a need to put a list of property names in a hash, so just
pass them around as an array.
* subversion/libsvn_ra/ra_loader.c,
subversion/libsvn_ra/ra_loader.h,
subversion/libsvn_ra_local/ra_plugin.c,
subversion/libsvn_client/log.c,
subversion/libsvn_ra_neon/log.c,
subversion/libsvn_ra_neon/ra_neon.h,
subversion/libsvn_ra_serf/log.c,
subversion/libsvn_ra_serf/ra_serf.h,
subversion/libsvn_repos/log.c,
subversion/libsvn_ra_svn/client.c:
Change any ignored_prop_mods params to array from hash.
* subversion/include/svn_repos.h,
subversion/include/svn_client.h,
subversion/include/svn_ra.h:
Same, including docstring updates.
* subversion/svn/log-cmd.c
(svn_cl__log): Populate the list, rather than a hash.
Modified:
subversion/branches/ignore-mergeinfo-log/subversion/include/svn_client.h
subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra.h
subversion/branches/ignore-mergeinfo-log/subversion/include/svn_repos.h
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_client/log.c
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/ra_loader.c
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/ra_loader.h
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/log.c
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/ra_neon.h
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/log.c
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_svn/client.c
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_repos/log.c
subversion/branches/ignore-mergeinfo-log/subversion/svn/log-cmd.c
Modified: subversion/branches/ignore-mergeinfo-log/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/include/svn_client.h?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/include/svn_client.h (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/include/svn_client.h Fri Jan 28 19:42:09 2011
@@ -2341,11 +2341,9 @@ svn_client_status(svn_revnum_t *result_r
* If @a include_merged_revisions is set, log information for revisions
* which have been merged to @a targets will also be returned.
*
- * @a ignored_prop_mods is an optional hash of property names, with keys of
- * type 'const char *' and values of type 'void *'. (The values are never
- * read, but must be non-NULL for the key to be recorded in the hash.) If
- * non-NULL, log will ignore any changes to properties names as the keys
- * of the hash when determining which revisions to return.
+ * @a ignored_prop_mods is an optional list of property names, of type
+ * 'const char *'. If non-NULL, log will ignore any changes to these
+ * properties when determining which revisions to return.
*
* If @a revprops is NULL, retrieve all revprops; else, retrieve only the
* revprops named in the array (i.e. retrieve none if the array is empty).
@@ -2372,7 +2370,7 @@ svn_client_log6(const apr_array_header_t
svn_boolean_t discover_changed_paths,
svn_boolean_t strict_node_history,
svn_boolean_t include_merged_revisions,
- const apr_hash_t *ignored_prop_mods,
+ const apr_array_header_t *ignored_prop_mods,
const apr_array_header_t *revprops,
svn_log_entry_receiver_t receiver,
void *receiver_baton,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra.h?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra.h (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra.h Fri Jan 28 19:42:09 2011
@@ -1433,11 +1433,9 @@ svn_ra_do_diff(svn_ra_session_t *session
* If @a include_merged_revisions is set, log information for revisions
* which have been merged to @a targets will also be returned.
*
- * @a ignored_prop_mods is an optional hash of property names, with keys of
- * type 'const char *' and values of type 'void *'. (The values are never
- * read, but must be non-NULL for the key to be recorded in the hash.) If
- * non-NULL, log will ignore any changes to properties names as the keys
- * of the hash when determining which revisions to return.
+ * @a ignored_prop_mods is an optional list of property names, of type
+ * 'const char *'. If non-NULL, log will ignore any changes to these
+ * properties when determining which revisions to return.
*
* If @a revprops is NULL, retrieve all revprops; else, retrieve only the
* revprops named in the array (i.e. retrieve none if the array is empty).
@@ -1476,7 +1474,7 @@ svn_ra_get_log3(svn_ra_session_t *sessio
svn_boolean_t discover_changed_paths,
svn_boolean_t strict_node_history,
svn_boolean_t include_merged_revisions,
- const apr_hash_t *ignored_prop_mods,
+ const apr_array_header_t *ignored_prop_mods,
const apr_array_header_t *revprops,
svn_log_entry_receiver_t receiver,
void *receiver_baton,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/include/svn_repos.h?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/include/svn_repos.h (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/include/svn_repos.h Fri Jan 28 19:42:09 2011
@@ -1579,11 +1579,9 @@ svn_repos_node_location_segments(svn_rep
* If @a include_merged_revisions is set, log information for revisions
* which have been merged to @a targets will also be returned.
*
- * @a ignored_prop_mods is an optional hash of property names, with keys of
- * type 'const char *' and values of type 'void *'. (The values are never
- * read, but must be non-NULL for the key to be recorded in the hash.) If
- * non-NULL, log will ignore any changes to properties names as the keys
- * of the hash when determining which revisions to return.
+ * @a ignored_prop_mods is an optional list of property names, of type
+ * 'const char *'. If non-NULL, log will ignore any changes to these
+ * properties when determining which revisions to return.
*
* If @a revprops is NULL, retrieve all revprops; else, retrieve only the
* revprops named in the array (i.e. retrieve none if the array is empty).
@@ -1619,7 +1617,7 @@ svn_repos_get_logs5(svn_repos_t *repos,
svn_boolean_t discover_changed_paths,
svn_boolean_t strict_node_history,
svn_boolean_t include_merged_revisions,
- const apr_hash_t *ignored_prop_mods,
+ const apr_array_header_t *ignored_prop_mods,
const apr_array_header_t *revprops,
svn_repos_authz_func_t authz_read_func,
void *authz_read_baton,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_client/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_client/log.c?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_client/log.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_client/log.c Fri Jan 28 19:42:09 2011
@@ -273,7 +273,7 @@ svn_client_log6(const apr_array_header_t
svn_boolean_t discover_changed_paths,
svn_boolean_t strict_node_history,
svn_boolean_t include_merged_revisions,
- const apr_hash_t *ignored_prop_mods,
+ const apr_array_header_t *ignored_prop_mods,
const apr_array_header_t *revprops,
svn_log_entry_receiver_t real_receiver,
void *real_receiver_baton,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/ra_loader.c?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/ra_loader.c Fri Jan 28 19:42:09 2011
@@ -887,7 +887,7 @@ svn_error_t *svn_ra_get_log3(svn_ra_sess
svn_boolean_t discover_changed_paths,
svn_boolean_t strict_node_history,
svn_boolean_t include_merged_revisions,
- const apr_hash_t *ignored_prop_mods,
+ const apr_array_header_t *ignored_prop_mods,
const apr_array_header_t *revprops,
svn_log_entry_receiver_t receiver,
void *receiver_baton,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/ra_loader.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/ra_loader.h?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/ra_loader.h (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/ra_loader.h Fri Jan 28 19:42:09 2011
@@ -171,7 +171,7 @@ typedef struct svn_ra__vtable_t {
svn_boolean_t discover_changed_paths,
svn_boolean_t strict_node_history,
svn_boolean_t include_merged_revisions,
- const apr_hash_t *ignored_prop_mods,
+ const apr_array_header_t *ignored_prop_mods,
const apr_array_header_t *revprops,
svn_log_entry_receiver_t receiver,
void *receiver_baton,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c Fri Jan 28 19:42:09 2011
@@ -873,7 +873,7 @@ svn_ra_local__get_log(svn_ra_session_t *
svn_boolean_t discover_changed_paths,
svn_boolean_t strict_node_history,
svn_boolean_t include_merged_revisions,
- const apr_hash_t *ignored_prop_mods,
+ const apr_array_header_t *ignored_prop_mods,
const apr_array_header_t *revprops,
svn_log_entry_receiver_t receiver,
void *receiver_baton,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/log.c?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/log.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/log.c Fri Jan 28 19:42:09 2011
@@ -341,7 +341,7 @@ svn_error_t * svn_ra_neon__get_log(svn_r
svn_boolean_t discover_changed_paths,
svn_boolean_t strict_node_history,
svn_boolean_t include_merged_revisions,
- const apr_hash_t *ignored_prop_mods,
+ const apr_array_header_t *ignored_prop_mods,
const apr_array_header_t *revprops,
svn_log_entry_receiver_t receiver,
void *receiver_baton,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/ra_neon.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/ra_neon.h?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/ra_neon.h (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/ra_neon.h Fri Jan 28 19:42:09 2011
@@ -362,7 +362,7 @@ svn_error_t * svn_ra_neon__get_log(svn_r
svn_boolean_t discover_changed_paths,
svn_boolean_t strict_node_history,
svn_boolean_t include_merged_revisions,
- const apr_hash_t *ignored_prop_mods,
+ const apr_array_header_t *ignored_prop_mods,
const apr_array_header_t *revprops,
svn_log_entry_receiver_t receiver,
void *receiver_baton,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/log.c?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/log.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/log.c Fri Jan 28 19:42:09 2011
@@ -564,7 +564,7 @@ svn_ra_serf__get_log(svn_ra_session_t *r
svn_boolean_t discover_changed_paths,
svn_boolean_t strict_node_history,
svn_boolean_t include_merged_revisions,
- const apr_hash_t *ignored_prop_mods,
+ const apr_array_header_t *ignored_prop_mods,
const apr_array_header_t *revprops,
svn_log_entry_receiver_t receiver,
void *receiver_baton,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/ra_serf.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/ra_serf.h?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/ra_serf.h Fri Jan 28 19:42:09 2011
@@ -1223,7 +1223,7 @@ svn_ra_serf__get_log(svn_ra_session_t *s
svn_boolean_t discover_changed_paths,
svn_boolean_t strict_node_history,
svn_boolean_t include_merged_revisions,
- const apr_hash_t *ignored_prop_mods,
+ const apr_array_header_t *ignored_prop_mods,
const apr_array_header_t *revprops,
svn_log_entry_receiver_t receiver,
void *receiver_baton,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_svn/client.c?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_svn/client.c Fri Jan 28 19:42:09 2011
@@ -1348,7 +1348,7 @@ static svn_error_t *ra_svn_log(svn_ra_se
svn_boolean_t discover_changed_paths,
svn_boolean_t strict_node_history,
svn_boolean_t include_merged_revisions,
- const apr_hash_t *ignored_prop_mods,
+ const apr_array_header_t *ignored_prop_mods,
const apr_array_header_t *revprops,
svn_log_entry_receiver_t receiver,
void *receiver_baton, apr_pool_t *pool)
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_repos/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_repos/log.c?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_repos/log.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_repos/log.c Fri Jan 28 19:42:09 2011
@@ -1617,7 +1617,7 @@ svn_repos_get_logs5(svn_repos_t *repos,
svn_boolean_t discover_changed_paths,
svn_boolean_t strict_node_history,
svn_boolean_t include_merged_revisions,
- const apr_hash_t *ignored_prop_mods,
+ const apr_array_header_t *ignored_prop_mods,
const apr_array_header_t *revprops,
svn_repos_authz_func_t authz_read_func,
void *authz_read_baton,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/svn/log-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/svn/log-cmd.c?rev=1064838&r1=1064837&r2=1064838&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/svn/log-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/svn/log-cmd.c Fri Jan 28 19:42:09 2011
@@ -565,7 +565,7 @@ svn_cl__log(apr_getopt_t *os,
svn_opt_revision_t peg_revision;
const char *true_path;
apr_array_header_t *revprops;
- apr_hash_t *ignored_props = NULL;
+ apr_array_header_t *ignored_props = NULL;
if (!opt_state->xml)
{
@@ -667,9 +667,8 @@ svn_cl__log(apr_getopt_t *os,
if (opt_state->ignore_mergeinfo)
{
- ignored_props = apr_hash_make(pool);
- apr_hash_set(ignored_props, SVN_PROP_MERGEINFO, APR_HASH_KEY_STRING,
- (void *) 0xdeadbeef);
+ ignored_props = apr_array_make(pool, 1, sizeof(const char *));
+ APR_ARRAY_PUSH(ignored_props, const char *) = SVN_PROP_MERGEINFO;
}
if (opt_state->xml)