subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1189117 - in /subversion/branches/showing-merge-info/subversion: include/svn_client.h libsvn_client/mergeinfo.c
Date Wed, 26 Oct 2011 10:32:08 GMT
Author: julianfoad
Date: Wed Oct 26 10:32:07 2011
New Revision: 1189117

URL: http://svn.apache.org/viewvc?rev=1189117&view=rev
Log:
On the 'showing-merge-info' branch: Add a mergeinfo API.

* subversion/include/svn_client.h,
  subversion/libsvn_client/mergeinfo.c
  (svn_client_get_mergeinfo_catalog): New function.

Modified:
    subversion/branches/showing-merge-info/subversion/include/svn_client.h
    subversion/branches/showing-merge-info/subversion/libsvn_client/mergeinfo.c

Modified: subversion/branches/showing-merge-info/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/include/svn_client.h?rev=1189117&r1=1189116&r2=1189117&view=diff
==============================================================================
--- subversion/branches/showing-merge-info/subversion/include/svn_client.h (original)
+++ subversion/branches/showing-merge-info/subversion/include/svn_client.h Wed Oct 26 10:32:07
2011
@@ -3605,6 +3605,22 @@ svn_client_suggest_merge_sources(apr_arr
                                  apr_pool_t *pool);
 
 
+/** Set @a *mergeinfo_cat_p to a catalog of all the mergeinfo found in
+ * @a path_or_url at @a peg_revision, including inherited mergeinfo.
+ * If @a path_or_url is a working copy path and has no explicit mergeinfo,
+ * look into its parent working copy paths and into the repository if
+ * necessary to find the inherited mergeinfo.
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_client_get_mergeinfo_catalog(svn_mergeinfo_catalog_t *mergeinfo_cat_p,
+                                 const char *path_or_url,
+                                 const svn_opt_revision_t *peg_revision,
+                                 svn_client_ctx_t *ctx,
+                                 apr_pool_t *result_pool,
+                                 apr_pool_t *scratch_pool);
+
 /**
  * Set @a *mergeinfo to a hash mapping <tt>const char *</tt> merge
  * source URLs to <tt>apr_array_header_t *</tt> rangelists (arrays of

Modified: subversion/branches/showing-merge-info/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/libsvn_client/mergeinfo.c?rev=1189117&r1=1189116&r2=1189117&view=diff
==============================================================================
--- subversion/branches/showing-merge-info/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/branches/showing-merge-info/subversion/libsvn_client/mergeinfo.c Wed Oct 26
10:32:07 2011
@@ -1595,6 +1595,24 @@ logs_for_mergeinfo_rangelist(const char 
 /*** Public APIs ***/
 
 svn_error_t *
+svn_client_get_mergeinfo_catalog(svn_mergeinfo_catalog_t *mergeinfo_cat_p,
+                                 const char *path_or_url,
+                                 const svn_opt_revision_t *peg_revision,
+                                 svn_client_ctx_t *ctx,
+                                 apr_pool_t *result_pool,
+                                 apr_pool_t *scratch_pool)
+{
+  const char *repos_root;
+
+  SVN_ERR(get_mergeinfo(mergeinfo_cat_p, &repos_root, path_or_url,
+                        peg_revision, TRUE /* include_descendants */,
+                        FALSE /* ignore_invalid_mergeinfo */,
+                        ctx, result_pool, scratch_pool));
+
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
 svn_client_mergeinfo_get_merged(apr_hash_t **mergeinfo_p,
                                 const char *path_or_url,
                                 const svn_opt_revision_t *peg_revision,



Mime
View raw message