svn commit: r1026401 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[ju...@apache.org]

Author: julianfoad
Date: Fri Oct 22 16:44:03 2010
New Revision: 1026401

URL: http://svn.apache.org/viewvc?rev=1026401&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_scan_addition): Unwrap a call to avoid duplicating the
    db+abspath -> pdh+relpath effort.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1026401&r1=1026400&r2=1026401&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Oct 22 16:44:03 2010
@@ -6156,13 +6156,16 @@ svn_wc__db_scan_addition(svn_wc__db_stat
      node's repository information.  */
   if (repos_relpath || repos_root_url || repos_uuid)
     {
+      apr_int64_t repos_id;
       const char *base_relpath;
 
-      /* ### unwrap this. we can optimize away the
-             svn_wc__db_pdh_parse_local_abspath().  */
-      SVN_ERR(svn_wc__db_scan_base_repos(&base_relpath, repos_root_url,
-                                         repos_uuid, db, current_abspath,
-                                         result_pool, scratch_pool));
+      SVN_ERR(scan_upwards_for_repos(&repos_id, &base_relpath,
+                                     pdh->wcroot, current_relpath,
+                                     scratch_pool, scratch_pool));
+
+      if (repos_root_url || repos_uuid)
+        SVN_ERR(fetch_repos_info(repos_root_url, repos_uuid, pdh->wcroot->sdb,
+                                 repos_id, result_pool));
 
       if (repos_relpath)
         *repos_relpath = svn_relpath_join(base_relpath, build_relpath,