[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: svn commit: r39172 - in trunk/subversion: libsvn_client svn

From: Bert Huijben <rhuijben_at_sharpsvn.net>
Date: Mon, 7 Sep 2009 23:46:51 +0200

> -----Original Message-----
> From: Hyrum K. Wright [mailto:hyrum_at_hyrumwright.org]
> Sent: maandag 7 september 2009 23:30
> To: svn_at_subversion.tigris.org
> Subject: svn commit: r39172 - in trunk/subversion: libsvn_client svn
>
> Author: hwright
> Date: Mon Sep 7 14:29:43 2009
> New Revision: 39172
>
> Log:
> Replace use of deprecated svn_path_condense_targets() with
> svn_dirent_condense_targets().
>
> * subversion/svn/commit-cmd.c,
> subversion/libsvn_client/delete.c,
> subversion/libsvn_client/locking_commands.c,
> subversion/libsvn_client/log.c,
> subversion/libsvn_client/add.c:
> Use svn_dirent_condense_targets() throughout.
>
> Modified:
> trunk/subversion/libsvn_client/add.c
> trunk/subversion/libsvn_client/delete.c
> trunk/subversion/libsvn_client/locking_commands.c
> trunk/subversion/libsvn_client/log.c
> trunk/subversion/svn/commit-cmd.c
>
> Modified: trunk/subversion/libsvn_client/add.c
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/add.c?p
> athrev=39172&r1=39171&r2=39172
> =======================================================================
> =======
> --- trunk/subversion/libsvn_client/add.c Mon Sep 7 14:16:41 2009
> (r39171)
> +++ trunk/subversion/libsvn_client/add.c Mon Sep 7 14:29:43 2009
> (r39172)
> @@ -711,7 +711,8 @@ mkdir_urls(svn_commit_info_t **commit_in
> }
>
> /* Condense our list of mkdir targets. */
> - SVN_ERR(svn_path_condense_targets(&common, &targets, urls, FALSE,
> pool));
> + SVN_ERR(svn_dirent_condense_targets(&common, &targets, urls, FALSE,
> pool,
> + pool));

Are these paths urls?

> SVN_ERR(svn_hash_from_cstring_keys(&targets_hash, targets, pool));
> SVN_ERR(svn_hash_keys(&targets, targets_hash, pool));
>
>
> Modified: trunk/subversion/libsvn_client/delete.c
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/delete.
> c?pathrev=39172&r1=39171&r2=39172
> =======================================================================
> =======
> --- trunk/subversion/libsvn_client/delete.c Mon Sep 7 14:16:41 2009
> (r39171)
> +++ trunk/subversion/libsvn_client/delete.c Mon Sep 7 14:29:43 2009
> (r39172)
> @@ -132,7 +132,8 @@ delete_urls(svn_commit_info_t **commit_i
> apr_pool_t *subpool = svn_pool_create(pool);
>
> /* Condense our list of deletion targets. */
> - SVN_ERR(svn_path_condense_targets(&common, &targets, paths, TRUE,
> pool));
> + SVN_ERR(svn_dirent_condense_targets(&common, &targets, paths, TRUE,
> pool,
> + pool));

Same question?

> if (! targets->nelts)
> {
> const char *bname;
>
> Modified: trunk/subversion/libsvn_client/locking_commands.c
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/locking
> _commands.c?pathrev=39172&r1=39171&r2=39172
> =======================================================================
> =======
> --- trunk/subversion/libsvn_client/locking_commands.c Mon Sep 7
> 14:16:41 2009 (r39171)
> +++ trunk/subversion/libsvn_client/locking_commands.c Mon Sep 7
> 14:29:43 2009 (r39172)
> @@ -192,10 +192,10 @@ organize_lock_targets(const char **commo
> apr_pool_t *subpool = svn_pool_create(pool);
>
> /* Get the common parent and all relative paths */
> - SVN_ERR(svn_path_condense_targets(common_parent, &rel_targets,
> targets,
> - FALSE, pool));
> + SVN_ERR(svn_dirent_condense_targets(common_parent, &rel_targets,
> targets,
> + FALSE, pool, pool));
>
> - /* svn_path_condense_targets leaves paths empty if TARGETS only had
> + /* svn_dirent_condense_targets() leaves paths empty if TARGETS only
> had
> 1 member, so we special case that. */
> if (apr_is_empty_array(rel_targets))
> {
> @@ -278,10 +278,10 @@ organize_lock_targets(const char **commo
> }
>
> /* Condense our absolute urls and get the relative urls. */
> - SVN_ERR(svn_path_condense_targets(&common_url, &rel_urls, urls,
> - FALSE, pool));
> + SVN_ERR(svn_dirent_condense_targets(&common_url, &rel_urls,
> urls,
> + FALSE, pool, pool));
>
> - /* svn_path_condense_targets leaves paths empty if TARGETS only
> had
> + /* svn_dirent_condense_targets() leaves paths empty if TARGETS
> only had
> 1 member, so we special case that (again). */

Same question.
> if (apr_is_empty_array(rel_urls))
> {
>
> Modified: trunk/subversion/libsvn_client/log.c
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/log.c?p
> athrev=39172&r1=39171&r2=39172
> =======================================================================
> =======
> --- trunk/subversion/libsvn_client/log.c Mon Sep 7 14:16:41 2009
> (r39171)
> +++ trunk/subversion/libsvn_client/log.c Mon Sep 7 14:29:43 2009
> (r39172)
> @@ -493,8 +493,8 @@ svn_client_log5(const apr_array_header_t
> return SVN_NO_ERROR;
>
> /* Find the base URL and condensed targets relative to it. */
> - SVN_ERR(svn_path_condense_targets(&url_or_path,
> &condensed_targets,
> - target_urls, TRUE, pool));
> + SVN_ERR(svn_dirent_condense_targets(&url_or_path,
> &condensed_targets,
> + target_urls, TRUE, pool,
> pool));
>
> if (condensed_targets->nelts == 0)
> APR_ARRAY_PUSH(condensed_targets, const char *) = "";
> @@ -510,7 +510,8 @@ svn_client_log5(const apr_array_header_t
> * we use our initial target path to figure out where to root the
> RA
> * session, otherwise we use our URL. */
> if (SVN_CLIENT__REVKIND_NEEDS_WC(peg_revision->kind))
> - SVN_ERR(svn_path_condense_targets(&ra_target, NULL, targets,
> TRUE, pool));
> + SVN_ERR(svn_dirent_condense_targets(&ra_target, NULL, targets,
> TRUE,
> + pool, pool));
> else
> ra_target = url_or_path;

Same.
>
>
> Modified: trunk/subversion/svn/commit-cmd.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/commit-
> cmd.c?pathrev=39172&r1=39171&r2=39172
> =======================================================================
> =======
> --- trunk/subversion/svn/commit-cmd.c Mon Sep 7 14:16:41 2009
> (r39171)
> +++ trunk/subversion/svn/commit-cmd.c Mon Sep 7 14:29:43 2009
> (r39172)
> @@ -77,11 +77,8 @@ svn_cl__commit(apr_getopt_t *os,
> SVN_ERR(svn_opt_eat_peg_revisions(&targets, targets, pool));
>
> /* Condense the targets (like commit does)... */
> - SVN_ERR(svn_path_condense_targets(&base_dir,
> - &condensed_targets,
> - targets,
> - TRUE,
> - pool));
> + SVN_ERR(svn_dirent_condense_targets(&base_dir, &condensed_targets,
> + targets, TRUE, pool, pool));
>
> if ((! condensed_targets) || (! condensed_targets->nelts))
> {
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageI
> d=2392163

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2392166
Received on 2009-09-07 23:47:13 CEST

This is an archived mail posted to the Subversion Dev mailing list.