Hi Bert...
> URL: http://svn.apache.org/r1544182
> Log:
> Make the 'svn_client_cat()' API a bit more generic usable for api users,
> by allowing the suppression of keyword expansion and by optionally returning
> the properties of the node.
Shouldn't we have an EOL-style translation option as well? Usually the two go
together.
> * subversion/include/svn_client.h
> (svn_client_cat3): New function.
> (svn_client_cat2): Deprecate function.
>
> * subversion/libsvn_client/cat.c
> (svn_client_cat2): Rename to ...
> (svn_client_cat3): ... this. Add support for not expanding keywords and
> for returning the properties.
>
> * subversion/libsvn_client/deprecated.c
> (svn_client_cat2): New function.
> Modified: subversion/trunk/subversion/include/svn_client.h
> ==============================================================================
> /**
> * Output the content of a file.
> *
> - * @param[in] out The stream to which the content will be written.
> - * @param[in] path_or_url The path or URL of the file.
> - * @param[in] peg_revision The peg revision.
> - * @param[in] revision The operative revision.
> + * @param[out] props Optional output argument to obtain properties.
> + * @param[in] out The stream to which the content will be
> written.
> + * @param[in] path_or_url The path or URL of the file.
> + * @param[in] peg_revision The peg revision.
> + * @param[in] revision The operative revision.
> + * @param[in] expand_keywords When true, keywords (when set) are expanded.
And what if @a expand_keywords is false -- are keywords contracted to their
repository-normal form, or left unchanged? The implementation looks like it
leaves them unchanged.
> * @param[in] ctx The standard client context, used for possible
> * authentication.
> * @param[in] pool Used for any temporary allocation.
There's no longer a 'pool', there's a result_pool and a scratch_pool.
> *
> * @todo Add an expansion/translation flag?
That comment seems to be redundant now.
> *
> - * @since New in 1.2.
> - *
You should leave that "@since 1.2" in the deprecated function's doc string.
> * @see #svn_client_ctx_t <br> @ref clnt_revisions for
> * a discussion of operative and peg revisions.
> + *
> + * @since New in 1.9.
> */
> svn_error_t *
> +svn_client_cat3(apr_hash_t **props,
> + svn_stream_t *out,
> + const char *path_or_url,
> + const svn_opt_revision_t *peg_revision,
> + const svn_opt_revision_t *revision,
> + svn_boolean_t expand_keywords,
> + svn_client_ctx_t *ctx,
> + apr_pool_t *result_pool,
> + apr_pool_t *scratch_pool);
> +
> +/**
> + * Similar to svn_client_cat3() except without the option of directly
> + * reading the properties, and with @a expand_keywords always TRUE.
... and only one pool.
> + *
> + * @deprecated Provided for backward compatibility with the 1.8 API.
> + */
> +SVN_DEPRECATED
> +svn_error_t *
> svn_client_cat2(svn_stream_t *out,
> const char *path_or_url,
> const svn_opt_revision_t *peg_revision,
>
> Modified: subversion/trunk/subversion/libsvn_client/cat.c
> ==============================================================================
> svn_error_t *
> -svn_client_cat2(svn_stream_t *out,
> +svn_client_cat3(apr_hash_t **props,
> + svn_stream_t *out,
> const char *path_or_url,
> const svn_opt_revision_t *peg_revision,
> const svn_opt_revision_t *revision,
> + svn_boolean_t expand_keywords,
> svn_client_ctx_t *ctx,
> - apr_pool_t *pool)
> + apr_pool_t *result_pool,
> + apr_pool_t *scratch_pool)
> {
> SVN_ERR(svn_client__get_normalized_stream(&normal_stream, ctx->wc_ctx,
> - local_abspath, revision, TRUE,
> FALSE,
> + local_abspath, revision,
> + expand_keywords, FALSE,
> - if (keywords)
> + if (keywords && expand_keywords)
> {
> SVN_ERR(svn_subst_build_keywords3(&kw, keywords->data,
> cmt_rev->data, loc->url,
> repos_root_url, when,
> cmt_author ?
> cmt_author->data : NULL,
> - pool));
> + scratch_pool));
> }
> else
> kw = NULL;
