You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/02/13 07:37:56 UTC
svn commit: r1445479 [6/11] - in /subversion/branches/fsfs-format7: ./
build/generator/ build/generator/swig/ build/generator/templates/
notes/api-errata/1.7/ packages/ subversion/bindings/swig/include/
subversion/bindings/swig/perl/libsvn_swig_perl/ s...
Modified: subversion/branches/fsfs-format7/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_wc/info.c?rev=1445479&r1=1445478&r2=1445479&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_wc/info.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_wc/info.c Wed Feb 13 06:37:54 2013
@@ -536,10 +536,13 @@ svn_wc__get_info(svn_wc_context_t *wc_ct
if (!repos_root_url)
{
- SVN_ERR(svn_wc__internal_get_repos_info(&repos_root_url,
+ SVN_ERR(svn_wc__internal_get_repos_info(NULL, NULL,
+ &repos_root_url,
&repos_uuid,
wc_ctx->db,
- local_abspath,
+ svn_dirent_dirname(
+ local_abspath,
+ iterpool),
scratch_pool,
iterpool));
}
Modified: subversion/branches/fsfs-format7/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_wc/node.c?rev=1445479&r1=1445478&r2=1445479&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_wc/node.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_wc/node.c Wed Feb 13 06:37:54 2013
@@ -139,44 +139,37 @@ svn_wc__node_get_children(const apr_arra
svn_error_t *
-svn_wc__internal_get_repos_info(const char **repos_root_url,
+svn_wc__internal_get_repos_info(svn_revnum_t *revision,
+ const char **repos_relpath,
+ const char **repos_root_url,
const char **repos_uuid,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- svn_error_t *err;
svn_wc__db_status_t status;
+ svn_boolean_t have_work;
- err = svn_wc__db_read_info(&status, NULL, NULL, NULL,
- repos_root_url, repos_uuid,
- NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL,
- db, local_abspath,
- result_pool, scratch_pool);
- if (err)
- {
- if (err->apr_err != SVN_ERR_WC_PATH_NOT_FOUND
- && err->apr_err != SVN_ERR_WC_NOT_WORKING_COPY)
- return svn_error_trace(err);
+ SVN_ERR(svn_wc__db_read_info(&status, NULL, revision, repos_relpath,
+ repos_root_url, repos_uuid,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, &have_work,
+ db, local_abspath,
+ result_pool, scratch_pool));
- /* This node is not versioned. Return NULL repos info. */
- svn_error_clear(err);
+ if ((repos_relpath ? *repos_relpath != NULL : TRUE)
+ && (repos_root_url ? *repos_root_url != NULL: TRUE)
+ && (repos_uuid ? *repos_uuid != NULL : TRUE))
+ return SVN_NO_ERROR; /* We got the requested information */
- if (repos_root_url)
- *repos_root_url = NULL;
- if (repos_uuid)
- *repos_uuid = NULL;
- return SVN_NO_ERROR;
+ if (!have_work) /* not-present, (server-)excluded? */
+ {
+ return SVN_NO_ERROR; /* Can't fetch more */
}
- if (((repos_root_url && *repos_root_url) || !repos_root_url)
- && ((repos_uuid && *repos_uuid) || !repos_uuid))
- return SVN_NO_ERROR;
-
if (status == svn_wc__db_status_deleted)
{
const char *base_del_abspath, *wrk_del_abspath;
@@ -187,113 +180,82 @@ svn_wc__internal_get_repos_info(const ch
scratch_pool, scratch_pool));
if (base_del_abspath)
- SVN_ERR(svn_wc__db_scan_base_repos(NULL,repos_root_url,
- repos_uuid, db, base_del_abspath,
+ {
+ SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, NULL, repos_relpath,
+ repos_root_url, repos_uuid, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL,
+ db, base_del_abspath,
result_pool, scratch_pool));
+
+ /* If we have a repos_relpath, it is of the op-root */
+ if (repos_relpath)
+ *repos_relpath = svn_relpath_join(*repos_relpath,
+ svn_dirent_skip_ancestor(base_del_abspath,
+ local_abspath),
+ result_pool);
+ /* We keep revision as SVN_INVALID_REVNUM */
+ }
else if (wrk_del_abspath)
- SVN_ERR(svn_wc__db_scan_addition(NULL, NULL, NULL,
- repos_root_url, repos_uuid,
- NULL, NULL, NULL, NULL, NULL, NULL,
- db, svn_dirent_dirname(
+ {
+ const char *op_root_abspath = NULL;
+
+ SVN_ERR(svn_wc__db_scan_addition(NULL, repos_relpath
+ ? &op_root_abspath : NULL,
+ repos_relpath, repos_root_url,
+ repos_uuid, NULL, NULL, NULL, NULL,
+ NULL, NULL,
+ db, svn_dirent_dirname(
wrk_del_abspath,
scratch_pool),
- result_pool, scratch_pool));
+ result_pool, scratch_pool));
+
+ /* If we have a repos_relpath, it is of the op-root */
+ if (repos_relpath)
+ *repos_relpath = svn_relpath_join(
+ *repos_relpath,
+ svn_dirent_skip_ancestor(op_root_abspath,
+ local_abspath),
+ result_pool);
+ }
}
- else if (status == svn_wc__db_status_added)
+ else /* added, or WORKING incomplete */
{
+ const char *op_root_abspath = NULL;
+
/* We have an addition. scan_addition() will find the intended
repository location by scanning up the tree. */
- SVN_ERR(svn_wc__db_scan_addition(NULL, NULL, NULL,
- repos_root_url, repos_uuid,
- NULL, NULL, NULL, NULL, NULL, NULL,
+ SVN_ERR(svn_wc__db_scan_addition(NULL, repos_relpath
+ ? &op_root_abspath : NULL,
+ repos_relpath, repos_root_url,
+ repos_uuid, NULL, NULL, NULL, NULL,
+ NULL, NULL,
db, local_abspath,
result_pool, scratch_pool));
}
- else
- SVN_ERR(svn_wc__db_scan_base_repos(NULL, repos_root_url, repos_uuid,
- db, local_abspath,
- result_pool, scratch_pool));
SVN_ERR_ASSERT(repos_root_url == NULL || *repos_root_url != NULL);
SVN_ERR_ASSERT(repos_uuid == NULL || *repos_uuid != NULL);
return SVN_NO_ERROR;
}
-/* ### This is essentially a copy-paste of svn_wc__internal_get_url().
- * ### If we decide to keep this one, then it should be rewritten to avoid
- * ### code duplication.*/
svn_error_t *
-svn_wc__internal_get_repos_relpath(const char **repos_relpath,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- svn_wc__db_status_t status;
- svn_boolean_t have_base;
-
- SVN_ERR(svn_wc__db_read_info(&status, NULL, NULL, repos_relpath,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
- &have_base, NULL, NULL,
- db, local_abspath,
- result_pool, scratch_pool));
- if (*repos_relpath == NULL)
- {
- if (status == svn_wc__db_status_added)
- {
- SVN_ERR(svn_wc__db_scan_addition(NULL, NULL, repos_relpath,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL,
- db, local_abspath,
- result_pool, scratch_pool));
- }
- else if (have_base)
- {
- SVN_ERR(svn_wc__db_scan_base_repos(repos_relpath, NULL,
- NULL,
- db, local_abspath,
- result_pool, scratch_pool));
- }
- else if (status == svn_wc__db_status_excluded
- || (!have_base && (status == svn_wc__db_status_deleted)))
- {
- const char *parent_abspath, *name, *parent_relpath;
-
- svn_dirent_split(&parent_abspath, &name, local_abspath,
- scratch_pool);
- SVN_ERR(svn_wc__internal_get_repos_relpath(&parent_relpath, db,
- parent_abspath,
- scratch_pool,
- scratch_pool));
-
- if (parent_relpath)
- *repos_relpath = svn_relpath_join(parent_relpath, name,
- result_pool);
- }
- else
- {
- /* Status: obstructed, obstructed_add */
- *repos_relpath = NULL;
- return SVN_NO_ERROR;
- }
- }
-
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_wc__node_get_repos_info(const char **repos_root_url,
+svn_wc__node_get_repos_info(svn_revnum_t *revision,
+ const char **repos_relpath,
+ const char **repos_root_url,
const char **repos_uuid,
svn_wc_context_t *wc_ctx,
const char *local_abspath,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- return svn_error_trace(svn_wc__internal_get_repos_info(
- repos_root_url, repos_uuid, wc_ctx->db, local_abspath,
- result_pool, scratch_pool));
+ return svn_error_trace(
+ svn_wc__internal_get_repos_info(revision,
+ repos_relpath,
+ repos_root_url,
+ repos_uuid,
+ wc_ctx->db, local_abspath,
+ result_pool, scratch_pool));
}
/* Convert DB_KIND into the appropriate NODE_KIND value.
@@ -412,20 +374,6 @@ svn_wc__node_get_url(const char **url,
result_pool, scratch_pool));
}
-svn_error_t *
-svn_wc__node_get_repos_relpath(const char **repos_relpath,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- return svn_error_trace(svn_wc__internal_get_repos_relpath(repos_relpath,
- wc_ctx->db,
- local_abspath,
- result_pool,
- scratch_pool));
-}
-
/* A recursive node-walker, helper for svn_wc__internal_walk_children().
*
* Call WALK_CALLBACK with WALK_BATON on all children (recursively) of
@@ -713,16 +661,19 @@ svn_wc__node_get_base(svn_revnum_t *revi
const char **repos_relpath,
const char **repos_root_url,
const char **repos_uuid,
+ const char **lock_token,
svn_wc_context_t *wc_ctx,
const char *local_abspath,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
svn_error_t *err;
+ svn_wc__db_lock_t *lock;
err = svn_wc__db_base_get_info(NULL, NULL, revision, repos_relpath,
repos_root_url, repos_uuid, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL,
+ lock_token ? &lock : NULL,
NULL, NULL, NULL,
wc_ctx->db, local_abspath,
result_pool, scratch_pool);
@@ -737,10 +688,15 @@ svn_wc__node_get_base(svn_revnum_t *revi
*repos_root_url = NULL;
if (repos_uuid)
*repos_uuid = NULL;
+ if (lock_token)
+ *lock_token = NULL;
return SVN_NO_ERROR;
}
SVN_ERR(err);
+ if (lock_token)
+ *lock_token = lock ? lock->token : NULL;
+
SVN_ERR_ASSERT(!revision || SVN_IS_VALID_REVNUM(*revision));
SVN_ERR_ASSERT(!repos_relpath || *repos_relpath);
SVN_ERR_ASSERT(!repos_root_url || *repos_root_url);
@@ -797,45 +753,6 @@ svn_wc__node_get_pre_ng_status_data(svn_
}
svn_error_t *
-svn_wc__node_get_lock_info(const char **lock_token,
- const char **lock_owner,
- const char **lock_comment,
- apr_time_t *lock_date,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- svn_wc__db_lock_t *lock;
- svn_error_t *err;
-
- err = svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, &lock, NULL,
- NULL, NULL,
- wc_ctx->db, local_abspath,
- result_pool, scratch_pool);
-
- if (err)
- {
- if (err->apr_err != SVN_ERR_WC_PATH_NOT_FOUND)
- return svn_error_trace(err);
-
- svn_error_clear(err);
- lock = NULL;
- }
- if (lock_token)
- *lock_token = lock ? lock->token : NULL;
- if (lock_owner)
- *lock_owner = lock ? lock->owner : NULL;
- if (lock_comment)
- *lock_comment = lock ? lock->comment : NULL;
- if (lock_date)
- *lock_date = lock ? lock->date : 0;
-
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
svn_wc__internal_node_get_schedule(svn_wc_schedule_t *schedule,
svn_boolean_t *copied,
svn_wc__db_t *db,
@@ -1272,6 +1189,8 @@ svn_error_t *
svn_wc__check_for_obstructions(svn_wc_notify_state_t *obstruction_state,
svn_node_kind_t *kind,
svn_boolean_t *deleted,
+ svn_boolean_t *excluded,
+ svn_depth_t *parent_depth,
svn_wc_context_t *wc_ctx,
const char *local_abspath,
svn_boolean_t no_wcroot_check,
@@ -1287,6 +1206,10 @@ svn_wc__check_for_obstructions(svn_wc_no
*kind = svn_node_none;
if (deleted)
*deleted = FALSE;
+ if (excluded)
+ *excluded = FALSE;
+ if (parent_depth)
+ *parent_depth = svn_depth_unknown;
SVN_ERR(svn_io_check_path(local_abspath, &disk_kind, scratch_pool));
@@ -1309,9 +1232,10 @@ svn_wc__check_for_obstructions(svn_wc_no
}
err = svn_wc__db_read_info(&status, &db_kind, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, parent_depth, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL,
wc_ctx->db, svn_dirent_dirname(local_abspath,
scratch_pool),
scratch_pool, scratch_pool);
@@ -1372,6 +1296,9 @@ svn_wc__check_for_obstructions(svn_wc_no
case svn_wc__db_status_excluded:
case svn_wc__db_status_server_excluded:
+ if (excluded)
+ *excluded = TRUE;
+ /* fall through */
case svn_wc__db_status_incomplete:
*obstruction_state = svn_wc_notify_state_missing;
break;
Modified: subversion/branches/fsfs-format7/subversion/libsvn_wc/tree_conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_wc/tree_conflicts.c?rev=1445479&r1=1445478&r2=1445479&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_wc/tree_conflicts.c Wed Feb 13 06:37:54 2013
@@ -400,13 +400,18 @@ svn_wc__del_tree_conflict(svn_wc_context
svn_error_t *
svn_wc__add_tree_conflict(svn_wc_context_t *wc_ctx,
const svn_wc_conflict_description2_t *conflict,
- const char *moved_away_op_root_abspath,
apr_pool_t *scratch_pool)
{
svn_boolean_t existing_conflict;
svn_skel_t *conflict_skel;
svn_error_t *err;
+ SVN_ERR_ASSERT(conflict != NULL);
+ SVN_ERR_ASSERT(conflict->operation == svn_wc_operation_merge
+ || (conflict->reason != svn_wc_conflict_reason_moved_away
+ && conflict->reason != svn_wc_conflict_reason_moved_here)
+ );
+
/* Re-adding an existing tree conflict victim is an error. */
err = svn_wc__internal_conflicted_p(NULL, NULL, &existing_conflict,
wc_ctx->db, conflict->local_abspath,
@@ -419,7 +424,7 @@ svn_wc__add_tree_conflict(svn_wc_context
svn_error_clear(err);
}
else if (existing_conflict)
- return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL,
+ return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL,
_("Attempt to add tree conflict that already "
"exists at '%s'"),
svn_dirent_local_style(conflict->local_abspath,
@@ -433,7 +438,7 @@ svn_wc__add_tree_conflict(svn_wc_context
conflict->local_abspath,
conflict->reason,
conflict->action,
- moved_away_op_root_abspath,
+ NULL,
scratch_pool, scratch_pool));
switch(conflict->operation)
Modified: subversion/branches/fsfs-format7/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_wc/update_editor.c?rev=1445479&r1=1445478&r2=1445479&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_wc/update_editor.c Wed Feb 13 06:37:54 2013
@@ -284,6 +284,8 @@ remember_skipped_tree(struct edit_baton
return SVN_NO_ERROR;
}
+/* Per directory baton. Lives in its own subpool of the parent directory
+ or of the edit baton if there is no parent directory */
struct dir_baton
{
/* Basename of this directory. */
@@ -381,26 +383,10 @@ struct dir_baton
/* The pool in which this baton itself is allocated. */
apr_pool_t *pool;
-};
-
-
-/* The bump information is tracked separately from the directory batons.
- This is a small structure kept in the edit pool, while the heavier
- directory baton is managed by the editor driver.
-
- In a postfix delta case, the directory batons are going to disappear.
- The files will refer to these structures, rather than the full
- directory baton. */
-struct bump_dir_info
-{
- /* ptr to the bump information for the parent directory */
- struct bump_dir_info *parent;
- /* how many entries are referring to this bump information? */
+ /* how many nodes are referring to baton? */
int ref_count;
- /* Pool that should be cleared after the dir is bumped */
- apr_pool_t *pool;
};
@@ -514,7 +500,6 @@ make_dir_baton(struct dir_baton **d_p,
{
apr_pool_t *dir_pool;
struct dir_baton *d;
- struct bump_dir_info *bdi;
if (pb != NULL)
dir_pool = svn_pool_create(pb->pool);
@@ -599,23 +584,13 @@ make_dir_baton(struct dir_baton **d_p,
}
}
- /* the bump information lives in the edit pool */
- bdi = apr_pcalloc(dir_pool, sizeof(*bdi));
- bdi->parent = pb ? pb->bump_info : NULL;
- bdi->ref_count = 1;
- bdi->pool = dir_pool;
-
- /* the parent's bump info has one more referer */
- if (pb)
- ++bdi->parent->ref_count;
-
d->edit_baton = eb;
d->parent_baton = pb;
d->pool = dir_pool;
d->propchanges = apr_array_make(dir_pool, 1, sizeof(svn_prop_t));
d->obstruction_found = FALSE;
d->add_existed = FALSE;
- d->bump_info = bdi;
+ d->ref_count = 1;
d->old_revision = SVN_INVALID_REVNUM;
d->adding_dir = adding;
d->changed_rev = SVN_INVALID_REVNUM;
@@ -626,6 +601,9 @@ make_dir_baton(struct dir_baton **d_p,
{
d->skip_this = pb->skip_this;
d->shadowed = pb->shadowed || pb->edit_obstructed;
+
+ /* the parent's bump info has one more referer */
+ pb->ref_count++;
}
/* The caller of this function needs to fill these in. */
@@ -663,34 +641,32 @@ do_notification(const struct edit_baton
(*eb->notify_func)(eb->notify_baton, notify, scratch_pool);
}
-/* Decrement the bump_dir_info's reference count. If it hits zero,
+/* Decrement the directory's reference count. If it hits zero,
then this directory is "done". This means it is safe to clear its pool.
- In addition, when the directory is "done", we loop onto the parent's
- bump information to possibly mark it as done, too.
+ In addition, when the directory is "done", we recurse to possible cleanup
+ the parent directory.
*/
static svn_error_t *
-maybe_release_dir_info(struct bump_dir_info *bdi)
+maybe_release_dir_info(struct dir_baton *db)
{
- /* Keep moving up the tree of directories until we run out of parents,
- or a directory is not yet "done". */
- while (bdi != NULL)
- {
- apr_pool_t *destroy_pool;
+ db->ref_count--;
- if (--bdi->ref_count > 0)
- break; /* directory isn't done yet */
+ if (!db->ref_count)
+ {
+ struct dir_baton *pb = db->parent_baton;
- destroy_pool = bdi->pool;
- bdi = bdi->parent;
+ svn_pool_destroy(db->pool);
- svn_pool_destroy(destroy_pool);
+ if (pb)
+ SVN_ERR(maybe_release_dir_info(pb));
}
- /* we exited the for loop because there are no more parents */
return SVN_NO_ERROR;
}
+/* Per file baton. Lives in its own subpool below the pool of the parent
+ directory */
struct file_baton
{
/* Pool specific to this file_baton. */
@@ -842,8 +818,8 @@ make_file_baton(struct file_baton **f_p,
f->dir_baton = pb;
f->changed_rev = SVN_INVALID_REVNUM;
- /* the directory's bump info has one more referer now */
- ++f->bump_info->ref_count;
+ /* the directory has one more referer now */
+ pb->ref_count++;
*f_p = f;
return SVN_NO_ERROR;
@@ -859,7 +835,7 @@ make_file_baton(struct file_baton **f_p,
*/
static svn_error_t *
complete_conflict(svn_skel_t *conflict,
- const struct dir_baton *pb,
+ const struct edit_baton *eb,
const char *local_abspath,
const char *old_repos_relpath,
svn_revnum_t old_revision,
@@ -869,7 +845,6 @@ complete_conflict(svn_skel_t *conflict,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- const struct edit_baton *eb = pb->edit_baton;
svn_wc_conflict_version_t *original_version;
svn_wc_conflict_version_t *target_version;
svn_boolean_t is_complete;
@@ -934,7 +909,7 @@ mark_directory_edited(struct dir_baton *
{
/* We have a (delayed) tree conflict to install */
- SVN_ERR(complete_conflict(db->edit_conflict, db->parent_baton,
+ SVN_ERR(complete_conflict(db->edit_conflict, db->edit_baton,
db->local_abspath,
db->old_repos_relpath, db->old_revision,
db->new_relpath,
@@ -969,7 +944,7 @@ mark_file_edited(struct file_baton *fb,
{
/* We have a (delayed) tree conflict to install */
- SVN_ERR(complete_conflict(fb->edit_conflict, fb->dir_baton,
+ SVN_ERR(complete_conflict(fb->edit_conflict, fb->edit_baton,
fb->local_abspath, fb->old_repos_relpath,
fb->old_revision, fb->new_relpath,
svn_node_file, svn_node_file,
@@ -1145,6 +1120,15 @@ path_join_under_root(const char **result
pool));
}
+ /* This catches issue #3288 */
+ if (strcmp(add_path, svn_dirent_basename(*result_path, NULL)) != 0)
+ {
+ return svn_error_createf(
+ SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
+ _("'%s' is not valid as filename in a working copy path"),
+ svn_dirent_local_style(add_path, pool));
+ }
+
return SVN_NO_ERROR;
}
@@ -1163,6 +1147,17 @@ set_target_revision(void *edit_baton,
return SVN_NO_ERROR;
}
+static svn_error_t *
+check_tree_conflict(svn_skel_t **pconflict,
+ struct edit_baton *eb,
+ const char *local_abspath,
+ svn_wc__db_status_t working_status,
+ svn_boolean_t exists_in_repos,
+ svn_node_kind_t expected_kind,
+ svn_wc_conflict_action_t action,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
/* An svn_delta_editor_t function. */
static svn_error_t *
open_root(void *edit_baton,
@@ -1221,8 +1216,50 @@ open_root(void *edit_baton,
db->pool, pool));
if (have_work)
- db->shadowed = TRUE; /* Needed for the close_directory() on the root, to
- make sure it doesn't use the ACTUAL tree */
+ {
+ const char *move_src_root_abspath;
+
+ SVN_ERR(svn_wc__db_base_moved_to(NULL, NULL, &move_src_root_abspath,
+ NULL, eb->db, db->local_abspath,
+ pool, pool));
+ if (move_src_root_abspath)
+ {
+ /* This is an update anchored inside a move. We need to
+ raise a move-edit tree-conflict on the move root to
+ update the move destination. */
+ svn_skel_t *tree_conflict = svn_wc__conflict_skel_create(pool);
+
+ SVN_ERR(svn_wc__conflict_skel_add_tree_conflict(
+ tree_conflict, eb->db, move_src_root_abspath,
+ svn_wc_conflict_reason_moved_away,
+ svn_wc_conflict_action_edit,
+ move_src_root_abspath, pool, pool));
+
+ if (strcmp(db->local_abspath, move_src_root_abspath))
+ {
+ /* This is some parent of the edit root, we won't be
+ handling it again so raise the conflict now. */
+ SVN_ERR(complete_conflict(tree_conflict, eb,
+ move_src_root_abspath,
+ db->old_repos_relpath,
+ db->old_revision, db->new_relpath,
+ svn_node_dir, svn_node_dir,
+ pool, pool));
+ SVN_ERR(svn_wc__db_op_mark_conflict(eb->db,
+ move_src_root_abspath,
+ tree_conflict,
+ NULL, pool));
+ do_notification(eb, move_src_root_abspath, svn_node_dir,
+ svn_wc_notify_tree_conflict, pool);
+ }
+ else
+ db->edit_conflict = tree_conflict;
+ }
+
+
+ db->shadowed = TRUE; /* Needed for the close_directory() on the root, to
+ make sure it doesn't use the ACTUAL tree */
+ }
if (*eb->target_basename == '\0')
{
@@ -1394,7 +1431,7 @@ check_tree_conflict(svn_skel_t **pconfli
svn_wc_conflict_reason_t reason = SVN_WC_CONFLICT_REASON_NONE;
svn_boolean_t modified = FALSE;
svn_boolean_t all_mods_are_deletes = FALSE;
- const char *moved_away_op_root_abspath = NULL;
+ const char *move_src_op_root_abspath = NULL;
*pconflict = NULL;
@@ -1433,11 +1470,11 @@ check_tree_conflict(svn_skel_t **pconfli
else
{
/* The node is locally replaced but could also be moved-away. */
- SVN_ERR(svn_wc__db_base_moved_to(NULL, NULL,
- &moved_away_op_root_abspath,
+ SVN_ERR(svn_wc__db_base_moved_to(NULL, NULL, NULL,
+ &move_src_op_root_abspath,
eb->db, local_abspath,
scratch_pool, scratch_pool));
- if (moved_away_op_root_abspath)
+ if (move_src_op_root_abspath)
reason = svn_wc_conflict_reason_moved_away;
else
reason = svn_wc_conflict_reason_replaced;
@@ -1447,11 +1484,11 @@ check_tree_conflict(svn_skel_t **pconfli
case svn_wc__db_status_deleted:
{
- SVN_ERR(svn_wc__db_base_moved_to(NULL, NULL,
- &moved_away_op_root_abspath,
+ SVN_ERR(svn_wc__db_base_moved_to(NULL, NULL, NULL,
+ &move_src_op_root_abspath,
eb->db, local_abspath,
scratch_pool, scratch_pool));
- if (moved_away_op_root_abspath)
+ if (move_src_op_root_abspath)
reason = svn_wc_conflict_reason_moved_away;
else
reason = svn_wc_conflict_reason_deleted;
@@ -1566,7 +1603,7 @@ check_tree_conflict(svn_skel_t **pconfli
eb->db, local_abspath,
reason,
action,
- moved_away_op_root_abspath,
+ move_src_op_root_abspath,
result_pool, scratch_pool));
return SVN_NO_ERROR;
@@ -1835,7 +1872,7 @@ delete_entry(const char *path,
SVN_ERR_MALFUNCTION(); /* other reasons are not expected here */
}
- SVN_ERR(complete_conflict(tree_conflict, pb, local_abspath, repos_relpath,
+ SVN_ERR(complete_conflict(tree_conflict, eb, local_abspath, repos_relpath,
old_revision, NULL,
(kind == svn_kind_dir)
? svn_node_dir
@@ -2202,7 +2239,7 @@ add_directory(const char *path,
}
if (tree_conflict)
- SVN_ERR(complete_conflict(tree_conflict, pb, db->local_abspath,
+ SVN_ERR(complete_conflict(tree_conflict, eb, db->local_abspath,
db->old_repos_relpath, db->old_revision,
db->new_relpath,
svn__node_kind_from_kind(wc_kind),
@@ -2460,7 +2497,7 @@ close_directory(void *dir_baton,
if (db->skip_this)
{
/* Allow the parent to complete its update. */
- SVN_ERR(maybe_release_dir_info(db->bump_info));
+ SVN_ERR(maybe_release_dir_info(db));
return SVN_NO_ERROR;
}
@@ -2778,7 +2815,7 @@ close_directory(void *dir_baton,
svn_skel_t *work_item;
SVN_ERR(complete_conflict(conflict_skel,
- db->parent_baton,
+ db->edit_baton,
db->local_abspath,
db->old_repos_relpath,
db->old_revision,
@@ -2876,7 +2913,7 @@ close_directory(void *dir_baton,
/* We're done with this directory, so remove one reference from the
bump information. */
- SVN_ERR(maybe_release_dir_info(db->bump_info));
+ SVN_ERR(maybe_release_dir_info(db));
return SVN_NO_ERROR;
}
@@ -3298,7 +3335,7 @@ add_file(const char *path,
if (tree_conflict != NULL)
{
SVN_ERR(complete_conflict(tree_conflict,
- fb->dir_baton,
+ fb->edit_baton,
fb->local_abspath,
fb->old_repos_relpath,
fb->old_revision,
@@ -3668,7 +3705,7 @@ change_file_prop(void *file_baton,
NULL,
fb->pool, scratch_pool));
- SVN_ERR(complete_conflict(fb->edit_conflict, fb->dir_baton,
+ SVN_ERR(complete_conflict(fb->edit_conflict, fb->edit_baton,
fb->local_abspath, fb->old_repos_relpath,
fb->old_revision, fb->new_relpath,
svn_node_file, svn_node_file,
@@ -4051,6 +4088,7 @@ close_file(void *file_baton,
apr_pool_t *pool)
{
struct file_baton *fb = file_baton;
+ struct dir_baton *pdb = fb->dir_baton;
struct edit_baton *eb = fb->edit_baton;
svn_wc_notify_state_t content_state, prop_state;
svn_wc_notify_lock_state_t lock_state;
@@ -4073,8 +4111,8 @@ close_file(void *file_baton,
if (fb->skip_this)
{
- SVN_ERR(maybe_release_dir_info(fb->bump_info));
svn_pool_destroy(fb->pool);
+ SVN_ERR(maybe_release_dir_info(pdb));
return SVN_NO_ERROR;
}
@@ -4256,8 +4294,8 @@ close_file(void *file_baton,
scratch_pool));
fb->skip_this = TRUE;
- SVN_ERR(maybe_release_dir_info(fb->bump_info));
svn_pool_destroy(fb->pool);
+ SVN_ERR(maybe_release_dir_info(pdb));
return SVN_NO_ERROR;
}
else
@@ -4378,7 +4416,7 @@ close_file(void *file_baton,
if (conflict_skel)
{
SVN_ERR(complete_conflict(conflict_skel,
- fb->dir_baton,
+ fb->edit_baton,
fb->local_abspath,
fb->old_repos_relpath,
fb->old_revision,
@@ -4499,11 +4537,11 @@ close_file(void *file_baton,
eb->notify_func(eb->notify_baton, notify, scratch_pool);
}
- /* We have one less referrer to the directory's bump information. */
- SVN_ERR(maybe_release_dir_info(fb->bump_info));
-
svn_pool_destroy(fb->pool); /* Destroy scratch_pool */
+ /* We have one less referrer to the directory */
+ SVN_ERR(maybe_release_dir_info(pdb));
+
return SVN_NO_ERROR;
}
Modified: subversion/branches/fsfs-format7/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_wc/wc-queries.sql?rev=1445479&r1=1445478&r2=1445479&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_wc/wc-queries.sql Wed Feb 13 06:37:54 2013
@@ -29,7 +29,8 @@
-- STMT_SELECT_NODE_INFO
SELECT op_depth, repos_id, repos_path, presence, kind, revision, checksum,
translated_size, changed_revision, changed_date, changed_author, depth,
- symlink_target, last_mod_time, properties, moved_here, inherited_props
+ symlink_target, last_mod_time, properties, moved_here, inherited_props,
+ moved_to
FROM nodes
WHERE wc_id = ?1 AND local_relpath = ?2
ORDER BY op_depth DESC
@@ -102,6 +103,13 @@ WHERE wc_id = ?1 AND local_relpath = ?2
ORDER BY op_depth
LIMIT 1
+-- STMT_SELECT_HIGHEST_WORKING_NODE
+SELECT op_depth
+FROM nodes
+WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth < ?3
+ORDER BY op_depth DESC
+LIMIT 1
+
-- STMT_SELECT_ACTUAL_NODE
SELECT changelist, properties, conflict_data
FROM actual_node
@@ -271,13 +279,18 @@ SELECT local_relpath, kind FROM nodes
WHERE wc_id = ?1 AND parent_relpath = ?2 AND op_depth = ?3
AND (?3 != 0 OR file_external is NULL)
+/* Used by non-recursive revert to detect higher level children, and
+ actual-only rows that would be left orphans, if the revert
+ proceeded. */
-- STMT_SELECT_GE_OP_DEPTH_CHILDREN
SELECT 1 FROM nodes
WHERE wc_id = ?1 AND parent_relpath = ?2
AND (op_depth > ?3 OR (op_depth = ?3 AND presence != MAP_BASE_DELETED))
UNION ALL
-SELECT 1 FROM ACTUAL_NODE
+SELECT 1 FROM ACTUAL_NODE a
WHERE wc_id = ?1 AND parent_relpath = ?2
+ AND NOT EXISTS (SELECT 1 FROM nodes n
+ WHERE wc_id = ?1 AND n.local_relpath = a.local_relpath)
/* Delete the nodes shadowed by local_relpath. Not valid for the wc-root */
-- STMT_DELETE_SHADOWED_RECURSIVE
@@ -287,6 +300,11 @@ WHERE wc_id = ?1
AND (op_depth < ?3
OR (op_depth = ?3 AND presence = MAP_BASE_DELETED))
+-- STMT_CLEAR_MOVED_TO_FROM_DEST
+UPDATE NODES SET moved_to = NULL
+WHERE wc_id = ?1
+ AND moved_to = ?2
+
/* Get not-present descendants of a copied node. Not valid for the wc-root */
-- STMT_SELECT_NOT_PRESENT_DESCENDANTS
SELECT local_relpath FROM nodes
@@ -294,13 +312,21 @@ WHERE wc_id = ?1 AND op_depth = ?3
AND IS_STRICT_DESCENDANT_OF(local_relpath, ?2)
AND presence = MAP_NOT_PRESENT
--- STMT_COMMIT_DESCENDANT_TO_BASE
-UPDATE NODES SET op_depth = 0, repos_id = ?4, repos_path = ?5, revision = ?6,
- moved_here = NULL, moved_to = NULL, dav_cache = NULL,
- presence = CASE presence WHEN MAP_NORMAL THEN MAP_NORMAL
- WHEN MAP_EXCLUDED THEN MAP_EXCLUDED
- ELSE MAP_NOT_PRESENT END
-WHERE wc_id = ?1 AND local_relpath = ?2 and op_depth = ?3
+-- STMT_COMMIT_DESCENDANTS_TO_BASE
+UPDATE NODES SET op_depth = 0,
+ repos_id = ?4,
+ repos_path = ?5 || SUBSTR(local_relpath, LENGTH(?2)+1),
+ revision = ?6,
+ dav_cache = NULL,
+ moved_here = NULL,
+ presence = CASE presence
+ WHEN MAP_NORMAL THEN MAP_NORMAL
+ WHEN MAP_EXCLUDED THEN MAP_EXCLUDED
+ ELSE MAP_NOT_PRESENT
+ END
+WHERE wc_id = ?1
+ AND IS_STRICT_DESCENDANT_OF(local_relpath, ?2)
+ AND op_depth = ?3
-- STMT_SELECT_NODE_CHILDREN
/* Return all paths that are children of the directory (?1, ?2) in any
@@ -1508,6 +1534,14 @@ WHERE wc_id = ?1
AND op_depth > ?3
AND moved_to IS NOT NULL
+-- STMT_SELECT_MOVED_OUTSIDE
+SELECT local_relpath FROM nodes
+WHERE wc_id = ?1
+ AND (local_relpath = ?2 OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
+ AND op_depth >= ?3
+ AND moved_to IS NOT NULL
+ AND NOT IS_STRICT_DESCENDANT_OF(moved_to, ?2)
+
-- STMT_SELECT_OP_DEPTH_MOVED_PAIR
SELECT n.local_relpath, n.moved_to,
(SELECT o.repos_path FROM nodes AS o
@@ -1520,10 +1554,45 @@ WHERE n.wc_id = ?1
AND n.op_depth = ?3
AND n.moved_to IS NOT NULL
+-- STMT_SELECT_MOVED_DESCENDANTS
+SELECT n.local_relpath, h.moved_to
+FROM nodes n, nodes h
+WHERE n.wc_id = ?1
+ AND h.wc_id = ?1
+ AND IS_STRICT_DESCENDANT_OF(n.local_relpath, ?2)
+ AND h.local_relpath = n.local_relpath
+ AND n.op_depth = ?3
+ AND h.op_depth = (SELECT MIN(o.op_depth)
+ FROM nodes o
+ WHERE o.wc_id = ?1
+ AND o.local_relpath = n.local_relpath
+ AND o.op_depth > ?3)
+ AND h.moved_to IS NOT NULL
+
+-- STMT_COMMIT_UPDATE_ORIGIN
+/* Note that the only reason this SUBSTR() trick is valid is that you
+ can move neither the working copy nor the repository root.
+
+ SUBSTR(local_relpath, LENGTH(?2)+1) includes the '/' of the path */
+UPDATE nodes SET repos_id = ?4,
+ repos_path = ?5 || SUBSTR(local_relpath, LENGTH(?2)+1),
+ revision = ?6
+WHERE wc_id = ?1
+ AND (local_relpath = ?2
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
+ AND op_depth = ?3
+
-- STMT_HAS_LAYER_BETWEEN
SELECT 1 FROM NODES
WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth > ?3 AND op_depth < ?4
+-- STMT_SELECT_REPOS_PATH_REVISION
+SELECT local_relpath, repos_path, revision FROM nodes
+WHERE wc_id = ?1
+ AND IS_STRICT_DESCENDANT_OF(local_relpath, ?2)
+ AND op_depth = 0
+ORDER BY local_relpath
+
/* ------------------------------------------------------------------------- */
/* Queries for verification. */
Modified: subversion/branches/fsfs-format7/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_wc/wc.h?rev=1445479&r1=1445478&r2=1445479&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_wc/wc.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_wc/wc.h Wed Feb 13 06:37:54 2013
@@ -615,21 +615,15 @@ svn_wc__internal_get_origin(svn_boolean_
/* Internal version of svn_wc__node_get_repos_info() */
svn_error_t *
-svn_wc__internal_get_repos_info(const char **repos_root_url,
+svn_wc__internal_get_repos_info(svn_revnum_t *revision,
+ const char **repos_relpath,
+ const char **repos_root_url,
const char **repos_uuid,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Internal version of svn_wc__node_get_repos_relpath() */
-svn_error_t *
-svn_wc__internal_get_repos_relpath(const char **repos_relpath,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
/* Upgrade the wc sqlite database given in SDB for the wc located at
WCROOT_ABSPATH. It's current/starting format is given by START_FORMAT.
After the upgrade is complete (to as far as the automatic upgrade will
Modified: subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.c?rev=1445479&r1=1445478&r2=1445479&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.c Wed Feb 13 06:37:54 2013
@@ -3830,7 +3830,7 @@ scan_deletion_txn(const char **base_del_
}
- while(TRUE)
+ while (TRUE)
{
svn_error_t *err;
const char *parent_relpath;
@@ -3838,7 +3838,7 @@ scan_deletion_txn(const char **base_del_
/* Step CURRENT_RELPATH to op-root */
- while(TRUE)
+ while (TRUE)
{
if (scan)
{
@@ -3856,7 +3856,7 @@ scan_deletion_txn(const char **base_del_
}
}
- if(current_depth <= op_depth)
+ if (current_depth <= op_depth)
break;
current_relpath = svn_relpath_dirname(current_relpath, scratch_pool);
@@ -6019,11 +6019,13 @@ op_revert_txn(void *baton,
const char *local_relpath,
apr_pool_t *scratch_pool)
{
+ svn_wc__db_t *db = baton;
svn_sqlite__stmt_t *stmt;
svn_boolean_t have_row;
int op_depth;
svn_boolean_t moved_here;
int affected_rows;
+ const char *moved_to;
/* ### Similar structure to op_revert_recursive_txn, should they be
combined? */
@@ -6069,8 +6071,55 @@ op_revert_txn(void *baton,
op_depth = svn_sqlite__column_int(stmt, 0);
moved_here = svn_sqlite__column_boolean(stmt, 15);
+ moved_to = svn_sqlite__column_text(stmt, 17, scratch_pool);
SVN_ERR(svn_sqlite__reset(stmt));
+ if (moved_to)
+ {
+ SVN_ERR(svn_wc__db_resolve_break_moved_away_internal(wcroot,
+ local_relpath,
+ scratch_pool));
+ }
+ else
+ {
+ svn_skel_t *conflict;
+
+ SVN_ERR(svn_wc__db_read_conflict_internal(&conflict, wcroot,
+ local_relpath,
+ scratch_pool, scratch_pool));
+ if (conflict)
+ {
+ svn_wc_operation_t operation;
+ svn_boolean_t tree_conflicted;
+
+ SVN_ERR(svn_wc__conflict_read_info(&operation, NULL, NULL, NULL,
+ &tree_conflicted,
+ db, wcroot->abspath,
+ conflict,
+ scratch_pool, scratch_pool));
+ if (tree_conflicted
+ && (operation == svn_wc_operation_update
+ || operation == svn_wc_operation_switch))
+ {
+ svn_wc_conflict_reason_t reason;
+ svn_wc_conflict_action_t action;
+
+ SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action,
+ NULL,
+ db, wcroot->abspath,
+ conflict,
+ scratch_pool,
+ scratch_pool));
+
+ if (reason == svn_wc_conflict_reason_deleted)
+ SVN_ERR(svn_wc__db_resolve_delete_raise_moved_away(
+ db, svn_dirent_join(wcroot->abspath, local_relpath,
+ scratch_pool),
+ scratch_pool));
+ }
+ }
+ }
+
if (op_depth > 0 && op_depth == relpath_depth(local_relpath))
{
/* Can't do non-recursive revert if children exist */
@@ -6185,6 +6234,27 @@ op_revert_recursive_txn(void *baton,
local_relpath,
scratch_pool));
+ /* Remove moved-here from move destinations outside the tree. */
+ SVN_ERR(svn_sqlite__get_statement(
+ &stmt, wcroot->sdb, STMT_SELECT_MOVED_OUTSIDE));
+ SVN_ERR(svn_sqlite__bindf(stmt, "isd", wcroot->wc_id, local_relpath,
+ op_depth));
+ SVN_ERR(svn_sqlite__step(&have_row, stmt));
+ while (have_row)
+ {
+ const char *move_src_relpath = svn_sqlite__column_text(stmt, 0, NULL);
+ svn_error_t *err;
+
+ err = svn_wc__db_resolve_break_moved_away_internal(wcroot,
+ move_src_relpath,
+ scratch_pool);
+ if (err)
+ return svn_error_compose_create(err, svn_sqlite__reset(stmt));
+
+ SVN_ERR(svn_sqlite__step(&have_row, stmt));
+ }
+ SVN_ERR(svn_sqlite__reset(stmt));
+
/* Don't delete BASE nodes */
select_op_depth = op_depth ? op_depth : 1;
@@ -6268,6 +6338,7 @@ svn_wc__db_op_revert(svn_wc__db_t *db,
{
case svn_depth_empty:
wtb.cb_func = op_revert_txn;
+ wtb.cb_baton = db;
break;
case svn_depth_infinity:
wtb.cb_func = op_revert_recursive_txn;
@@ -9193,23 +9264,14 @@ svn_wc__db_prop_retrieve_recursive(apr_h
return svn_error_trace(svn_sqlite__reset(stmt));
}
-/* Baton for passing args to db_read_cached_iprops(). */
-struct read_cached_iprops_baton_t
-{
- apr_array_header_t *iprops;
- apr_pool_t *result_pool;
-};
-
-/* The body of svn_wc__db_read_cached_iprops().
- *
- * (Not called in a txn, but implements svn_wc__db_txn_callback_t anyway.) */
+/* The body of svn_wc__db_read_cached_iprops(). */
static svn_error_t *
-db_read_cached_iprops(void *baton,
+db_read_cached_iprops(apr_array_header_t **iprops,
svn_wc__db_wcroot_t *wcroot,
const char *local_relpath,
+ apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- struct read_cached_iprops_baton_t *rib = baton;
svn_sqlite__stmt_t *stmt;
svn_boolean_t have_row;
@@ -9226,8 +9288,8 @@ db_read_cached_iprops(void *baton,
scratch_pool));
}
- SVN_ERR(svn_sqlite__column_iprops(&rib->iprops, stmt, 0,
- rib->result_pool, scratch_pool));
+ SVN_ERR(svn_sqlite__column_iprops(iprops, stmt, 0,
+ result_pool, scratch_pool));
SVN_ERR(svn_sqlite__reset(stmt));
@@ -9243,7 +9305,6 @@ svn_wc__db_read_cached_iprops(apr_array_
{
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
- struct read_cached_iprops_baton_t rcib;
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
@@ -9252,14 +9313,11 @@ svn_wc__db_read_cached_iprops(apr_array_
scratch_pool, scratch_pool));
VERIFY_USABLE_WCROOT(wcroot);
- rcib.result_pool = result_pool;
-
/* Don't use with_txn yet, as we perform just a single transaction */
- SVN_ERR(db_read_cached_iprops(&rcib, wcroot, local_relpath, scratch_pool));
+ SVN_ERR(db_read_cached_iprops(iprops, wcroot, local_relpath,
+ result_pool, scratch_pool));
- if (rcib.iprops)
- *iprops = rcib.iprops;
- else
+ if (!*iprops)
{
*iprops = apr_array_make(result_pool, 0,
sizeof(svn_prop_inherited_item_t *));
@@ -9296,7 +9354,6 @@ db_read_inherited_props(apr_array_header
svn_wc__db_wcroot_t *wcroot,
const char *local_relpath,
const char *propname,
- const char *repos_root_url,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -9329,21 +9386,17 @@ db_read_inherited_props(apr_array_header
if (is_switched || is_wc_root)
{
- struct read_cached_iprops_baton_t rib;
is_wc_root = TRUE;
- rib.result_pool = scratch_pool;
-
/* If the WC root is also the root of the repository then by
definition there are no inheritable properties to be had,
but checking for that is just as expensive as fetching them
anyway. */
/* Grab the cached inherited properties for the WC root. */
- SVN_ERR(db_read_cached_iprops(&rib, wcroot, parent_relpath,
- iterpool));
-
- cached_iprops = rib.iprops;
+ SVN_ERR(db_read_cached_iprops(&cached_iprops,
+ wcroot, parent_relpath,
+ result_pool, iterpool));
}
/* If PARENT_ABSPATH is a true parent of LOCAL_ABSPATH, then
@@ -9419,21 +9472,16 @@ svn_wc__db_read_inherited_props(apr_arra
{
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
- const char *repos_root_url;
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
- SVN_ERR(svn_wc__internal_get_repos_info(&repos_root_url, NULL, db,
- local_abspath, scratch_pool,
- scratch_pool));
-
SVN_ERR(svn_wc__db_wcroot_parse_local_abspath(&wcroot, &local_relpath,
db, local_abspath,
scratch_pool, scratch_pool));
VERIFY_USABLE_WCROOT(wcroot);
SVN_WC__DB_WITH_TXN(db_read_inherited_props(iprops,
- wcroot, local_relpath, propname, repos_root_url,
+ wcroot, local_relpath, propname,
result_pool, scratch_pool),
wcroot);
@@ -9990,52 +10038,146 @@ determine_repos_info(apr_int64_t *repos_
return SVN_NO_ERROR;
}
-/* Moves all nodes below PARENT_LOCAL_RELPATH from op-depth OP_DEPTH to
- op-depth 0 (BASE), setting their presence to 'not-present' if their presence
- wasn't 'normal'. */
+/* Helper for svn_wc__db_global_commit()
+
+ Makes local_relpath and all its descendants at the same op-depth represent
+ the copy origin repos_id:repos_relpath@revision.
+
+ This code is only valid to fix-up a move from an old location, to a new
+ location during a commit.
+
+ Assumptions:
+ * local_relpath is not the working copy root (can't be moved)
+ * repos_relpath is not the repository root (can't be moved)
+ */
static svn_error_t *
-descendant_commit(svn_wc__db_wcroot_t *wcroot,
- const char *parent_local_relpath,
- int op_depth,
- apr_int64_t repos_id,
- const char *parent_repos_relpath,
- svn_revnum_t revision,
- apr_pool_t *scratch_pool)
+moved_descendant_commit(svn_wc__db_wcroot_t *wcroot,
+ const char *local_relpath,
+ int op_depth,
+ apr_int64_t repos_id,
+ const char *repos_relpath,
+ svn_revnum_t revision,
+ apr_pool_t *scratch_pool)
{
- const apr_array_header_t *children;
- apr_pool_t *iterpool = svn_pool_create(scratch_pool);
+ apr_hash_t *children;
+ apr_pool_t *iterpool;
svn_sqlite__stmt_t *stmt;
- int i;
+ svn_boolean_t have_row;
+ apr_hash_index_t *hi;
+
+ SVN_ERR_ASSERT(*local_relpath != '\0'
+ && *repos_relpath != '\0');
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
- STMT_COMMIT_DESCENDANT_TO_BASE));
+ STMT_SELECT_MOVED_DESCENDANTS));
+ SVN_ERR(svn_sqlite__bindf(stmt, "isd", wcroot->wc_id,
+ local_relpath,
+ op_depth));
- SVN_ERR(gather_repo_children(&children, wcroot, parent_local_relpath,
- op_depth, scratch_pool, iterpool));
+ SVN_ERR(svn_sqlite__step(&have_row, stmt));
+ if (! have_row)
+ return svn_error_trace(svn_sqlite__reset(stmt));
- for (i = 0; i < children->nelts; i++)
+ children = apr_hash_make(scratch_pool);
+
+ /* First, obtain all moved children */
+ /* To keep error handling simple, first cache them in a hashtable */
+ while (have_row)
{
- const char *local_relpath;
- const char *repos_relpath;
- const char *name = APR_ARRAY_IDX(children, i, const char *);
+ const char *src_relpath = svn_sqlite__column_text(stmt, 0, scratch_pool);
+ const char *to_relpath = svn_sqlite__column_text(stmt, 1, scratch_pool);
+
+ svn_hash_sets(children, src_relpath, to_relpath);
+
+ SVN_ERR(svn_sqlite__step(&have_row, stmt));
+ }
+ SVN_ERR(svn_sqlite__reset(stmt));
+
+ /* Then update them */
+ SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
+ STMT_COMMIT_UPDATE_ORIGIN));
+
+ iterpool = svn_pool_create(scratch_pool);
+ for (hi = apr_hash_first(scratch_pool, children); hi; hi = apr_hash_next(hi))
+ {
+ const char *src_relpath = svn__apr_hash_index_key(hi);
+ const char *to_relpath = svn__apr_hash_index_val(hi);
+ const char *new_repos_relpath;
+ int to_op_depth = relpath_depth(to_relpath);
+ int affected;
svn_pool_clear(iterpool);
- local_relpath = svn_relpath_join(parent_local_relpath, name, iterpool);
- repos_relpath = svn_relpath_join(parent_repos_relpath, name, iterpool);
- SVN_ERR(svn_sqlite__bindf(stmt, "isdisr",
- wcroot->wc_id,
- local_relpath,
- op_depth,
- repos_id,
- repos_relpath,
- revision));
- SVN_ERR(svn_sqlite__step_done(stmt));
+ SVN_ERR_ASSERT(to_op_depth > 0);
+
+ new_repos_relpath = svn_relpath_join(
+ repos_relpath,
+ svn_relpath_skip_ancestor(local_relpath,
+ src_relpath),
+ iterpool);
+
+ SVN_ERR(svn_sqlite__bindf(stmt, "isdisr", wcroot->wc_id,
+ to_relpath,
+ to_op_depth,
+ repos_id,
+ new_repos_relpath,
+ revision));
+ SVN_ERR(svn_sqlite__update(&affected, stmt));
- SVN_ERR(descendant_commit(wcroot, local_relpath, op_depth, repos_id,
- repos_relpath, revision, iterpool));
+#ifdef SVN_DEBUG
+ /* Enable in release code?
+ Broken moves are not fatal yet, but this assertion would break
+ committing them */
+ SVN_ERR_ASSERT(affected >= 1); /* If this fails there is no move dest */
+#endif
+
+ SVN_ERR(moved_descendant_commit(wcroot, to_relpath, to_op_depth,
+ repos_id, new_repos_relpath, revision,
+ iterpool));
}
+
svn_pool_destroy(iterpool);
+ return SVN_NO_ERROR;
+}
+
+/* Helper for svn_wc__db_global_commit()
+
+ Moves all nodes below LOCAL_RELPATH from op-depth OP_DEPTH to op-depth 0
+ (BASE), setting their presence to 'not-present' if their presence wasn't
+ 'normal'.
+
+ Makes all nodes below LOCAL_RELPATH represent the descendants of repository
+ location repos_id:repos_relpath@revision.
+
+ Assumptions:
+ * local_relpath is not the working copy root (can't be replaced)
+ * repos_relpath is not the repository root (can't be replaced)
+ */
+static svn_error_t *
+descendant_commit(svn_wc__db_wcroot_t *wcroot,
+ const char *local_relpath,
+ int op_depth,
+ apr_int64_t repos_id,
+ const char *repos_relpath,
+ svn_revnum_t revision,
+ apr_pool_t *scratch_pool)
+{
+ svn_sqlite__stmt_t *stmt;
+
+ SVN_ERR_ASSERT(*local_relpath != '\0'
+ && *repos_relpath != '\0');
+
+ SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
+ STMT_COMMIT_DESCENDANTS_TO_BASE));
+
+ SVN_ERR(svn_sqlite__bindf(stmt, "isdisr", wcroot->wc_id,
+ local_relpath,
+ op_depth,
+ repos_id,
+ repos_relpath,
+ revision));
+
+ SVN_ERR(svn_sqlite__update(NULL, stmt));
return SVN_NO_ERROR;
}
@@ -10163,13 +10305,7 @@ commit_node(svn_wc__db_wcroot_t *wcroot,
1) Remove all shadowed nodes
2) And remove all nodes that have a base-deleted as lowest layer,
- because 1) removed that layer
-
- Possible followup:
- 3) ### Collapse descendants of the current op_depth in layer 0,
- to commit a remote copy in one step (but don't touch/use
- ACTUAL!!)
- */
+ because 1) removed that layer */
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_DELETE_SHADOWED_RECURSIVE));
@@ -10183,9 +10319,28 @@ commit_node(svn_wc__db_wcroot_t *wcroot,
SVN_ERR(svn_sqlite__step_done(stmt));
}
+ /* Note that while these two calls look so similar that they might
+ be integrated, they really affect a different op-depth and
+ completely different nodes (via a different recursion pattern). */
+
+ /* Collapse descendants of the current op_depth in layer 0 */
SVN_ERR(descendant_commit(wcroot, local_relpath, op_depth,
repos_id, repos_relpath, new_revision,
scratch_pool));
+
+ /* And make the recorded local moves represent moves of the node we just
+ committed. */
+ SVN_ERR(moved_descendant_commit(wcroot, local_relpath, 0,
+ repos_id, repos_relpath, new_revision,
+ scratch_pool));
+
+ /* This node is no longer modified, so no node was moved here */
+ SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
+ STMT_CLEAR_MOVED_TO_FROM_DEST));
+ SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id,
+ local_relpath));
+
+ SVN_ERR(svn_sqlite__step_done(stmt));
}
/* Update or add the BASE_NODE row with all the new information. */
@@ -11513,33 +11668,39 @@ svn_wc__db_follow_moved_to(apr_array_hea
examining the lowest working node above OP_DEPTH. The output paths
are NULL if there is no move, otherwise:
- *MOVED_TO_RELPATH: the moved-to destination of LOCAL_RELPATH.
+ *MOVE_DST_RELPATH: the moved-to destination of LOCAL_RELPATH.
- *MOVED_TO_OP_ROOT_RELPATH: the moved-to destination of the root of
- the move of LOCAL_RELPATH. This may be equal to *MOVED_TO_RELPATH
+ *MOVE_DST_OP_ROOT_RELPATH: the moved-to destination of the root of
+ the move of LOCAL_RELPATH. This may be equal to *MOVE_DST_RELPATH
if LOCAL_RELPATH is the root of the move.
- *OP_ROOT_RELPATH: the root of the source layer that contains the
- move. For moves inside deletes this is the root of the delete, for
- other moves this is the root of the move.
+ *MOVE_SRC_ROOT_RELPATH: the root of the move source. For moves
+ inside a delete this will be different from *MOVE_SRC_OP_ROOT_RELPATH.
- Given a path A/B/C with A/B moved to X then for A/B/C
+ *MOVE_SRC_OP_ROOT_RELPATH: the root of the source layer that
+ contains the move. For moves inside deletes this is the root of
+ the delete, for other moves this is the root of the move.
- MOVED_TO_RELPATH is X/C
- MOVED_TO_OP_ROOT_RELPATH is X
- OP_ROOT_RELPATH is A/B
+ Given a path A/B/C with A/B moved to X then for A/B/C
- If A is then deleted the MOVED_TO_RELPATH and MOVED_TO_OP_ROOT_RELPATH
- remain the same but OP_ROOT_RELPATH changes to A.
+ MOVE_DST_RELPATH is X/C
+ MOVE_DST_OP_ROOT_RELPATH is X
+ MOVE_SRC_ROOT_RELPATH is A/B
+ MOVE_SRC_OP_ROOT_RELPATH is A/B
+
+ If A is then deleted the MOVE_DST_RELPATH, MOVE_DST_OP_ROOT_RELPATH
+ and MOVE_SRC_ROOT_RELPATH remain the same but MOVE_SRC_OP_ROOT_RELPATH
+ changes to A.
### Think about combining with scan_deletion? Also with
### scan_addition to get moved-to for replaces? Do we need to
### return the op-root of the move source, i.e. A/B in the example
### above? */
svn_error_t *
-svn_wc__db_op_depth_moved_to(const char **moved_to_relpath,
- const char **moved_to_op_root_relpath,
- const char **op_root_relpath,
+svn_wc__db_op_depth_moved_to(const char **move_dst_relpath,
+ const char **move_dst_op_root_relpath,
+ const char **move_src_root_relpath,
+ const char **move_src_op_root_relpath,
int op_depth,
svn_wc__db_wcroot_t *wcroot,
const char *local_relpath,
@@ -11551,7 +11712,8 @@ svn_wc__db_op_depth_moved_to(const char
int delete_op_depth;
const char *relpath = local_relpath;
- *moved_to_relpath = *moved_to_op_root_relpath = *op_root_relpath = NULL;
+ *move_dst_relpath = *move_dst_op_root_relpath = NULL;
+ *move_src_root_relpath = *move_src_op_root_relpath = NULL;
do
{
@@ -11562,25 +11724,27 @@ svn_wc__db_op_depth_moved_to(const char
if (have_row)
{
delete_op_depth = svn_sqlite__column_int(stmt, 0);
- *moved_to_op_root_relpath = svn_sqlite__column_text(stmt, 3,
+ *move_dst_op_root_relpath = svn_sqlite__column_text(stmt, 3,
result_pool);
+ if (*move_dst_op_root_relpath)
+ *move_src_root_relpath = apr_pstrdup(result_pool, relpath);
}
SVN_ERR(svn_sqlite__reset(stmt));
- if (!*moved_to_op_root_relpath)
+ if (!*move_dst_op_root_relpath)
relpath = svn_relpath_dirname(relpath, scratch_pool);
}
- while(!*moved_to_op_root_relpath
- && have_row && delete_op_depth < relpath_depth(relpath));
+ while (!*move_dst_op_root_relpath
+ && have_row && delete_op_depth <= relpath_depth(relpath));
- if (*moved_to_op_root_relpath)
+ if (*move_dst_op_root_relpath)
{
- *moved_to_relpath
- = svn_relpath_join(*moved_to_op_root_relpath,
+ *move_dst_relpath
+ = svn_relpath_join(*move_dst_op_root_relpath,
svn_relpath_skip_ancestor(relpath, local_relpath),
result_pool);
- while(delete_op_depth < relpath_depth(relpath))
+ while (delete_op_depth < relpath_depth(relpath))
relpath = svn_relpath_dirname(relpath, scratch_pool);
- *op_root_relpath = apr_pstrdup(result_pool, relpath);
+ *move_src_op_root_relpath = apr_pstrdup(result_pool, relpath);
}
return SVN_NO_ERROR;
@@ -11590,9 +11754,10 @@ svn_wc__db_op_depth_moved_to(const char
svn_wc__db_op_depth_moved_to with the op-depth hard-coded to
BASE. */
svn_error_t *
-svn_wc__db_base_moved_to(const char **moved_to_abspath,
- const char **moved_to_op_root_abspath,
- const char **op_root_abspath,
+svn_wc__db_base_moved_to(const char **move_dst_abspath,
+ const char **move_dst_op_root_abspath,
+ const char **move_src_root_abspath,
+ const char **move_src_op_root_abspath,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *result_pool,
@@ -11600,7 +11765,8 @@ svn_wc__db_base_moved_to(const char **mo
{
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
- const char *moved_to_relpath, *moved_to_op_root_relpath, *op_root_relpath;
+ const char *move_dst_relpath, *move_dst_op_root_relpath;
+ const char *move_src_root_relpath, *move_src_op_root_relpath;
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
@@ -11608,30 +11774,37 @@ svn_wc__db_base_moved_to(const char **mo
local_abspath, scratch_pool, scratch_pool));
VERIFY_USABLE_WCROOT(wcroot);
- SVN_WC__DB_WITH_TXN(svn_wc__db_op_depth_moved_to(&moved_to_relpath,
- &moved_to_op_root_relpath,
- &op_root_relpath,
+ SVN_WC__DB_WITH_TXN(svn_wc__db_op_depth_moved_to(&move_dst_relpath,
+ &move_dst_op_root_relpath,
+ &move_src_root_relpath,
+ &move_src_op_root_relpath,
0 /* BASE op-depth */,
wcroot, local_relpath,
scratch_pool, scratch_pool),
wcroot);
- if (moved_to_abspath)
- *moved_to_abspath
- = moved_to_relpath
- ? svn_dirent_join(wcroot->abspath, moved_to_relpath, result_pool)
+ if (move_dst_abspath)
+ *move_dst_abspath
+ = move_dst_relpath
+ ? svn_dirent_join(wcroot->abspath, move_dst_relpath, result_pool)
: NULL;
- if (moved_to_op_root_abspath)
- *moved_to_op_root_abspath
- = moved_to_op_root_relpath
- ? svn_dirent_join(wcroot->abspath, moved_to_relpath, result_pool)
+ if (move_dst_op_root_abspath)
+ *move_dst_op_root_abspath
+ = move_dst_op_root_relpath
+ ? svn_dirent_join(wcroot->abspath, move_dst_op_root_relpath, result_pool)
: NULL;
- if (op_root_abspath)
- *op_root_abspath
- = op_root_relpath
- ? svn_dirent_join(wcroot->abspath, op_root_relpath, result_pool)
+ if (move_src_root_abspath)
+ *move_src_root_abspath
+ = move_src_root_relpath
+ ? svn_dirent_join(wcroot->abspath, move_src_root_relpath, result_pool)
+ : NULL;
+
+ if (move_src_op_root_abspath)
+ *move_src_op_root_abspath
+ = move_src_op_root_relpath
+ ? svn_dirent_join(wcroot->abspath, move_src_op_root_relpath, result_pool)
: NULL;
return SVN_NO_ERROR;
Modified: subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.h?rev=1445479&r1=1445478&r2=1445479&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.h Wed Feb 13 06:37:54 2013
@@ -3271,10 +3271,16 @@ svn_wc__db_update_moved_away_conflict_vi
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
+/* LOCAL_ABSPATH is moved to MOVE_DST_ABSPATH. MOVE_SRC_ROOT_ABSPATH
+ * is the root of the move to MOVE_DST_OP_ROOT_ABSPATH.
+ * MOVE_SRC_OP_ROOT_ABSPATH is the op-root of the move; it's the same
+ * as MOVE_SRC_ROOT_ABSPATH except for moves inside deletes when it is
+ * the op-root of the delete. */
svn_error_t *
-svn_wc__db_base_moved_to(const char **moved_to_abspath,
- const char **moved_to_op_root_abspath,
- const char **op_root_abspath,
+svn_wc__db_base_moved_to(const char **move_dst_abspath,
+ const char **move_dst_op_root_abspath,
+ const char **move_src_root_abspath,
+ const char **move_src_op_root_abspath,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *result_pool,
@@ -3295,6 +3301,13 @@ svn_error_t *
svn_wc__db_resolve_delete_raise_moved_away(svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *scratch_pool);
+
+/* Like svn_wc__db_resolve_delete_raise_moved_away this should be
+ combined. */
+svn_error_t *
+svn_wc__db_resolve_break_moved_away(svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *scratch_pool);
/* @} */
Modified: subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_private.h?rev=1445479&r1=1445478&r2=1445479&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_private.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_private.h Wed Feb 13 06:37:54 2013
@@ -410,9 +410,10 @@ svn_wc__db_retract_parent_delete(svn_wc_
apr_pool_t *scratch_pool);
svn_error_t *
-svn_wc__db_op_depth_moved_to(const char **moved_to_relpath,
- const char **moved_to_op_root_relpath,
- const char **op_root_relpath,
+svn_wc__db_op_depth_moved_to(const char **move_dst_relpath,
+ const char **move_dst_op_root_relpath,
+ const char **move_src_root_relpath,
+ const char **move_src_op_root_relpath,
int op_depth,
svn_wc__db_wcroot_t *wcroot,
const char *local_relpath,
@@ -429,4 +430,9 @@ svn_wc__db_bump_moved_away(svn_wc__db_wc
svn_depth_t depth,
apr_pool_t *scratch_pool);
+svn_error_t *
+svn_wc__db_resolve_break_moved_away_internal(svn_wc__db_wcroot_t *wcroot,
+ const char *local_relpath,
+ apr_pool_t *scratch_pool);
+
#endif /* WC_DB_PRIVATE_H */