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

RE: svn commit: r39320 - trunk/subversion/libsvn_client

From: Bert Huijben <rhuijben_at_sharpsvn.net>
Date: Tue, 15 Sep 2009 09:16:45 +0200

> -----Original Message-----
> From: Hyrum K. Wright [mailto:hyrum_at_hyrumwright.org]
> Sent: dinsdag 15 september 2009 4:38
> To: svn_at_subversion.tigris.org
> Subject: svn commit: r39320 - trunk/subversion/libsvn_client
>
> Author: hwright
> Date: Mon Sep 14 19:38:12 2009
> New Revision: 39320
>
> Log:
> Replace a couple of deprecated calls to svn_wc_crawl_revisions4().
>
> * subversion/libsvn_client/switch.c
> (svn_client__switch_internal): Use svn_wc_crawl_revisions5().
>
> * subversion/libsvn_client/diff.c
> (diff_repos_wc): Same.
>
> Modified:
> trunk/subversion/libsvn_client/diff.c
> trunk/subversion/libsvn_client/switch.c
>
> Modified: trunk/subversion/libsvn_client/diff.c
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/diff.c?
> pathrev=39320&r1=39319&r2=39320
> =======================================================================
> =======
> --- trunk/subversion/libsvn_client/diff.c Mon Sep 14 18:38:47 2009
> (r39319)
> +++ trunk/subversion/libsvn_client/diff.c Mon Sep 14 19:38:12 2009
> (r39320)
> @@ -1327,6 +1327,7 @@ diff_repos_wc(const char *path1,
> int levels_to_lock = SVN_WC__LEVELS_TO_LOCK_FROM_DEPTH(depth);
> svn_boolean_t server_supports_depth;
> const char *abspath1;
> + const char *abspath2;
> const char *anchor_abspath;
>
> SVN_ERR_ASSERT(! svn_path_is_url(path2));
> @@ -1336,6 +1337,8 @@ diff_repos_wc(const char *path1,
> else
> abspath1 = path1;
>
> + SVN_ERR(svn_dirent_get_absolute(&abspath2, path2, pool));
> +
> /* Convert path1 to a URL to feed to do_diff. */
> SVN_ERR(convert_to_url(&url1, ctx->wc_ctx, abspath1, pool, pool));
>
> @@ -1428,11 +1431,11 @@ diff_repos_wc(const char *path1,
>
> /* Create a txn mirror of path2; the diff editor will print
> diffs in reverse. :-) */
> - SVN_ERR(svn_wc_crawl_revisions4(path2, dir_access,
> + SVN_ERR(svn_wc_crawl_revisions5(ctx->wc_ctx, abspath2,
> reporter, reporter_baton,
> FALSE, depth, TRUE, (!
> server_supports_depth),
> FALSE, NULL, NULL, /* notification
> is N/A */
> - NULL, pool));
> + NULL, NULL, pool));
>
> return svn_wc_adm_close2(adm_access, pool);

Not sure about the diff internals but svn_wc_crawl_revisions5 doesn't need
access batons, so you could try removing the access baton here. (Diff is not
going to write to the working copy).

        Bert

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2394900
Received on 2009-09-15 09:17:01 CEST

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