You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2016/01/04 17:25:38 UTC
svn commit: r1722913 - /subversion/trunk/subversion/libsvn_client/diff.c
Author: julianfoad
Date: Mon Jan 4 16:25:37 2016
New Revision: 1722913
URL: http://svn.apache.org/viewvc?rev=1722913&view=rev
Log:
* subversion/libsvn_client/diff.c
(diff_repos_wc): Deduplicate one (long) line of duplicated code.
Modified:
subversion/trunk/subversion/libsvn_client/diff.c
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1722913&r1=1722912&r2=1722913&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Mon Jan 4 16:25:37 2016
@@ -2238,22 +2238,20 @@ diff_repos_wc(const char **root_relpath,
else
diff_depth = svn_depth_unknown;
-
+ /* Tell the RA layer we want a delta to change our txn to URL1 */
+ SVN_ERR(svn_ra_do_diff3(ra_session,
+ &reporter, &reporter_baton,
+ loc1->rev,
+ target,
+ diff_depth,
+ ignore_ancestry,
+ TRUE, /* text_deltas */
+ loc1->url,
+ diff_editor, diff_edit_baton,
+ scratch_pool));
if (is_copy && revision2_kind != svn_opt_revision_base)
{
- /* Tell the RA layer we want a delta to change our txn to URL1 */
- SVN_ERR(svn_ra_do_diff3(ra_session,
- &reporter, &reporter_baton,
- loc1->rev,
- target,
- diff_depth,
- ignore_ancestry,
- TRUE, /* text_deltas */
- loc1->url,
- diff_editor, diff_edit_baton,
- scratch_pool));
-
/* Report the copy source. */
if (cf_depth == svn_depth_unknown)
cf_depth = svn_depth_infinity;
@@ -2277,18 +2275,6 @@ diff_repos_wc(const char **root_relpath,
}
else
{
- /* Tell the RA layer we want a delta to change our txn to URL1 */
- SVN_ERR(svn_ra_do_diff3(ra_session,
- &reporter, &reporter_baton,
- loc1->rev,
- target,
- diff_depth,
- ignore_ancestry,
- TRUE, /* text_deltas */
- loc1->url,
- diff_editor, diff_edit_baton,
- scratch_pool));
-
/* Create a txn mirror of path2; the diff editor will print
diffs in reverse. :-) */
SVN_ERR(svn_wc_crawl_revisions5(ctx->wc_ctx, abspath2,