Author: julianfoad
Date: Fri Apr 13 14:39:44 2012
New Revision: 1325787
URL: http://svn.apache.org/viewvc?rev=1325787&view=rev
Log:
Since ages ago, svn_wc__db_base_get_info() never returns null repository
info when status is normal, so there's no need for the caller to check and
scan for the repository info. Correct the docs and remove the unnecessary
code.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_base_get_info): Reverse the statement that 'repos_*' may be
null when status is normal.
* subversion/libsvn_wc/adm_crawler.c
(svn_wc_crawl_revisions5): Remove a scan_base_repos call.
* subversion/libsvn_wc/entries.c
(get_info_for_deleted): Remove a scan_base_repos call.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_crawler.c
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=1325787&r1=1325786&r2=1325787&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Fri Apr 13 14:39:44 2012
@@ -692,11 +692,6 @@ svn_wc_crawl_revisions5(svn_wc_context_t
return SVN_NO_ERROR;
}
- if (! repos_relpath)
- SVN_ERR(svn_wc__db_scan_base_repos(&repos_relpath, &repos_root_url, NULL,
- db, local_abspath,
- scratch_pool, scratch_pool));
-
if (target_depth == svn_depth_unknown)
target_depth = svn_depth_infinity;
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1325787&r1=1325786&r2=1325787&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Fri Apr 13 14:39:44 2012
@@ -236,15 +236,6 @@ get_info_for_deleted(svn_wc_entry_t *ent
entry_abspath,
result_pool,
scratch_pool));
-
- if (*repos_relpath == NULL)
- SVN_ERR(svn_wc__db_scan_base_repos(repos_relpath,
- &entry->repos,
- &entry->uuid,
- db,
- entry_abspath,
- result_pool,
- scratch_pool));
}
else
{
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1325787&r1=1325786&r2=1325787&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Fri Apr 13 14:39:44 2012
@@ -687,9 +687,7 @@ svn_wc__db_base_remove(svn_wc__db_t *db,
UPDATE_ROOT FALSE
- If the STATUS is normal, and the REPOS_* values are NULL, then the
- caller should use svn_wc__db_scan_base_repos() to scan up the BASE
- tree for the repository information.
+ If the STATUS is normal, the REPOS_* values will be non-NULL.
If DEPTH is requested, and the node is NOT a directory, then the
value will be set to svn_depth_unknown. If LOCAL_ABSPATH is a link,
