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/27 18:23:00 UTC
svn commit: r1064212 - in
/subversion/branches/ignore-mergeinfo-log/subversion: libsvn_client/
libsvn_ra/ libsvn_ra_local/ libsvn_ra_neon/ libsvn_ra_serf/ libsvn_ra_svn/
Author: hwright
Date: Thu Jan 27 17:22:59 2011
New Revision: 1064212
URL: http://svn.apache.org/viewvc?rev=1064212&view=rev
Log:
On the ignore-mergeinfo-log branch:
Add the ignored_prop_mods parameter to the various RA libraries.
* subversion/libsvn_ra/wrapper_template.h
(compat_get_log): Use NULL for ignored_prop_mods.
* subversion/libsvn_ra/ra_loader.c
(svn_ra_get_log3): Pass the provided ignored_prop_mods to the vtable function.
* subversion/libsvn_ra/ra_loader.h
(svn_ra__vtable_t): Add the ignored_prop_mods param to the log member.
* subversion/libsvn_ra_local/ra_plugin.c
(svn_ra_local__get_log): Add ignored_prop_mods param, but don't actually use
it.
* subversion/libsvn_ra_svn/client.c
(ra_svn_log): Same.
* subversion/libsvn_ra_serf/log.c
* subversion/libsvn_ra_serf/ra_serf.h
(svn_ra_serf__get_log): Same.
* subversion/libsvn_ra_neon/log.c
* subversion/libsvn_ra_neon/ra_neon.h
(svn_ra_neon__get_log): Same.
* subversion/libsvn_client/log.c
(svn_client_log6): Pass the full ignored_prop_mods hash to the RA layer.
Modified:
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/wrapper_template.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
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=1064212&r1=1064211&r2=1064212&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_client/log.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_client/log.c Thu Jan 27 17:22:59 2011
@@ -612,7 +612,7 @@ svn_client_log6(const apr_array_header_t
discover_changed_paths,
strict_node_history,
include_merged_revisions,
- ignored_prop_mods != NULL,
+ ignored_prop_mods,
passed_receiver_revprops,
passed_receiver,
passed_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=1064212&r1=1064211&r2=1064212&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 Thu Jan 27 17:22:59 2011
@@ -910,7 +910,8 @@ svn_error_t *svn_ra_get_log3(svn_ra_sess
return session->vtable->get_log(session, paths, start, end, limit,
discover_changed_paths, strict_node_history,
- include_merged_revisions, revprops,
+ include_merged_revisions,
+ ignored_prop_mods, revprops,
receiver, receiver_baton, pool);
}
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=1064212&r1=1064211&r2=1064212&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 Thu Jan 27 17:22:59 2011
@@ -171,6 +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 *revprops,
svn_log_entry_receiver_t receiver,
void *receiver_baton,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/wrapper_template.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/wrapper_template.h?rev=1064212&r1=1064211&r2=1064212&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/wrapper_template.h (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/wrapper_template.h Thu Jan 27 17:22:59 2011
@@ -389,6 +389,7 @@ static svn_error_t *compat_get_log(void
return VTBL.get_log(session_baton, paths, start, end, 0, /* limit */
discover_changed_paths, strict_node_history,
FALSE, /* include_merged_revisions */
+ NULL, /* ignored_prop_mods */
svn_compat_log_revprops_in(pool), /* revprops */
receiver2, receiver2_baton, pool);
}
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=1064212&r1=1064211&r2=1064212&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 Thu Jan 27 17:22:59 2011
@@ -874,6 +874,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 *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=1064212&r1=1064211&r2=1064212&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 Thu Jan 27 17:22:59 2011
@@ -341,6 +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 *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=1064212&r1=1064211&r2=1064212&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 Thu Jan 27 17:22:59 2011
@@ -362,6 +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 *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=1064212&r1=1064211&r2=1064212&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 Thu Jan 27 17:22:59 2011
@@ -564,6 +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 *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=1064212&r1=1064211&r2=1064212&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 Thu Jan 27 17:22:59 2011
@@ -1226,6 +1226,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 *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=1064212&r1=1064211&r2=1064212&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 Thu Jan 27 17:22:59 2011
@@ -1346,6 +1346,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 *revprops,
svn_log_entry_receiver_t receiver,
void *receiver_baton, apr_pool_t *pool)