Attachment #336150 for bug #453020

View | Details | Raw Unified | Return to bug 453020
Collapse All | Expand All




                               svn_boolean_t get_all,
                               svn_boolean_t update,
                               svn_boolean_t no_ignore,
                               const char *anchor_abspath,
                               const char *anchor_relpath,
                               svn_client_status_func_t status_func,
                               void *status_baton,
                               apr_pool_t *scratch_pool)
{
  apr_hash_index_t *hi;
  apr_pool_t *iterpool = svn_pool_create(scratch_pool);

  /* Loop over the hash of new values (we don't care about the old
     ones).  This is a mapping of versioned directories to property
     values. */
  for (hi = apr_hash_first(scratch_pool, external_map);
       hi;
       hi = apr_hash_next(hi))
    {

      const char *defining_abspath = svn__apr_hash_index_val(hi);
      svn_node_kind_t kind;
      svn_opt_revision_t opt_rev;
      const char *status_path;

      svn_pool_clear(iterpool);


                                    svn_wc_notify_status_external,
                                    iterpool), iterpool);

      status_path = local_abspath;
      if (anchor_abspath)
        {
          status_path = svn_dirent_join(anchor_relpath,
                           svn_dirent_skip_ancestor(anchor_abspath,
                                                    status_path),
                           iterpool);
        }

      /* And then do the status. */
      SVN_ERR(svn_client_status5(NULL, ctx, status_path, &opt_rev, depth,
                                 get_all, update, no_ignore, FALSE, FALSE,
                                 NULL, status_func, status_baton,
                                 iterpool));

Lines 1090-1096 Link Here

(-)subversion/libsvn_client/client.h (-2 / +8 lines)
1090		1090
1091	/* Perform status operations on each external in EXTERNAL_MAP, a const char *	1091	/* Perform status operations on each external in EXTERNAL_MAP, a const char *
1092	local_abspath of all externals mapping to the const char* defining_abspath.	1092	local_abspath of all externals mapping to the const char* defining_abspath.
1093	All other options are the same as those passed to svn_client_status(). */	1093	All other options are the same as those passed to svn_client_status().
		1094
		1095	If ANCHOR_ABSPATH and ANCHOR-RELPATH are not null, use them to provide
		1096	properly formatted relative paths
		1097	*/
1094	svn_error_t *	1098	svn_error_t *
1095	svn_client__do_external_status(svn_client_ctx_t *ctx,	1099	svn_client__do_external_status(svn_client_ctx_t *ctx,
1096	apr_hash_t *external_map,	1100	apr_hash_t *external_map,
Lines 1098-1106 Link Here
1098	svn_boolean_t get_all,	1102	svn_boolean_t get_all,
1099	svn_boolean_t update,	1103	svn_boolean_t update,
1100	svn_boolean_t no_ignore,	1104	svn_boolean_t no_ignore,
		1105	const char *anchor_abspath,
		1106	const char *anchor_relpath,
1101	svn_client_status_func_t status_func,	1107	svn_client_status_func_t status_func,
1102	void *status_baton,	1108	void *status_baton,
1103	apr_pool_t *pool);	1109	apr_pool_t *scratch_pool);
1104		1110
1105		1111
1106	/* List external items defined on each external in EXTERNALS, a const char *	1112	/* List external items defined on each external in EXTERNALS, a const char *

Lines 530-535 Link Here

(-)subversion/libsvn_client/status.c (+1 lines)
530	SVN_ERR(svn_client__do_external_status(ctx, external_map,	530	SVN_ERR(svn_client__do_external_status(ctx, external_map,
531	depth, get_all,	531	depth, get_all,
532	update, no_ignore,	532	update, no_ignore,
		533	sb.anchor_abspath, sb.anchor_relpath,
533	status_func, status_baton, pool));	534	status_func, status_baton, pool));
534	}	535	}
535		536

Return to bug 453020

Lines 1125-1141 Link Here

(-)subversion/libsvn_client/externals.c (-4 / +16 lines)
1125	svn_boolean_t get_all,	1125	svn_boolean_t get_all,
1126	svn_boolean_t update,	1126	svn_boolean_t update,
1127	svn_boolean_t no_ignore,	1127	svn_boolean_t no_ignore,
		1128	const char *anchor_abspath,
		1129	const char *anchor_relpath,
1128	svn_client_status_func_t status_func,	1130	svn_client_status_func_t status_func,
1129	void *status_baton,	1131	void *status_baton,
1130	apr_pool_t *pool)	1132	apr_pool_t *scratch_pool)
1131	{	1133	{
1132	apr_hash_index_t *hi;	1134	apr_hash_index_t *hi;
1133	apr_pool_t *iterpool = svn_pool_create(pool);	1135	apr_pool_t *iterpool = svn_pool_create(scratch_pool);
1134		1136
1135	/* Loop over the hash of new values (we don't care about the old	1137	/* Loop over the hash of new values (we don't care about the old
1136	ones). This is a mapping of versioned directories to property	1138	ones). This is a mapping of versioned directories to property
1137	values. */	1139	values. */
1138	for (hi = apr_hash_first(pool, external_map);	1140	for (hi = apr_hash_first(scratch_pool, external_map);
1139	hi;	1141	hi;
1140	hi = apr_hash_next(hi))	1142	hi = apr_hash_next(hi))
1141	{	1143	{
Lines 1144-1149 Link Here
1144	const char *defining_abspath = svn__apr_hash_index_val(hi);	1146	const char *defining_abspath = svn__apr_hash_index_val(hi);
1145	svn_node_kind_t kind;	1147	svn_node_kind_t kind;
1146	svn_opt_revision_t opt_rev;	1148	svn_opt_revision_t opt_rev;
		1149	const char *status_path;
1147		1150
1148	svn_pool_clear(iterpool);	1151	svn_pool_clear(iterpool);
1149		1152
Lines 1174-1181 Link Here
1174	svn_wc_notify_status_external,	1177	svn_wc_notify_status_external,
1175	iterpool), iterpool);	1178	iterpool), iterpool);
1176		1179
		1180	status_path = local_abspath;
		1181	if (anchor_abspath)
		1182	{
		1183	status_path = svn_dirent_join(anchor_relpath,
		1184	svn_dirent_skip_ancestor(anchor_abspath,
		1185	status_path),
		1186	iterpool);
		1187	}
		1188
1177	/* And then do the status. */	1189	/* And then do the status. */
1178	SVN_ERR(svn_client_status5(NULL, ctx, local_abspath, &opt_rev, depth,	1190	SVN_ERR(svn_client_status5(NULL, ctx, status_path, &opt_rev, depth,
1179	get_all, update, no_ignore, FALSE, FALSE,	1191	get_all, update, no_ignore, FALSE, FALSE,
1180	NULL, status_func, status_baton,	1192	NULL, status_func, status_baton,
1181	iterpool));	1193	iterpool));