Lines Matching refs:details
667 /* Remember details of this move. */
905 /* Remember details of this move. */
1167 /* ### show more details about copies or replacements? */
1392 /* ### show more details about copies or replacements? */
1707 * Return results in *MOVES_TABLE (see struct find_moves_baton for details). */
2805 struct conflict_tree_local_missing_details *details;
3011 details = apr_pcalloc(conflict->pool, sizeof(*details));
3012 details->deleted_rev = deleted_rev;
3013 details->deleted_rev_author = deleted_rev_author;
3015 details->deleted_repos_relpath = svn_relpath_join(parent_repos_relpath,
3018 details->moves = moves;
3019 if (details->moves != NULL)
3024 details->wc_move_targets = apr_hash_make(conflict->pool);
3026 for (i = 0; i < details->moves->nelts; i++)
3031 move = APR_ARRAY_IDX(details->moves, i, struct repos_move_info *);
3032 SVN_ERR(follow_move_chains(details->wc_move_targets, move, ctx,
3041 if (apr_hash_count(details->wc_move_targets) > 0)
3049 details->wc_move_targets,
3054 details->move_target_repos_relpath = item->key;
3055 details->wc_move_target_idx = 0;
3059 details->move_target_repos_relpath = NULL;
3060 details->wc_move_target_idx = 0;
3064 details->sibling_moves = sibling_moves;
3065 details->wc_siblings = wc_siblings;
3066 if (details->wc_move_targets && apr_hash_count(details->wc_move_targets) == 1)
3070 wc_abspaths = svn_hash_gets(details->wc_move_targets,
3071 details->move_target_repos_relpath);
3084 else if (details->wc_siblings && details->wc_siblings->nelts == 1)
3096 conflict->tree_conflict_local_details = details;
3238 struct conflict_tree_local_missing_details *details;
3240 details = conflict->tree_conflict_local_details;
3241 if (details == NULL)
3246 if (details->moves || details->sibling_moves)
3253 if (details->moves)
3255 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
3281 if (details->sibling_moves)
3283 move = APR_ARRAY_IDX(details->sibling_moves, 0,
3321 details->deleted_repos_relpath,
3322 details->deleted_rev, details->deleted_rev_author);
3674 struct conflict_tree_incoming_delete_details *details,
3679 if (details->move_target_repos_relpath)
3680 return details->move_target_repos_relpath;
3682 if (details->wc_move_targets && apr_hash_count(details->wc_move_targets) > 0)
3687 repos_relpaths = svn_sort__hash(details->wc_move_targets,
3694 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
3700 struct conflict_tree_incoming_delete_details *details,
3707 if (details->replacing_node_kind == svn_node_file ||
3708 details->replacing_node_kind == svn_node_symlink)
3717 details->rev_author, details->deleted_rev);
3718 if (details->moves)
3722 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
3727 get_moved_to_repos_relpath(details, scratch_pool));
3744 details->rev_author, details->deleted_rev);
3745 if (details->moves)
3749 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
3754 get_moved_to_repos_relpath(details, scratch_pool));
3768 details->rev_author, details->deleted_rev);
3769 if (details->moves)
3773 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
3778 get_moved_to_repos_relpath(details, scratch_pool));
3787 else if (details->replacing_node_kind == svn_node_dir)
3797 details->rev_author, details->deleted_rev);
3798 if (details->moves)
3802 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
3807 get_moved_to_repos_relpath(details, scratch_pool));
3823 details->rev_author, details->deleted_rev);
3824 if (details->moves)
3828 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
3833 get_moved_to_repos_relpath(details, scratch_pool));
3847 details->rev_author, details->deleted_rev);
3848 if (details->moves)
3852 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
3857 get_moved_to_repos_relpath(details, scratch_pool));
3870 if (details->moves)
3875 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
3881 get_moved_to_repos_relpath(details, scratch_pool),
3882 details->rev_author, details->deleted_rev);
3893 details->rev_author, details->deleted_rev);
3898 if (details->moves)
3903 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
3908 get_moved_to_repos_relpath(details, scratch_pool),
3909 details->rev_author, details->deleted_rev);
3919 details->rev_author, details->deleted_rev);
3923 if (details->moves)
3928 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
3933 get_moved_to_repos_relpath(details, scratch_pool),
3934 details->rev_author, details->deleted_rev);
3944 details->rev_author, details->deleted_rev);
3951 struct conflict_tree_incoming_delete_details *details,
3957 if (details->replacing_node_kind == svn_node_file ||
3958 details->replacing_node_kind == svn_node_symlink)
3965 details->rev_author, details->added_rev);
3973 details->rev_author, details->added_rev);
3979 details->rev_author, details->added_rev);
3981 else if (details->replacing_node_kind == svn_node_dir)
3989 details->rev_author, details->added_rev);
3996 details->rev_author, details->added_rev);
4002 details->rev_author, details->added_rev);
4011 details->rev_author, details->added_rev);
4018 details->rev_author, details->added_rev);
4024 details->rev_author, details->added_rev);
4030 struct conflict_tree_incoming_delete_details *details,
4039 if (details->replacing_node_kind == svn_node_file ||
4040 details->replacing_node_kind == svn_node_symlink)
4051 details->rev_author, details->deleted_rev);
4052 if (details->moves)
4056 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4061 get_moved_to_repos_relpath(details, scratch_pool));
4080 details->rev_author, details->deleted_rev);
4081 if (details->moves)
4085 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4090 get_moved_to_repos_relpath(details, scratch_pool));
4107 details->rev_author, details->deleted_rev);
4108 if (details->moves)
4112 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4117 get_moved_to_repos_relpath(details, scratch_pool));
4126 else if (details->replacing_node_kind == svn_node_dir)
4138 details->rev_author, details->deleted_rev);
4139 if (details->moves)
4143 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4148 get_moved_to_repos_relpath(details, scratch_pool));
4166 details->rev_author, details->deleted_rev);
4167 if (details->moves)
4171 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4176 get_moved_to_repos_relpath(details, scratch_pool));
4193 details->rev_author, details->deleted_rev);
4194 if (details->moves)
4198 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4203 get_moved_to_repos_relpath(details, scratch_pool));
4216 if (details->moves)
4221 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4229 get_moved_to_repos_relpath(details, scratch_pool),
4230 details->rev_author, details->deleted_rev);
4243 details->rev_author, details->deleted_rev);
4248 if (details->moves)
4253 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4261 get_moved_to_repos_relpath(details, scratch_pool),
4262 details->rev_author, details->deleted_rev);
4275 details->rev_author, details->deleted_rev);
4279 if (details->moves)
4284 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4292 get_moved_to_repos_relpath(details, scratch_pool),
4293 details->rev_author, details->deleted_rev);
4306 details->rev_author, details->deleted_rev);
4313 struct conflict_tree_incoming_delete_details *details,
4321 if (details->replacing_node_kind == svn_node_file ||
4322 details->replacing_node_kind == svn_node_symlink)
4332 details->rev_author, details->added_rev);
4342 details->rev_author, details->added_rev);
4350 details->rev_author, details->added_rev);
4352 else if (details->replacing_node_kind == svn_node_dir)
4362 details->rev_author, details->added_rev);
4372 details->rev_author, details->added_rev);
4380 details->rev_author, details->added_rev);
4392 details->rev_author, details->added_rev);
4402 details->rev_author, details->added_rev);
4411 details->rev_author, details->added_rev);
4417 struct conflict_tree_incoming_delete_details *details,
4426 if (details->replacing_node_kind == svn_node_file ||
4427 details->replacing_node_kind == svn_node_symlink)
4438 details->rev_author, details->deleted_rev);
4439 if (details->moves)
4443 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4448 get_moved_to_repos_relpath(details, scratch_pool));
4467 details->rev_author, details->deleted_rev);
4468 if (details->moves)
4472 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4477 get_moved_to_repos_relpath(details, scratch_pool));
4492 details->rev_author, details->deleted_rev);
4494 else if (details->replacing_node_kind == svn_node_dir)
4506 details->rev_author, details->deleted_rev);
4507 if (details->moves)
4511 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4516 get_moved_to_repos_relpath(details, scratch_pool));
4534 details->rev_author, details->deleted_rev);
4535 if (details->moves)
4539 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4544 get_moved_to_repos_relpath(details, scratch_pool));
4561 details->rev_author, details->deleted_rev);
4562 if (details->moves)
4566 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4571 get_moved_to_repos_relpath(details, scratch_pool));
4584 if (details->moves)
4589 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4597 get_moved_to_repos_relpath(details, scratch_pool),
4598 details->rev_author, details->deleted_rev);
4611 details->rev_author, details->deleted_rev);
4616 if (details->moves)
4621 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4629 get_moved_to_repos_relpath(details, scratch_pool),
4630 details->rev_author, details->deleted_rev);
4643 details->rev_author, details->deleted_rev);
4647 if (details->moves)
4652 move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
4660 get_moved_to_repos_relpath(details, scratch_pool),
4661 details->rev_author, details->deleted_rev);
4674 details->rev_author, details->deleted_rev);
4681 struct conflict_tree_incoming_delete_details *details,
4689 if (details->replacing_node_kind == svn_node_file ||
4690 details->replacing_node_kind == svn_node_symlink)
4699 details->rev_author, details->added_rev);
4709 details->rev_author, details->added_rev);
4717 details->rev_author, details->added_rev);
4719 else if (details->replacing_node_kind == svn_node_dir)
4729 details->rev_author, details->added_rev);
4738 details->rev_author, details->added_rev);
4746 details->rev_author, details->added_rev);
4757 details->rev_author, details->added_rev);
4767 details->rev_author, details->added_rev);
4776 details->rev_author, details->added_rev);
4796 struct conflict_tree_incoming_delete_details *details;
4812 details = conflict->tree_conflict_incoming_details;
4816 if (details->deleted_rev != SVN_INVALID_REVNUM)
4818 action = describe_incoming_deletion_upon_update(details,
4825 else /* details->added_rev != SVN_INVALID_REVNUM */
4829 details, victim_node_kind, old_rev, new_rev, result_pool);
4834 if (details->deleted_rev != SVN_INVALID_REVNUM)
4836 action = describe_incoming_deletion_upon_switch(details,
4845 else /* details->added_rev != SVN_INVALID_REVNUM */
4849 details, victim_node_kind, old_repos_relpath, old_rev,
4856 if (details->deleted_rev != SVN_INVALID_REVNUM)
4858 action = describe_incoming_deletion_upon_merge(details,
4867 else /* details->added_rev != SVN_INVALID_REVNUM */
4871 details, victim_node_kind, old_repos_relpath, old_rev,
4930 /* Find conflict details in the case where a revision which added a node was
4934 struct conflict_tree_incoming_delete_details **details,
4961 *details = apr_pcalloc(result_pool, sizeof(**details));
4978 (*details)->deleted_rev = SVN_INVALID_REVNUM;
4979 (*details)->added_rev = b.added_rev;
4980 (*details)->repos_relpath = apr_pstrdup(result_pool, b.repos_relpath);
4982 (*details)->rev_author = apr_pstrdup(result_pool, author_revprop->data);
4984 (*details)->rev_author = _("unknown author");
4987 (*details)->replacing_node_kind = svn_node_none;
4988 if ((*details)->added_rev > 0)
4993 rev_below((*details)->added_rev),
4996 SVN_ERR(svn_ra_check_path(ra_session, "", (*details)->added_rev,
4997 &(*details)->replacing_node_kind,
5005 init_wc_move_targets(struct conflict_tree_incoming_delete_details *details,
5023 details->wc_move_targets = apr_hash_make(conflict->pool);
5024 for (i = 0; i < details->moves->nelts; i++)
5028 move = APR_ARRAY_IDX(details->moves, i, struct repos_move_info *);
5029 SVN_ERR(follow_move_chains(details->wc_move_targets, move,
5039 details->move_target_repos_relpath =
5040 get_moved_to_repos_relpath(details, scratch_pool);
5041 details->wc_move_target_idx = 0;
5044 if (apr_hash_count(details->wc_move_targets) == 1)
5048 wc_abspaths = svn_hash_gets(details->wc_move_targets,
5049 details->move_target_repos_relpath);
5096 struct conflict_tree_incoming_delete_details *details;
5164 * deleted. We cannot provide the required details so the best
5169 details = apr_pcalloc(conflict->pool, sizeof(*details));
5170 details->deleted_rev = deleted_rev;
5171 details->added_rev = SVN_INVALID_REVNUM;
5172 details->repos_relpath = apr_pstrdup(conflict->pool,
5174 details->rev_author = deleted_rev_author;
5175 details->replacing_node_kind = replacing_node_kind;
5176 details->moves = moves;
5183 &details, repos_root_url, old_repos_relpath,
5214 * deleted. We cannot provide the required details so the best
5219 details = apr_pcalloc(conflict->pool, sizeof(*details));
5220 details->deleted_rev = deleted_rev;
5221 details->added_rev = SVN_INVALID_REVNUM;
5222 details->repos_relpath = apr_pstrdup(conflict->pool,
5224 details->rev_author = apr_pstrdup(conflict->pool,
5226 details->replacing_node_kind = replacing_node_kind;
5227 details->moves = moves;
5235 &details, repos_root_url, old_repos_relpath,
5243 details = NULL;
5246 conflict->tree_conflict_incoming_details = details;
5248 if (details && details->moves)
5249 SVN_ERR(init_wc_move_targets(details, conflict, ctx, scratch_pool));
5262 * See comment in conflict_tree_get_details_incoming_add() for details. */
5291 struct conflict_tree_incoming_add_details *details = NULL;
5335 details = apr_pcalloc(conflict->pool, sizeof(*details));
5352 details->repos_relpath = apr_pstrdup(conflict->pool, b.repos_relpath);
5353 details->added_rev = b.added_rev;
5355 details->added_rev_author = apr_pstrdup(conflict->pool,
5358 details->added_rev_author = _("unknown author");
5359 details->deleted_rev = SVN_INVALID_REVNUM;
5360 details->deleted_rev_author = NULL;
5375 details->deleted_rev = deleted_rev;
5377 details->deleted_rev_author = apr_pstrdup(conflict->pool,
5380 details->deleted_rev_author = _("unknown author");
5409 details = apr_pcalloc(conflict->pool, sizeof(*details));
5426 details->repos_relpath = apr_pstrdup(conflict->pool, b.repos_relpath);
5427 details->added_rev = b.added_rev;
5429 details->added_rev_author = apr_pstrdup(conflict->pool,
5432 details->added_rev_author = _("unknown author");
5433 details->deleted_rev = SVN_INVALID_REVNUM;
5434 details->deleted_rev_author = NULL;
5459 * deleted. We cannot provide the required details so the best
5464 details = apr_pcalloc(conflict->pool, sizeof(*details));
5465 details->repos_relpath = apr_pstrdup(conflict->pool,
5467 details->deleted_rev = deleted_rev;
5468 details->deleted_rev_author = apr_pstrdup(conflict->pool,
5471 details->added_rev = SVN_INVALID_REVNUM;
5472 details->added_rev_author = NULL;
5473 details->moves = moves;
5477 conflict->tree_conflict_incoming_details = details;
5484 struct conflict_tree_incoming_add_details *details,
5491 if (SVN_IS_VALID_REVNUM(details->added_rev) &&
5492 SVN_IS_VALID_REVNUM(details->deleted_rev))
5497 details->added_rev_author, details->added_rev,
5498 details->deleted_rev_author, details->deleted_rev);
5499 else if (SVN_IS_VALID_REVNUM(details->added_rev))
5503 details->added_rev_author, details->added_rev);
5508 details->deleted_rev_author, details->deleted_rev);
5513 if (SVN_IS_VALID_REVNUM(details->added_rev) &&
5514 SVN_IS_VALID_REVNUM(details->deleted_rev))
5519 details->added_rev_author, details->added_rev,
5520 details->deleted_rev_author, details->deleted_rev);
5521 else if (SVN_IS_VALID_REVNUM(details->added_rev))
5525 details->added_rev_author, details->added_rev);
5530 details->deleted_rev_author, details->deleted_rev);
5534 if (SVN_IS_VALID_REVNUM(details->added_rev) &&
5535 SVN_IS_VALID_REVNUM(details->deleted_rev))
5540 details->added_rev_author, details->added_rev,
5541 details->deleted_rev_author, details->deleted_rev);
5542 else if (SVN_IS_VALID_REVNUM(details->added_rev))
5546 details->added_rev_author, details->added_rev);
5551 details->deleted_rev_author, details->deleted_rev);
5557 struct conflict_tree_incoming_add_details *details,
5565 if (SVN_IS_VALID_REVNUM(details->added_rev) &&
5566 SVN_IS_VALID_REVNUM(details->deleted_rev))
5572 details->added_rev_author, details->added_rev,
5573 details->deleted_rev_author, details->deleted_rev);
5574 else if (SVN_IS_VALID_REVNUM(details->added_rev))
5579 details->added_rev_author, details->added_rev);
5585 details->deleted_rev_author, details->deleted_rev);
5590 if (SVN_IS_VALID_REVNUM(details->added_rev) &&
5591 SVN_IS_VALID_REVNUM(details->deleted_rev))
5597 details->added_rev_author, details->added_rev,
5598 details->deleted_rev_author, details->deleted_rev);
5599 else if (SVN_IS_VALID_REVNUM(details->added_rev))
5605 details->added_rev_author, details->added_rev);
5612 details->deleted_rev_author, details->deleted_rev);
5616 if (SVN_IS_VALID_REVNUM(details->added_rev) &&
5617 SVN_IS_VALID_REVNUM(details->deleted_rev))
5623 details->added_rev_author, details->added_rev,
5624 details->deleted_rev_author, details->deleted_rev);
5625 else if (SVN_IS_VALID_REVNUM(details->added_rev))
5631 details->added_rev_author, details->added_rev);
5638 details->deleted_rev_author, details->deleted_rev);
5644 struct conflict_tree_incoming_add_details *details,
5658 details->added_rev_author, details->added_rev);
5664 details->added_rev_author, details->added_rev);
5674 details->added_rev_author, details->added_rev);
5680 details->added_rev_author, details->added_rev);
5689 details->added_rev_author, details->added_rev);
5695 details->added_rev_author, details->added_rev);
5701 struct conflict_tree_incoming_add_details *details,
5715 details->deleted_rev_author,
5716 details->deleted_rev);
5723 details->deleted_rev_author,
5724 details->deleted_rev);
5734 details->deleted_rev_author,
5735 details->deleted_rev);
5741 details->deleted_rev_author,
5742 details->deleted_rev);
5751 details->deleted_rev_author,
5752 details->deleted_rev);
5758 details->deleted_rev_author,
5759 details->deleted_rev);
5781 struct conflict_tree_incoming_add_details *details;
5798 details = conflict->tree_conflict_incoming_details;
5802 action = describe_incoming_add_upon_update(details,
5809 action = describe_incoming_add_upon_switch(details,
5818 action = describe_incoming_add_upon_merge(details,
5826 details, new_node_kind, old_repos_relpath,
5878 struct conflict_tree_incoming_edit_details *details = NULL;
5899 details = apr_pcalloc(b->result_pool, sizeof(*details));
5900 details->rev = log_entry->revision;
5903 details->author = apr_pstrdup(b->result_pool, author->data);
5905 details->author = _("unknown author");
5907 details->text_modified = svn_tristate_unknown;
5908 details->props_modified = svn_tristate_unknown;
5909 details->children_modified = svn_tristate_unknown;
5932 details->text_modified = log_item->text_modified;
5933 details->props_modified = log_item->props_modified;
5934 details->repos_relpath = apr_pstrdup(b->result_pool, path);
5945 details->children_modified = svn_tristate_true;
5949 details->children_modified == svn_tristate_unknown)
5950 details->children_modified = svn_tristate_false;
5953 details;
6164 struct conflict_tree_incoming_edit_details *details;
6166 details = APR_ARRAY_IDX(edits, i,
6175 details->rev, details->author,
6192 details->rev, details->author,
6198 details->rev, details->author,
7834 struct conflict_tree_incoming_add_details *details;
7844 details = conflict->tree_conflict_incoming_details;
7845 if (details == NULL)
7848 "details for tree conflict at '%s' to be "
7859 details->repos_relpath,
7869 if (details->added_rev == SVN_INVALID_REVNUM)
7875 rev1 = rev_below(details->added_rev);
7884 if (details->deleted_rev == SVN_INVALID_REVNUM)
7890 rev1 = details->deleted_rev;
8181 struct conflict_tree_incoming_delete_details *details,
8211 else if (details->deleted_rev != SVN_INVALID_REVNUM &&
8212 copyfrom_rev >= details->deleted_rev)
8222 details->deleted_rev, copyfrom_rev);
8223 else if (details->added_rev != SVN_INVALID_REVNUM &&
8224 copyfrom_rev < details->added_rev)
8234 details->added_rev, copyfrom_rev);
8242 if (strcmp(copyfrom_repos_relpath, details->repos_relpath) != 0 &&
8253 details->repos_relpath,
8311 struct conflict_tree_incoming_delete_details *details;
8313 details = conflict->tree_conflict_incoming_details;
8314 if (details == NULL)
8317 "details for tree conflict at '%s' to be "
8323 if (details->deleted_rev == SVN_INVALID_REVNUM &&
8324 details->added_rev == SVN_INVALID_REVNUM)
8336 details, operation, wcroot_abspath, conflict, ctx,
8510 struct conflict_tree_incoming_delete_details *details;
8518 details = conflict->tree_conflict_incoming_details;
8519 if (details == NULL || details->moves == NULL)
8522 "requires details for tree conflict at '%s' "
8576 svn_hash_gets(details->wc_move_targets,
8577 get_moved_to_repos_relpath(details, scratch_pool));
8579 details->wc_move_target_idx,
8854 "requires details for tree conflict at '%s' "
9052 "requires details for tree conflict at '%s' "
9200 "requires details for tree conflict at '%s' "
9346 struct conflict_tree_incoming_delete_details *details;
9357 details = conflict->tree_conflict_incoming_details;
9358 if (details == NULL || details->moves == NULL)
9361 "requires details for tree conflict at '%s' "
9396 svn_hash_gets(details->wc_move_targets,
9397 get_moved_to_repos_relpath(details, scratch_pool));
9399 details->wc_move_target_idx,
9481 get_moved_to_repos_relpath(details,
9585 struct conflict_tree_local_missing_details *details;
9593 details = conflict->tree_conflict_local_details;
9607 if (details->wc_siblings)
9609 merge_target_abspath = APR_ARRAY_IDX(details->wc_siblings,
9610 details->preferred_sibling_idx,
9613 else if (details->wc_move_targets && details->move_target_repos_relpath)
9616 moves = svn_hash_gets(details->wc_move_targets,
9617 details->move_target_repos_relpath);
9618 merge_target_abspath = APR_ARRAY_IDX(moves, details->wc_move_target_idx,
9752 struct conflict_tree_local_missing_details *details;
9760 details = conflict->tree_conflict_local_details;
9774 if (details->wc_move_targets)
9778 moves = svn_hash_gets(details->wc_move_targets,
9779 details->move_target_repos_relpath);
9781 APR_ARRAY_IDX(moves, details->wc_move_target_idx, const char *);
9784 merge_target_abspath = APR_ARRAY_IDX(details->wc_siblings,
9785 details->preferred_sibling_idx,
10595 /* If the local item was deleted and conflict details were fetched
10720 struct conflict_tree_incoming_delete_details *details;
10722 details = conflict->tree_conflict_incoming_details;
10723 if (details->wc_move_targets)
10727 moves = svn_hash_gets(details->wc_move_targets,
10728 details->move_target_repos_relpath);
10730 APR_ARRAY_IDX(moves, details->wc_move_target_idx,
10816 struct conflict_tree_incoming_delete_details *details;
10821 details = conflict->tree_conflict_incoming_details;
10822 if (details == NULL || details->moves == NULL)
10825 if (apr_hash_count(details->wc_move_targets) == 0)
10829 svn_hash_gets(details->wc_move_targets,
10830 get_moved_to_repos_relpath(details, scratch_pool));
10832 details->wc_move_target_idx,
10885 struct conflict_tree_incoming_delete_details *details;
10890 details = conflict->tree_conflict_incoming_details;
10891 if (details == NULL || details->moves == NULL)
10894 if (apr_hash_count(details->wc_move_targets) == 0)
10898 svn_hash_gets(details->wc_move_targets,
10899 get_moved_to_repos_relpath(details, scratch_pool));
10901 details->wc_move_target_idx,
10952 struct conflict_tree_local_missing_details *details;
10959 details = conflict->tree_conflict_local_details;
10960 if (details != NULL && details->moves != NULL &&
10961 details->move_target_repos_relpath != NULL)
10967 moves = svn_hash_gets(details->wc_move_targets,
10968 details->move_target_repos_relpath);
10970 APR_ARRAY_IDX(moves, details->wc_move_target_idx, const char *);
11038 struct conflict_tree_local_missing_details *details;
11045 details = conflict->tree_conflict_local_details;
11046 if (details != NULL && details->wc_siblings != NULL)
11053 APR_ARRAY_IDX(details->wc_siblings,
11054 details->preferred_sibling_idx,
11152 "requires details for tree conflict at '%s' "
11362 "requires details for tree conflict at '%s' "
11530 struct conflict_tree_update_local_moved_away_details *details;
11538 details = apr_pcalloc(conflict->pool, sizeof(*details));
11540 details->wc_move_targets = apr_array_make(conflict->pool, 1,
11544 SVN_ERR(svn_wc__find_copies_of_repos_path(&details->wc_move_targets,
11552 conflict->tree_conflict_local_details = details;
11784 if (description == NULL) /* details not fetched yet */
11982 struct conflict_tree_local_missing_details *details;
11984 details = conflict->tree_conflict_local_details;
11985 if (details == NULL ||
11986 (details->wc_move_targets == NULL && details->wc_siblings == NULL))
11989 "requires details for tree conflict at '%s' "
11994 if (details->wc_move_targets)
11996 details->wc_move_targets,
12003 struct conflict_tree_incoming_delete_details *details;
12005 details = conflict->tree_conflict_incoming_details;
12006 if (details == NULL || details->wc_move_targets == NULL)
12009 "requires details for tree conflict at '%s' "
12015 details->wc_move_targets,
12124 struct conflict_tree_local_missing_details *details;
12126 details = conflict->tree_conflict_local_details;
12127 if (details == NULL || details->wc_move_targets == NULL)
12129 _("Setting a move target requires details "
12135 SVN_ERR(set_wc_move_target(&details->move_target_repos_relpath,
12136 details->wc_move_targets,
12139 details->wc_move_target_idx = 0;
12148 struct conflict_tree_incoming_delete_details *details;
12152 details = conflict->tree_conflict_incoming_details;
12153 if (details == NULL || details->wc_move_targets == NULL)
12155 _("Setting a move target requires details "
12161 SVN_ERR(set_wc_move_target(&details->move_target_repos_relpath,
12162 details->wc_move_targets,
12165 details->wc_move_target_idx = 0;
12169 svn_hash_gets(details->wc_move_targets,
12170 get_moved_to_repos_relpath(details, scratch_pool));
12172 details->wc_move_target_idx,
12242 struct conflict_tree_local_missing_details *details;
12244 details = conflict->tree_conflict_local_details;
12245 if (details == NULL ||
12246 (details->wc_move_targets == NULL && details->wc_siblings == NULL))
12249 "requires details for tree conflict at '%s' "
12256 if (details->wc_move_targets)
12260 svn_hash_gets(details->wc_move_targets,
12261 details->move_target_repos_relpath);
12275 if (details->wc_siblings)
12277 for (i = 0; i < details->wc_siblings->nelts; i++)
12281 sibling_abspath = APR_ARRAY_IDX(details->wc_siblings, i,
12293 struct conflict_tree_update_local_moved_away_details *details;
12295 details = conflict->tree_conflict_local_details;
12296 if (details == NULL || details->wc_move_targets == NULL)
12299 "requires details for tree conflict at '%s' "
12306 apr_array_make(result_pool, details->wc_move_targets->nelts,
12308 for (i = 0; i < details->wc_move_targets->nelts; i++)
12312 moved_to_abspath = APR_ARRAY_IDX(details->wc_move_targets, i,
12320 struct conflict_tree_incoming_delete_details *details;
12323 details = conflict->tree_conflict_incoming_details;
12324 if (details == NULL || details->wc_move_targets == NULL)
12327 "requires details for tree conflict at '%s' "
12333 svn_hash_gets(details->wc_move_targets,
12334 get_moved_to_repos_relpath(details, scratch_pool));
12406 struct conflict_tree_local_missing_details *details;
12416 details = conflict->tree_conflict_local_details;
12417 if (details == NULL || (details->wc_siblings == NULL &&
12418 details->wc_move_targets == NULL))
12420 _("Setting a move target requires details "
12426 if (details->wc_siblings)
12429 preferred_move_target_idx > details->wc_siblings->nelts)
12437 details->preferred_sibling_idx = preferred_move_target_idx;
12440 preferred_sibling = APR_ARRAY_IDX(details->wc_siblings,
12441 details->preferred_sibling_idx,
12450 else if (details->wc_move_targets)
12454 svn_hash_gets(details->wc_move_targets,
12455 details->move_target_repos_relpath);
12467 details->wc_move_target_idx = preferred_move_target_idx;
12480 struct conflict_tree_update_local_moved_away_details *details;
12482 details = conflict->tree_conflict_local_details;
12483 if (details == NULL || details->wc_move_targets == NULL)
12485 _("Setting a move target requires details "
12492 preferred_move_target_idx > details->wc_move_targets->nelts)
12501 details->preferred_move_target_idx = preferred_move_target_idx;
12525 struct conflict_tree_incoming_delete_details *details;
12529 details = conflict->tree_conflict_incoming_details;
12530 if (details == NULL || details->wc_move_targets == NULL)
12532 _("Setting a move target requires details "
12539 svn_hash_gets(details->wc_move_targets,
12540 get_moved_to_repos_relpath(details, scratch_pool));
12552 details->wc_move_target_idx = preferred_move_target_idx;
12556 details->wc_move_target_idx,
12684 /* Collecting conflict details may fail due to insufficient access rights.
13210 /* Set type-specific description and details functions. */