Author: neels
Date: Fri Sep 23 13:13:40 2011
New Revision: 1174735
URL: http://svn.apache.org/viewvc?rev=1174735&view=rev
Log:
Merge r1174699, removing stuff obsoleted by the previous two merged revisions.
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/branches/1.7.x-i4016/ (props changed)
subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc-queries.sql
subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc_db.c
Propchange: subversion/branches/1.7.x-i4016/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 13:13:40 2011
@@ -64,4 +64,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,115
8187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1169524,1169531,1169650,1171708,1173111,1173574,1174051,1174060,1174342,1174693
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,115
8187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1169524,1169531,1169650,1171708,1173111,1173574,1174051,1174060,1174342,1174693,1174699
Modified: subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc-queries.sql
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc-queries.sql?rev=1174735&r1=1174734&r2=1174735&view=diff
==============================================================================
--- subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc-queries.sql
(original)
+++ subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc-queries.sql Fri Sep
23 13:13:40 2011
@@ -945,16 +945,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, presence
Modified: subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc_db.c?rev=1174735&r1=1174734&r2=1174735&view=diff
==============================================================================
--- subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/1.7.x-i4016/subversion/libsvn_wc/wc_db.c Fri Sep 23
13:13:40 2011
@@ -9839,52 +9839,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;
}
