You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/08/24 12:03:07 UTC
svn commit: r988460 - in /subversion/trunk/subversion/libsvn_wc: upgrade.c
wc_db.c wc_db.h
Author: philip
Date: Tue Aug 24 10:03:07 2010
New Revision: 988460
URL: http://svn.apache.org/viewvc?rev=988460&view=rev
Log:
Fix upgrade_tests.py 6 in single-db, handle the dav cache.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_upgrade_apply_dav_cache): Add dir_relpath parameter.
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_upgrade_apply_dav_cache): Add dir_relpath parameter, construct
full relpath.
* subversion/libsvn_wc/upgrade.c
(upgrade_to_wcng): Pass dir_relpath.
Modified:
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=988460&r1=988459&r2=988460&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Tue Aug 24 10:03:07 2010
@@ -1303,6 +1303,8 @@ upgrade_to_wcng(svn_wc__db_t *db,
if (old_format != SVN_WC__WCPROPS_LOST)
{
apr_hash_t *all_wcprops;
+ const char *dir_relpath = svn_dirent_skip_ancestor(data->root_abspath,
+ dir_abspath);
if (old_format <= SVN_WC__WCPROPS_MANY_FILES_VERSION)
SVN_ERR(read_many_wcprops(&all_wcprops, dir_abspath,
@@ -1311,8 +1313,8 @@ upgrade_to_wcng(svn_wc__db_t *db,
SVN_ERR(read_wcprops(&all_wcprops, dir_abspath,
scratch_pool, scratch_pool));
- SVN_ERR(svn_wc__db_upgrade_apply_dav_cache(data->sdb, all_wcprops,
- scratch_pool));
+ SVN_ERR(svn_wc__db_upgrade_apply_dav_cache(data->sdb, dir_relpath,
+ all_wcprops, scratch_pool));
}
SVN_ERR(migrate_text_bases(dir_abspath, data->root_abspath, data->sdb,
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=988460&r1=988459&r2=988460&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Aug 24 10:03:07 2010
@@ -6904,6 +6904,7 @@ svn_wc__db_upgrade_begin(svn_sqlite__db_
svn_error_t *
svn_wc__db_upgrade_apply_dav_cache(svn_sqlite__db_t *sdb,
+ const char *dir_relpath,
apr_hash_t *cache_values,
apr_pool_t *scratch_pool)
{
@@ -6921,11 +6922,14 @@ svn_wc__db_upgrade_apply_dav_cache(svn_s
hi;
hi = apr_hash_next(hi))
{
- const char *local_relpath = svn__apr_hash_index_key(hi);
+ const char *name = svn__apr_hash_index_key(hi);
apr_hash_t *props = svn__apr_hash_index_val(hi);
+ const char *local_relpath;
svn_pool_clear(iterpool);
+ local_relpath = svn_relpath_join(dir_relpath, name, iterpool);
+
SVN_ERR(svn_sqlite__bindf(stmt, "is", wc_id, local_relpath));
SVN_ERR(svn_sqlite__bind_properties(stmt, 3, props, iterpool));
SVN_ERR(svn_sqlite__step_done(stmt));
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=988460&r1=988459&r2=988460&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Tue Aug 24 10:03:07 2010
@@ -2056,6 +2056,7 @@ svn_wc__db_upgrade_begin(svn_sqlite__db_
svn_error_t *
svn_wc__db_upgrade_apply_dav_cache(svn_sqlite__db_t *sdb,
+ const char *dir_relpath,
apr_hash_t *cache_values,
apr_pool_t *scratch_pool);