svn commit: r1096298 - /subversion/trunk/subversion/libsvn_client/diff.c

[rh...@apache.org]

Author: rhuijben
Date: Sun Apr 24 09:56:59 2011
New Revision: 1096298

URL: http://svn.apache.org/viewvc?rev=1096298&view=rev
Log:
* subversion/libsvn_client/diff.c
  (svn_ra_do_diff3): Following up on r1096279, if we perform an explicit
    depth limiting diff, the diff ra function would like to know about that.
    (Unlike the other ra editor drivers)

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=1096298&r1=1096297&r2=1096298&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Sun Apr 24 09:56:59 2011
@@ -1789,6 +1789,7 @@ diff_repos_wc(const char *path1,
   const char *url1, *anchor, *anchor_url, *target;
   svn_revnum_t rev;
   svn_ra_session_t *ra_session;
+  svn_depth_t diff_depth;
   const svn_ra_reporter3_t *reporter;
   void *reporter_baton;
   const svn_delta_editor_t *diff_editor;
@@ -1897,11 +1898,16 @@ diff_repos_wc(const char *path1,
   else
     callback_baton->revnum2 = rev;
 
+  if (depth != svn_depth_infinity)
+    diff_depth = depth;
+  else
+    diff_depth = svn_depth_unknown;
+
   SVN_ERR(svn_ra_do_diff3(ra_session,
                           &reporter, &reporter_baton,
                           rev,
                           target,
-                          svn_depth_unknown,
+                          diff_depth,
                           ignore_ancestry,
                           TRUE,  /* text_deltas */
                           url1,