svn commit: r1064197 - in /subversion/branches/ignore-mergeinfo-log/subversion: include/svn_ra.h libsvn_ra/ra_loader.c

[hw...@apache.org]

Author: hwright
Date: Thu Jan 27 17:04:07 2011
New Revision: 1064197

URL: http://svn.apache.org/viewvc?rev=1064197&view=rev
Log:
On the ignore-mergeinfo-log branch:
Change the specific 'ignore_mergeinfo' flag to the generic 'ignored_prop_mods'
flag in the RA layer API.

* subversion/libsvn_ra/ra_loader.c
  (svn_ra_get_log3): Update parameter type and name, and remove a nonsensical
    nonsensical check.

* subversion/include/svn_ra.h
  (svn_ra_get_log3): Change parameter type, and update docstring.

Modified:
    subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra.h
    subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/ra_loader.c

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=1064197&r1=1064196&r2=1064197&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra.h (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra.h Thu Jan 27 17:04:07 2011
@@ -1433,6 +1433,12 @@ 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.
+ *
  * 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).
  *
@@ -1470,7 +1476,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,
-                svn_boolean_t ignore_mergeinfo,
+                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/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra/ra_loader.c?rev=1064197&r1=1064196&r2=1064197&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:04:07 2011
@@ -889,19 +889,12 @@ 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,
-                             svn_boolean_t ignore_mergeinfo,
+                             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)
 {
-  /* Including merged revisions and ignoring mergeinfo simultaneously is
-     nonsensical, so prohibit it. */
-  if (include_merged_revisions && ignore_mergeinfo)
-    return svn_error_create
-      (SVN_ERR_NONSENSICAL_OPTIONS, NULL,
-       _("Can't ignore mergeinfo and include merged revisions simultaneously"));
-
   if (paths)
     {
       int i;