Author: philip
Date: Wed Jun 16 18:16:30 2010
New Revision: 955334
URL: http://svn.apache.org/viewvc?rev=955334&view=rev
Log:
Enable the SVN_EXPERIMENTAL_COPY code and remove the old code.
* subversion/libsvn_wc/copy.c
(copy_props, copy_added_file_administratively,
copy_added_dir_administratively, copy_file_administratively,
post_copy_cleanup, copy_dir_administratively): Remove.
(svn_wc_copy3): Remove conditional code.
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_read_info): Remove conditional code.
* subversion/tests/cmdline/changelist_tests.py
(move_keeps_changelist, move_added_keeps_changelist): Remove XFail.
* subversion/tests/cmdline/copy_tests.py
(allow_unversioned_parent_for_copy_src): Mark XFail.
(copy_added_dir_with_copy): Remove XFail.
Modified:
subversion/trunk/subversion/libsvn_wc/copy.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/tests/cmdline/changelist_tests.py
subversion/trunk/subversion/tests/cmdline/copy_tests.py
Modified: subversion/trunk/subversion/libsvn_wc/copy.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/copy.c?rev=955334&r1=955333&r2=955334&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Wed Jun 16 18:16:30 2010
@@ -48,675 +48,6 @@
/*** Code. ***/
-#ifndef SVN_EXPERIMENTAL_COPY
-
-/* Copy all properties of SRC_PATH to DST_PATH. */
-static svn_error_t *
-copy_props(svn_wc__db_t *db,
- const char *src_abspath,
- const char *dst_abspath,
- apr_pool_t *scratch_pool)
-{
- apr_hash_t *props;
- apr_hash_index_t *hi;
-
- SVN_ERR(svn_wc__get_actual_props(&props, db, src_abspath,
- scratch_pool, scratch_pool));
- for (hi = apr_hash_first(scratch_pool, props); hi; hi = apr_hash_next(hi))
- {
- const char *propname = svn__apr_hash_index_key(hi);
- svn_string_t *propval = svn__apr_hash_index_val(hi);
-
- SVN_ERR(svn_wc__internal_propset(db, dst_abspath, propname, propval,
- FALSE /* skip_checks */,
- NULL, NULL, scratch_pool));
- }
-
- return SVN_NO_ERROR;
-}
-
-
-/* Helper function for svn_wc_copy2() which handles WC->WC copying of
- files which are scheduled for addition or unversioned.
-
- Copy file SRC_PATH in SRC_ACCESS to DST_BASENAME in DST_PARENT_ACCESS.
-
- DST_PARENT_ACCESS is a 0 depth locked access for a versioned directory
- in the same WC as SRC_PATH.
-
- If SRC_IS_ADDED is true then SRC_PATH is scheduled for addition and
- DST_BASENAME will also be scheduled for addition.
-
- If SRC_IS_ADDED is false then SRC_PATH is the unversioned child
- file of a versioned or added parent and DST_BASENAME is simply copied.
-
- Use SCRATCH_POOL for all necessary allocations.
-*/
-static svn_error_t *
-copy_added_file_administratively(svn_wc_context_t *wc_ctx,
- const char *src_abspath,
- svn_boolean_t src_is_added,
- const char *dst_abspath,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- svn_wc_notify_func2_t notify_func,
- void *notify_baton,
- apr_pool_t *scratch_pool)
-{
- svn_node_kind_t kind;
- svn_boolean_t is_special;
-
- /* Check to see if this is a special file. */
- SVN_ERR(svn_io_check_special_path(src_abspath, &kind, &is_special,
- scratch_pool));
-
- /* Copy this file and possibly put it under version control. */
- if (is_special)
- SVN_ERR(svn_io_copy_link(src_abspath, dst_abspath, scratch_pool));
- else
- SVN_ERR(svn_io_copy_file(src_abspath, dst_abspath, TRUE, scratch_pool));
-
- if (src_is_added)
- {
- SVN_ERR(svn_wc_add4(wc_ctx, dst_abspath, svn_depth_infinity, NULL,
- SVN_INVALID_REVNUM,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- scratch_pool));
-
- SVN_ERR(copy_props(wc_ctx->db, src_abspath, dst_abspath, scratch_pool));
- }
-
- return SVN_NO_ERROR;
-}
-
-
-/* Helper function for svn_wc_copy2() which handles WC->WC copying of
- directories which are scheduled for addition or unversioned.
-
- Recursively copy directory SRC_ABSPATH and its children, excluding
- administrative directories, to DST_ABSPATH.
-
- If SRC_IS_ADDED is true then SRC_PATH is scheduled for addition and
- DST_BASENAME will also be scheduled for addition.
-
- If SRC_IS_ADDED is false then SRC_PATH is the unversioned child
- directory of a versioned or added parent and DST_BASENAME is simply
- copied.
-
- Use SCRATCH_POOL for all necessary allocations.
-*/
-static svn_error_t *
-copy_added_dir_administratively(svn_wc_context_t *wc_ctx,
- const char *src_abspath,
- svn_boolean_t src_is_added,
- const char *dst_abspath,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- svn_wc_notify_func2_t notify_func,
- void *notify_baton,
- apr_pool_t *scratch_pool)
-{
- svn_wc__db_t *db = wc_ctx->db;
-
- if (! src_is_added)
- {
- /* src_path is the top of an unversioned tree, just copy
- the whole thing and we are done. */
- SVN_ERR(svn_io_copy_dir_recursively(src_abspath,
- svn_dirent_dirname(dst_abspath,
- scratch_pool),
- svn_dirent_basename(dst_abspath,
- NULL),
- TRUE, cancel_func, cancel_baton,
- scratch_pool));
- }
- else
- {
- apr_hash_t *dirents;
- apr_hash_index_t *hi;
- apr_pool_t *iterpool = svn_pool_create(scratch_pool);
-
- /* Check cancellation; note that this catches recursive calls too. */
- if (cancel_func)
- SVN_ERR(cancel_func(cancel_baton));
-
- /* "Copy" the dir dst_path and schedule it, and possibly
- its children, for addition. */
- SVN_ERR(svn_io_dir_make(dst_abspath, APR_OS_DEFAULT, iterpool));
-
- /* Add the directory */
- SVN_ERR(svn_wc_add4(wc_ctx, dst_abspath, svn_depth_infinity,
- NULL, SVN_INVALID_REVNUM,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- iterpool));
-
- /* Copy properties. */
- SVN_ERR(copy_props(wc_ctx->db, src_abspath, dst_abspath, iterpool));
-
- SVN_ERR(svn_io_get_dirents2(&dirents, src_abspath, scratch_pool));
-
- /* Read src_path's entries one by one. */
- for (hi = apr_hash_first(scratch_pool, dirents);
- hi;
- hi = apr_hash_next(hi))
- {
- const char *name = svn__apr_hash_index_key(hi);
- svn_io_dirent_t *dirent = svn__apr_hash_index_val(hi);
- const char *node_abspath;
- svn_wc__db_kind_t kind;
-
- svn_pool_clear(iterpool);
-
- /* Check cancellation so you can cancel during an
- * add of a directory with lots of files. */
- if (cancel_func)
- SVN_ERR(cancel_func(cancel_baton));
-
- /* Skip over SVN admin directories. */
- if (svn_wc_is_adm_dir(name, iterpool))
- continue;
-
- /* Construct the path of the node. */
- node_abspath = svn_dirent_join(src_abspath, name, iterpool);
-
- SVN_ERR(svn_wc__db_read_kind(&kind, db, node_abspath, TRUE,
- iterpool));
-
- if (kind != svn_wc__db_kind_unknown)
- {
- svn_boolean_t hidden;
-
- SVN_ERR(svn_wc__db_node_hidden(&hidden, db, node_abspath,
- iterpool));
-
- if (hidden)
- kind = svn_wc__db_kind_unknown;
- }
-
- /* We do not need to handle excluded items here, since this function
- only deal with the sources which are not yet in the repos.
- Exclude flag is by definition not expected in such situation. */
-
- /* Recurse on directories; add files; ignore the rest. */
- if (dirent->kind == svn_node_dir)
- {
- SVN_ERR(copy_added_dir_administratively(
- wc_ctx, node_abspath,
- (kind != svn_wc__db_kind_unknown),
- svn_dirent_join(dst_abspath, name,
- iterpool),
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- iterpool));
- }
- else if (dirent->kind == svn_node_file)
- {
- SVN_ERR(copy_added_file_administratively(
- wc_ctx, node_abspath,
- (kind != svn_wc__db_kind_unknown),
- svn_dirent_join(dst_abspath, name,
- iterpool),
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- iterpool));
- }
-
- }
-
- svn_pool_destroy(iterpool);
-
- } /* End else src_is_added. */
-
- return SVN_NO_ERROR;
-}
-
-/* This function effectively creates and schedules a file for
- addition, but does extra administrative things to allow it to
- function as a 'copy'.
-
- ASSUMPTIONS:
-
- - src_abspath is under version control; the working file doesn't
- necessarily exist (its text-base does).
- - dst_abspath will be the 'new' name of the copied file.
- */
-static svn_error_t *
-copy_file_administratively(svn_wc_context_t *wc_ctx,
- const char *src_abspath,
- const char *dst_abspath,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- svn_wc_notify_func2_t notify_func,
- void *notify_baton,
- apr_pool_t *scratch_pool)
-{
- svn_node_kind_t dst_kind;
- const svn_wc_entry_t *src_entry, *dst_entry;
- svn_wc__db_t *db = wc_ctx->db;
- svn_error_t *err;
-
- /* Sanity check: if dst file exists already, don't allow overwrite. */
- SVN_ERR(svn_io_check_path(dst_abspath, &dst_kind, scratch_pool));
- if (dst_kind != svn_node_none)
- return svn_error_createf(SVN_ERR_ENTRY_EXISTS, NULL,
- _("'%s' already exists and is in the way"),
- svn_dirent_local_style(dst_abspath,
- scratch_pool));
-
- /* Even if DST_ABSPATH doesn't exist it may still be a versioned item; it
- may be scheduled for deletion, or the user may simply have removed the
- working copy. Since we are going to write to DST_PATH text-base and
- prop-base we need to detect such cases and abort. */
- err = svn_wc__get_entry(&dst_entry, db, dst_abspath, TRUE,
- svn_node_unknown, FALSE,
- scratch_pool, scratch_pool);
-
- if (err && err->apr_err == SVN_ERR_NODE_UNEXPECTED_KIND)
- svn_error_clear(err);
- else
- SVN_ERR(err);
- if (dst_entry && dst_entry->schedule != svn_wc_schedule_delete
- && !dst_entry->deleted)
- {
- return svn_error_createf(SVN_ERR_ENTRY_EXISTS, NULL,
- _("There is already a versioned item '%s'"),
- svn_dirent_local_style(dst_abspath,
- scratch_pool));
- }
-
- /* Sanity check 1: You cannot make a copy of something that's not
- under version control. */
- SVN_ERR(svn_wc__get_entry(&src_entry, db, src_abspath, FALSE,
- svn_node_file, FALSE,
- scratch_pool, scratch_pool));
-
- /* Sanity check 2: You cannot make a copy of something that's not
- in the repository unless it's a copy of an uncommitted copy.
- Added files don't have a base, but replaced files have a revert-base.
- ### TODO: svn_opt_revision_base currently means "commit-base", which
- ### technically is none for replaced files. We currently have no way to
- ### get at the revert-base and need a new svn_opt_revision_X for that.
- */
- if (((src_entry->schedule == svn_wc_schedule_add
- || src_entry->schedule == svn_wc_schedule_replace)
- && (!src_entry->copied))
- || (!src_entry->url))
- return svn_error_createf
- (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- _("Cannot copy or move '%s': it is not in the repository yet; "
- "try committing first"),
- svn_dirent_local_style(src_abspath, scratch_pool));
-
-
- /* Schedule the new file for addition in its parent, WITH HISTORY. */
- {
- const char *copyfrom_url;
- svn_revnum_t copyfrom_rev;
- apr_hash_t *props, *base_props;
- svn_stream_t *base_contents;
- svn_stream_t *contents;
-
- /* Are we moving or copying a file that is already moved or copied
- but not committed? */
- if (src_entry->copied)
- {
- SVN_ERR(svn_wc__node_get_copyfrom_info(©from_url, ©from_rev,
- NULL, wc_ctx, src_abspath,
- scratch_pool, scratch_pool));
-
- /* If the COPYFROM information is the SAME as the destination
- URL/REVISION, then omit the copyfrom info. */
- if (dst_entry != NULL
- && dst_entry->revision == copyfrom_rev
- && copyfrom_url != NULL
- && dst_entry->url != NULL
- && strcmp(copyfrom_url, dst_entry->url) == 0)
- {
- copyfrom_url = NULL;
- copyfrom_rev = SVN_INVALID_REVNUM;
- }
- }
- else
- {
- SVN_ERR(svn_wc__internal_get_ancestry(©from_url, ©from_rev,
- db, src_abspath,
- scratch_pool, scratch_pool));
- }
-
- /* Load source base and working props. */
- SVN_ERR(svn_wc__get_pristine_props(&base_props, db, src_abspath,
- scratch_pool, scratch_pool));
- SVN_ERR(svn_wc__get_actual_props(&props, db, src_abspath,
- scratch_pool, scratch_pool));
-
- /* Copy working copy file to temporary location */
- {
- svn_boolean_t special;
-
- SVN_ERR(svn_wc__get_special(&special, db, src_abspath, scratch_pool));
- if (special)
- {
- SVN_ERR(svn_subst_read_specialfile(&contents, src_abspath,
- scratch_pool, scratch_pool));
- }
- else
- {
- svn_subst_eol_style_t eol_style;
- const char *eol_str;
- apr_hash_t *keywords;
-
- SVN_ERR(svn_wc__get_keywords(&keywords, db, src_abspath, NULL,
- scratch_pool, scratch_pool));
- SVN_ERR(svn_wc__get_eol_style(&eol_style, &eol_str, db,
- src_abspath,
- scratch_pool, scratch_pool));
-
- /* Try with the working file and fallback on its text-base. */
- err = svn_stream_open_readonly(&contents, src_abspath,
- scratch_pool, scratch_pool);
- if (err && APR_STATUS_IS_ENOENT(err->apr_err))
- {
- svn_error_clear(err);
-
- err = svn_wc__get_pristine_contents(&contents, db, src_abspath,
- scratch_pool, scratch_pool);
-
- if (err && APR_STATUS_IS_ENOENT(err->apr_err))
- return svn_error_create(SVN_ERR_WC_COPYFROM_PATH_NOT_FOUND,
- err, NULL);
- else if (err)
- return svn_error_return(err);
-
- /* Above add/replace condition should have caught this already
- * (-> error "Cannot copy..."). */
- SVN_ERR_ASSERT(contents != NULL);
- }
- else if (err)
- return svn_error_return(err);
-
- if (svn_subst_translation_required(eol_style, eol_str, keywords,
- FALSE, FALSE))
- {
- svn_boolean_t repair = FALSE;
-
- if (eol_style == svn_subst_eol_style_native)
- eol_str = SVN_SUBST_NATIVE_EOL_STR;
- else if (eol_style == svn_subst_eol_style_fixed)
- repair = TRUE;
- else if (eol_style != svn_subst_eol_style_none)
- return svn_error_create(SVN_ERR_IO_UNKNOWN_EOL, NULL, NULL);
-
- /* Wrap the stream to translate to normal form */
- contents = svn_subst_stream_translated(contents,
- eol_str,
- repair,
- keywords,
- FALSE /* expand */,
- scratch_pool);
- }
- }
- }
-
- SVN_ERR(svn_wc__get_pristine_contents(&base_contents,
- wc_ctx->db, src_abspath,
- scratch_pool, scratch_pool));
- /* Above add/replace condition should have caught this already
- * (-> error "Cannot copy..."). */
- SVN_ERR_ASSERT(base_contents != NULL);
-
- SVN_ERR(svn_wc_add_repos_file4(wc_ctx, dst_abspath,
- base_contents, contents,
- base_props, props,
- copyfrom_url, copyfrom_rev,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- scratch_pool));
-
- SVN_ERR(svn_io_copy_perms(src_abspath, dst_abspath, scratch_pool));
- }
-
- /* Report the addition to the caller. */
- if (notify_func != NULL)
- {
- svn_wc_notify_t *notify = svn_wc_create_notify(dst_abspath,
- svn_wc_notify_add,
- scratch_pool);
- notify->kind = svn_node_file;
- (*notify_func)(notify_baton, notify, scratch_pool);
- }
-
- return SVN_NO_ERROR;
-}
-
-
-/* Recursively crawl over a directory PATH and do a number of things:
- - Remove lock tokens
- - Remove the DAV cache
- - Convert deleted items to schedule-delete items
- - Set .svn directories to be hidden
-*/
-static svn_error_t *
-post_copy_cleanup(svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
-{
- apr_pool_t *iterpool = svn_pool_create(scratch_pool);
- const apr_array_header_t *children;
- int i;
-
- /* Clear the DAV cache. */
- SVN_ERR(svn_wc__db_base_set_dav_cache(db, local_abspath, NULL,
- scratch_pool));
-
- /* Because svn_io_copy_dir_recursively() doesn't copy directory
- permissions, we'll patch up our tree's .svn subdirs to be
- hidden. */
-#ifdef APR_FILE_ATTR_HIDDEN
- {
- const char *adm_dir = svn_wc__adm_child(local_abspath, NULL,
- scratch_pool);
- const char *path_apr;
- apr_status_t status;
-
- SVN_ERR(svn_path_cstring_from_utf8(&path_apr, adm_dir, scratch_pool));
- status = apr_file_attrs_set(path_apr,
- APR_FILE_ATTR_HIDDEN,
- APR_FILE_ATTR_HIDDEN,
- scratch_pool);
- if (status)
- return svn_error_wrap_apr(status, _("Can't hide directory '%s'"),
- svn_dirent_local_style(adm_dir,
- scratch_pool));
- }
-#endif
-
- /* Loop over all children, removing lock tokens and recursing into
- directories. */
- SVN_ERR(svn_wc__db_read_children(&children, db, local_abspath,
- scratch_pool, scratch_pool));
- for (i = 0; i < children->nelts; i++)
- {
- const char *child_basename = APR_ARRAY_IDX(children, i, const char *);
- const char *child_abspath;
- const svn_wc_entry_t *entry;
- svn_wc__db_kind_t kind;
-
- svn_pool_clear(iterpool);
- child_abspath = svn_dirent_join(local_abspath, child_basename, iterpool);
-
- SVN_ERR(svn_wc__db_read_kind(&kind, db, child_abspath, FALSE, iterpool));
- SVN_ERR(svn_wc__get_entry(&entry, db, child_abspath, TRUE,
- svn_node_unknown, (kind ==
svn_wc__db_kind_dir),
- iterpool, iterpool));
-
- if (entry->depth == svn_depth_exclude)
- continue;
-
- /* Convert deleted="true" into schedule="delete" for all
- children (and grandchildren, if RECURSE is set) of the path.
- The result of this is that when
- the copy is committed the items in question get deleted and
- the result is a directory in the repository that matches the
- original source directory for copy. If this were not done
- the deleted="true" items would simply vanish from the entries
- file as the copy is added to the working copy. The new
- schedule="delete" files do not have a text-base and so their
- scheduled deletion cannot be reverted. For directories a
- placeholder with an svn_node_kind_t of svn_node_file and
- schedule="delete" is used to avoid the problems associated
- with creating a directory. See Issue #2101 for details. */
- if (entry->deleted)
- {
- /* ### WARNING: Very dodgy stuff here! ###
-
- Directories are a problem since a schedule delete directory
- needs an admin directory to be present. It's possible to
- create a dummy admin directory and that sort of works, it's
- good enough if the user commits the copy. Where it falls
- down is if the user *reverts* the dummy directory since the
- now schedule normal, copied, directory doesn't have the
- correct contents.
-
- In the entries world we cheated a bit by making directories
- a file, to allow not creating the administrative area for
- these not-present directories.
-
- Currently we apply a different cheat: We record a directory
- deletion in the parent directory, which our future compatibility
- handling already handles as if we were in the future single-db
- operation. */
-
- SVN_ERR(svn_wc__db_temp_op_delete(db, child_abspath, iterpool));
- }
-
- /* Remove lock stuffs. */
- if (entry->lock_token)
- SVN_ERR(svn_wc__db_lock_remove(db, local_abspath, iterpool));
-
- /* If a dir and not deleted, recurse. */
- if (!entry->deleted && entry->kind == svn_node_dir)
- SVN_ERR(post_copy_cleanup(db, child_abspath, iterpool));
- }
-
- /* Cleanup */
- svn_pool_destroy(iterpool);
-
- return SVN_NO_ERROR;
-}
-
-
-/* This function effectively creates and schedules a dir for
- addition, but does extra administrative things to allow it to
- function as a 'copy'.
-
- ASSUMPTIONS:
-
- - src_abspath points to a dir under version control
- - dst_parent is the target of the copy operation. Its parent directory
- is under version control, in the same working copy.
- */
-static svn_error_t *
-copy_dir_administratively(svn_wc_context_t *wc_ctx,
- const char *src_abspath,
- const char *dst_abspath,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- svn_wc_notify_func2_t notify_copied,
- void *notify_baton,
- apr_pool_t *scratch_pool)
-{
- svn_wc__db_status_t src_status;
- svn_wc__db_t *db = wc_ctx->db;
- const char *dir_abspath;
- const char *name;
-
- /* Sanity check 1: You cannot make a copy of something that's not
- under version control. */
- SVN_ERR(svn_wc__db_read_info(&src_status, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, db, src_abspath,
- scratch_pool, scratch_pool));
-
- /* Sanity check 2: You cannot make a copy of something that's not
- in the repository unless it's a copy of an uncommitted copy. */
- if (src_status == svn_wc__db_status_added)
- SVN_ERR(svn_wc__db_scan_addition(&src_status, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, db, src_abspath,
- scratch_pool, scratch_pool));
-
- if ((src_status == svn_wc__db_status_added)
- && ((src_status != svn_wc__db_status_copied)
- || (src_status != svn_wc__db_status_moved_here)))
- return svn_error_createf
- (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- _("Cannot copy or move '%s': it is not in the repository yet; "
- "try committing first"),
- svn_dirent_local_style(src_abspath, scratch_pool));
-
- /* Recursively copy the whole directory over. This gets us all
- text-base, props, base-props, as well as entries, local mods,
- schedulings, existences, etc.
-
- ### Should we be copying unversioned items within the directory? */
- svn_dirent_split(dst_abspath, &dir_abspath, &name, scratch_pool);
- SVN_ERR(svn_io_copy_dir_recursively(src_abspath,
- dir_abspath,
- name,
- TRUE /* copy_perms */,
- cancel_func, cancel_baton,
- scratch_pool));
-
- /* ### the wc.db databases have locks in them, based on the source paths.
- ### go through and clean out those locks. this should go away in the
- ### single-db case, but would probably also be fixed if we revamped
- ### the copy algorithm to: copy all metadata, copy all pristines,
- ### then install all working copy files from those pristines.
- ###
- ### hmm. that would not carry over local edits, however.
- ### more thinking required...
- */
- SVN_ERR(svn_wc_cleanup3(wc_ctx, dst_abspath, cancel_func, cancel_baton,
- scratch_pool));
-
- /* We've got some post-copy cleanup to do now. */
- SVN_ERR(post_copy_cleanup(db, dst_abspath, scratch_pool));
-
- /* Schedule the directory for addition in both its parent and itself
- (this_dir) -- WITH HISTORY. This function should leave the
- existing administrative dir untouched. */
- {
- const char *copyfrom_url;
- svn_revnum_t copyfrom_rev;
-
- /* Are we copying a dir that is already copied but not committed? */
- if ((src_status == svn_wc__db_status_copied)
- || (src_status == svn_wc__db_status_moved_here))
- {
- SVN_ERR(svn_wc__node_get_copyfrom_info(©from_url, ©from_rev,
- NULL, wc_ctx, src_abspath,
- scratch_pool, scratch_pool));
- }
- else
- {
- SVN_ERR(svn_wc__internal_get_ancestry(©from_url, ©from_rev,
- db, src_abspath,
- scratch_pool, scratch_pool));
- }
-
- return svn_error_return(svn_wc_add4(wc_ctx, dst_abspath,
- svn_depth_infinity,
- copyfrom_url, copyfrom_rev,
- cancel_func, cancel_baton,
- notify_copied, notify_baton,
- scratch_pool));
- }
-}
-#endif
-
-#ifdef SVN_EXPERIMENTAL_COPY
/* Make a copy of SRC_ABSPATH under a temporary name in the directory
TMPDIR_ABSPATH and return the absolute path of the copy in
*DST_ABSPATH. Return the node kind of SRC_ABSPATH in *KIND. If
@@ -1206,7 +537,6 @@ copy_versioned_dir(svn_wc_context_t *wc_
return SVN_NO_ERROR;
}
-#endif
@@ -1292,29 +622,6 @@ svn_wc_copy3(svn_wc_context_t *wc_ctx,
if (src_kind == svn_node_file ||
(src_entry->kind == svn_node_file && src_kind == svn_node_none))
{
-#ifndef SVN_EXPERIMENTAL_COPY
- /* Check if we are copying a file scheduled for addition,
- these require special handling. */
- if (src_entry->schedule == svn_wc_schedule_add
- && (! src_entry->copied))
- {
- SVN_ERR(copy_added_file_administratively(wc_ctx,
- src_abspath, TRUE,
- dst_abspath,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- scratch_pool));
- }
- else
- {
- SVN_ERR(copy_file_administratively(wc_ctx,
- src_abspath,
- dst_abspath,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- scratch_pool));
- }
-#else
svn_node_kind_t dst_kind, dst_db_kind;
/* This is the error checking from copy_file_administratively
@@ -1349,38 +656,13 @@ svn_wc_copy3(svn_wc_context_t *wc_ctx,
cancel_func, cancel_baton,
notify_func, notify_baton,
scratch_pool));
-#endif
}
else if (src_kind == svn_node_dir)
{
-#ifndef SVN_EXPERIMENTAL_COPY
- /* Check if we are copying a directory scheduled for addition,
- these require special handling. */
- if (src_entry->schedule == svn_wc_schedule_add
- && (! src_entry->copied))
- {
- SVN_ERR(copy_added_dir_administratively(wc_ctx,
- src_abspath, TRUE,
- dst_abspath,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- scratch_pool));
- }
- else
- {
- SVN_ERR(copy_dir_administratively(wc_ctx,
- src_abspath,
- dst_abspath,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- scratch_pool));
- }
-#else
SVN_ERR(copy_versioned_dir(wc_ctx, src_abspath, dst_abspath,
cancel_func, cancel_baton,
notify_func, notify_baton,
scratch_pool));
-#endif
}
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=955334&r1=955333&r2=955334&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Jun 16 18:16:30 2010
@@ -4300,29 +4300,20 @@ svn_wc__db_read_info(svn_wc__db_status_t
work_status = svn_sqlite__column_token(stmt_work, 0,
presence_map);
-#ifdef SVN_EXPERIMENTAL_COPY
SVN_ERR_ASSERT(work_status == svn_wc__db_status_normal
|| work_status == svn_wc__db_status_not_present
|| work_status == svn_wc__db_status_base_deleted
|| work_status == svn_wc__db_status_incomplete
|| work_status == svn_wc__db_status_excluded);
-#else
- SVN_ERR_ASSERT(work_status == svn_wc__db_status_normal
- || work_status == svn_wc__db_status_not_present
- || work_status == svn_wc__db_status_base_deleted
- || work_status == svn_wc__db_status_incomplete);
-#endif
if (work_status == svn_wc__db_status_incomplete)
{
*status = svn_wc__db_status_incomplete;
}
-#ifdef SVN_EXPERIMENTAL_COPY
else if (work_status == svn_wc__db_status_excluded)
{
*status = svn_wc__db_status_excluded;
}
-#endif
else if (work_status == svn_wc__db_status_not_present
|| work_status == svn_wc__db_status_base_deleted)
{
Modified: subversion/trunk/subversion/tests/cmdline/changelist_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/changelist_tests.py?rev=955334&r1=955333&r2=955334&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/changelist_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/changelist_tests.py Wed Jun 16
18:16:30 2010
@@ -1144,8 +1144,8 @@ test_list = [ None,
tree_conflicts_and_changelists_on_commit1,
tree_conflicts_and_changelists_on_commit2,
tree_conflicts_and_changelists_on_commit3,
- XFail(move_keeps_changelist),
- XFail(move_added_keeps_changelist),
+ move_keeps_changelist,
+ move_added_keeps_changelist,
]
if __name__ == '__main__':
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=955334&r1=955333&r2=955334&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Wed Jun 16 18:16:30
2010
@@ -4570,7 +4570,7 @@ test_list = [ None,
copy_make_parents_wc_repo,
copy_make_parents_repo_repo,
URI_encoded_repos_to_wc,
- allow_unversioned_parent_for_copy_src,
+ XFail(allow_unversioned_parent_for_copy_src),
replaced_local_source_for_incoming_copy,
unneeded_parents,
double_parents_with_url,
@@ -4583,7 +4583,7 @@ test_list = [ None,
XFail(move_below_move),
reverse_merge_move,
XFail(nonrecursive_commit_of_copy),
- XFail(copy_added_dir_with_copy),
+ copy_added_dir_with_copy,
SkipUnless(copy_broken_symlink, svntest.main.is_posix_os),
]
