Author: neels
Date: Fri Sep 23 12:28:52 2011
New Revision: 1174699
URL: http://svn.apache.org/viewvc?rev=1174699&view=rev
Log:
Remove stuff obsoleted by r1174342, r1174693.
* subversion/libsvn_wc/wc_db.c (svn_wc__db_upgrade_apply_props):
Remove loop adding rows to EXTERNALS table. After above revisions, these
rows are populated after all upgrades are done, from svn_client_upgrade().
* subversion/libsvn_wc/wc-queries.sql (STMT_INSERT_EXTERNAL_UPGRADE):
Remove statement, only STMT_INSERT_EXTERNAL is used now (the purpose was
to obtain a file external's kind, which is now also done further up in
svn_client_upgrade()).
Modified:
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1174699&r1=1174698&r2=1174699&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Fri Sep 23 12:28:52
2011
@@ -950,16 +950,6 @@ INSERT OR REPLACE INTO externals (
repos_id, def_repos_relpath, def_operational_revision, def_revision)
VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10)
--- STMT_INSERT_EXTERNAL_UPGRADE
-INSERT OR REPLACE INTO externals (
- wc_id, local_relpath, parent_relpath, presence, kind, def_local_relpath,
- repos_id, def_repos_relpath, def_operational_revision, def_revision)
-VALUES (?1, ?2, ?3, ?4,
- CASE WHEN (SELECT file_external FROM nodes
- WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0)
- IS NOT NULL THEN 'file' ELSE 'unknown' END,
- ?5, ?6, ?7, ?8, ?9)
-
-- STMT_SELECT_EXTERNAL_INFO
SELECT presence, kind, def_local_relpath, repos_id,
def_repos_relpath, def_operational_revision, def_revision
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1174699&r1=1174698&r2=1174699&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Sep 23 12:28:52 2011
@@ -10364,52 +10364,6 @@ svn_wc__db_upgrade_apply_props(svn_sqlit
sdb, scratch_pool));
}
- if (kind == svn_wc__db_kind_dir)
- {
- const char *externals;
- apr_hash_t *props = working_props;
-
- if (props == NULL)
- props = base_props;
-
- externals = svn_prop_get_value(props, SVN_PROP_EXTERNALS);
-
- if (externals != NULL)
- {
- int i;
- apr_array_header_t *ext;
-
- SVN_ERR(svn_sqlite__get_statement(&stmt, sdb,
- STMT_INSERT_EXTERNAL_UPGRADE));
-
- SVN_ERR(svn_wc_parse_externals_description3(
- &ext, svn_dirent_join(dir_abspath, local_relpath,
- scratch_pool),
- externals, FALSE, scratch_pool));
- for (i = 0; i < ext->nelts; i++)
- {
- const svn_wc_external_item2_t *item;
- const char *item_relpath;
-
- item = APR_ARRAY_IDX(ext, i, const svn_wc_external_item2_t *);
- item_relpath = svn_relpath_join(local_relpath, item->target_dir,
- scratch_pool);
-
- SVN_ERR(svn_sqlite__bindf(stmt, "issssis",
- wc_id,
- item_relpath,
- svn_relpath_dirname(item_relpath,
- scratch_pool),
- "normal",
- local_relpath,
- (apr_int64_t)1, /* repos_id */
- "" /* repos_relpath */));
-
- SVN_ERR(svn_sqlite__insert(NULL, stmt));
- }
- }
- }
-
return SVN_NO_ERROR;
}
