/* * upgrade.c: wrapper around wc upgrade functionality. * * ==================================================================== * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. * ==================================================================== */ /* ==================================================================== */ /*** Includes. ***/ #include "svn_time.h" #include "svn_wc.h" #include "svn_client.h" #include "svn_config.h" #include "svn_dirent_uri.h" #include "svn_path.h" #include "svn_pools.h" #include "client.h" #include "svn_props.h" #include "svn_private_config.h" #include "private/svn_wc_private.h" /*** Code. ***/ /* callback baton for fetch_repos_info */ struct repos_info_baton { apr_pool_t *state_pool; svn_client_ctx_t *ctx; const char *last_repos; const char *last_uuid; }; /* svn_wc_upgrade_get_repos_info_t implementation for calling svn_wc_upgrade() from svn_client_upgrade() */ static svn_error_t * fetch_repos_info(const char **repos_root, const char **repos_uuid, void *baton, const char *url, apr_pool_t *result_pool, apr_pool_t *scratch_pool) { struct repos_info_baton *ri = baton; /* The same info is likely to retrieved multiple times (e.g. externals) */ if (ri->last_repos && svn_uri__is_ancestor(ri->last_repos, url)) { *repos_root = apr_pstrdup(result_pool, ri->last_repos); *repos_uuid = apr_pstrdup(result_pool, ri->last_uuid); return SVN_NO_ERROR; } SVN_ERR(svn_client_get_repos_root(repos_root, repos_uuid, url, ri->ctx, result_pool, scratch_pool)); /* Store data for further calls */ ri->last_repos = apr_pstrdup(ri->state_pool, *repos_root); ri->last_uuid = apr_pstrdup(ri->state_pool, *repos_uuid); return SVN_NO_ERROR; } /* Forward definition. Upgrades svn:externals properties in the working copy LOCAL_ABSPATH to the WC-NG storage. */ static svn_error_t * upgrade_externals_from_properties(svn_client_ctx_t *ctx, const char *local_abspath, apr_pool_t *scratch_pool); svn_error_t * svn_client_upgrade(const char *path, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) { const char *local_abspath; apr_hash_t *externals; struct repos_info_baton info_baton; info_baton.state_pool = scratch_pool; info_baton.ctx = ctx; info_baton.last_repos = NULL; info_baton.last_uuid = NULL; if (svn_path_is_url(path)) return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, _("'%s' is not a local path"), path); SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, scratch_pool)); SVN_ERR(svn_wc_upgrade(ctx->wc_ctx, local_abspath, fetch_repos_info, &info_baton, ctx->cancel_func, ctx->cancel_baton, ctx->notify_func2, ctx->notify_baton2, scratch_pool)); SVN_ERR(svn_wc__externals_defined_below(&externals, ctx->wc_ctx, local_abspath, scratch_pool, scratch_pool)); if (apr_hash_count(externals) > 0) { apr_pool_t *iterpool = svn_pool_create(scratch_pool); apr_hash_index_t *hi; /* We are upgrading from >= 1.7. No need to upgrade from svn:externals properties. And by that avoiding the removal of recorded externals information (issue #4519) Only directory externals need an explicit upgrade */ for (hi = apr_hash_first(scratch_pool, externals); hi; hi = apr_hash_next(hi)) { const char *ext_abspath; svn_node_kind_t kind; svn_pool_clear(iterpool); ext_abspath = svn__apr_hash_index_key(hi); SVN_ERR(svn_wc__read_external_info(&kind, NULL, NULL, NULL, NULL, ctx->wc_ctx, local_abspath, ext_abspath, FALSE, iterpool, iterpool)); if (kind == svn_node_dir) { svn_error_t *err = svn_client_upgrade(ext_abspath, ctx, iterpool); if (err) { svn_wc_notify_t *notify = svn_wc_create_notify(ext_abspath, svn_wc_notify_failed_external, iterpool); notify->err = err; ctx->notify_func2(ctx->notify_baton2, notify, iterpool); svn_error_clear(err); /* Next external node, please... */ } } } svn_pool_destroy(iterpool); } else { /* Upgrading from <= 1.6, or no svn:properties defined. (There is no way to detect the difference from libsvn_client :( ) */ SVN_ERR(upgrade_externals_from_properties(ctx, local_abspath, scratch_pool)); } return SVN_NO_ERROR; } static svn_error_t * upgrade_externals_from_properties(svn_client_ctx_t *ctx, const char *local_abspath, apr_pool_t *scratch_pool) { apr_hash_index_t *hi; apr_pool_t *iterpool; apr_pool_t *iterpool2; apr_hash_t *externals; svn_opt_revision_t rev = {svn_opt_revision_unspecified, {0}}; struct repos_info_baton info_baton; /* Now it's time to upgrade the externals too. We do it after the wc upgrade to avoid that errors in the externals causes the wc upgrade to fail. Thanks to caching the performance penalty of walking the wc a second time shouldn't be too severe */ SVN_ERR(svn_client_propget5(&externals, NULL, SVN_PROP_EXTERNALS, local_abspath, &rev, &rev, NULL, svn_depth_infinity, NULL, ctx, scratch_pool, scratch_pool)); iterpool = svn_pool_create(scratch_pool); iterpool2 = svn_pool_create(scratch_pool); for (hi = apr_hash_first(scratch_pool, externals); hi; hi = apr_hash_next(hi)) { int i; const char *externals_parent_abspath; const char *externals_parent_url; const char *externals_parent_repos_root_url; const char *externals_parent_repos_relpath; const char *externals_parent = svn__apr_hash_index_key(hi); svn_string_t *external_desc = svn__apr_hash_index_val(hi); apr_array_header_t *externals_p; svn_error_t *err; svn_pool_clear(iterpool); externals_p = apr_array_make(iterpool, 1, sizeof(svn_wc_external_item2_t*)); /* In this loop, an error causes the respective externals definition, or * the external (inner loop), to be skipped, so that upgrade carries on * with the other externals. */ err = svn_dirent_get_absolute(&externals_parent_abspath, externals_parent, iterpool); if (!err) err = svn_wc__node_get_repos_info(NULL, &externals_parent_repos_relpath, &externals_parent_repos_root_url, NULL, ctx->wc_ctx, externals_parent_abspath, iterpool, iterpool); if (!err) externals_parent_url = svn_path_url_add_component2( externals_parent_repos_root_url, externals_parent_repos_relpath, iterpool); if (!err) err = svn_wc_parse_externals_description3( &externals_p, svn_dirent_dirname(local_abspath, iterpool), external_desc->data, FALSE, iterpool); if (err) { svn_wc_notify_t *notify = svn_wc_create_notify(externals_parent, svn_wc_notify_failed_external, scratch_pool); notify->err = err; ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); svn_error_clear(err); /* Next externals definition, please... */ continue; } for (i = 0; i < externals_p->nelts; i++) { svn_wc_external_item2_t *item; const char *resolved_url; const char *external_abspath; const char *repos_relpath; const char *repos_root_url; const char *repos_uuid; svn_node_kind_t external_kind; svn_revnum_t peg_revision; svn_revnum_t revision; item = APR_ARRAY_IDX(externals_p, i, svn_wc_external_item2_t*); svn_pool_clear(iterpool2); external_abspath = svn_dirent_join(externals_parent_abspath, item->target_dir, iterpool2); err = svn_wc__resolve_relative_external_url( &resolved_url, item, externals_parent_repos_root_url, externals_parent_url, scratch_pool, scratch_pool); if (err) goto handle_error; /* This is a hack. We only need to call svn_wc_upgrade() on external * dirs, as file externals are upgraded along with their defining * WC. Reading the kind will throw an exception on an external dir, * saying that the wc must be upgraded. If it's a file, the lookup * is done in an adm_dir belonging to the defining wc (which has * already been upgraded) and no error is returned. If it doesn't * exist (external that isn't checked out yet), we'll just get * svn_node_none. */ err = svn_wc_read_kind2(&external_kind, ctx->wc_ctx, external_abspath, TRUE, FALSE, iterpool2); if (err && err->apr_err == SVN_ERR_WC_UPGRADE_REQUIRED) { svn_error_clear(err); err = svn_client_upgrade(external_abspath, ctx, iterpool2); if (err) goto handle_error; } else if (err) goto handle_error; /* The upgrade of any dir should be done now, get the now reliable * kind. */ err = svn_wc_read_kind2(&external_kind, ctx->wc_ctx, external_abspath, TRUE, FALSE, iterpool2); if (err) goto handle_error; /* Update the EXTERNALS table according to the root URL, * relpath and uuid known in the upgraded external WC. */ /* We should probably have a function that provides all three * of root URL, repos relpath and uuid at once, but here goes... */ /* First get the relpath, as that returns SVN_ERR_WC_PATH_NOT_FOUND * when the node is not present in the file system. * svn_wc__node_get_repos_info() would try to derive the URL. */ err = svn_wc__node_get_repos_info(NULL, &repos_relpath, &repos_root_url, &repos_uuid, ctx->wc_ctx, external_abspath, iterpool2, iterpool2); if (err) goto handle_error; /* If we haven't got any information from the checked out external, * or if the URL information mismatches the external's definition, * ask fetch_repos_info() to find out the repos root. */ if (0 != strcmp(resolved_url, svn_path_url_add_component2(repos_root_url, repos_relpath, scratch_pool))) { err = fetch_repos_info(&repos_root_url, &repos_uuid, &info_baton, resolved_url, scratch_pool, scratch_pool); if (err) goto handle_error; repos_relpath = svn_uri_skip_ancestor(repos_root_url, resolved_url, iterpool2); /* There's just the URL, no idea what kind the external is. * That's fine, as the external isn't even checked out yet. * The kind will be set during the next 'update'. */ external_kind = svn_node_unknown; } if (err) goto handle_error; peg_revision = (item->peg_revision.kind == svn_opt_revision_number ? item->peg_revision.value.number : SVN_INVALID_REVNUM); revision = (item->revision.kind == svn_opt_revision_number ? item->revision.value.number : SVN_INVALID_REVNUM); err = svn_wc__upgrade_add_external_info(ctx->wc_ctx, external_abspath, external_kind, externals_parent, repos_relpath, repos_root_url, repos_uuid, peg_revision, revision, iterpool2); handle_error: if (err) { svn_wc_notify_t *notify = svn_wc_create_notify(external_abspath, svn_wc_notify_failed_external, scratch_pool); notify->err = err; ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); svn_error_clear(err); /* Next external node, please... */ } } } svn_pool_destroy(iterpool); svn_pool_destroy(iterpool2); return SVN_NO_ERROR; }