/* Acquire a lock (of sorts) on the repository associated with the
* given RA SESSION. This lock is just a revprop change attempt in a
* time-delay loop. This function is duplicated by svnsync in
* svnsync/svnsync.c
*
* ### TODO: Make this function more generic and
* expose it through a header for use by other Subversion
* applications to avoid duplication.
*/
static svn_error_t *
get_lock(const svn_string_t **lock_string_p,
svn_ra_session_t *session,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool)
{
svn_boolean_t be_atomic;
SVN_ERR(svn_ra_has_capability(session, &be_atomic,
SVN_RA_CAPABILITY_ATOMIC_REVPROPS,
pool));
if (! be_atomic)
{
/* Pre-1.7 servers can't lock without a race condition. (Issue #3546) */
svn_error_t *err =
svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Target server does not support atomic revision "
"property edits; consider upgrading it to 1.7."));
svn_handle_warning2(stderr, err, "svnrdump: ");
svn_error_clear(err);
}
return svn_ra__get_operational_lock(lock_string_p, NULL, session,
SVNRDUMP_PROP_LOCK, FALSE,
10 /* retries */, lock_retry_func, NULL,
cancel_func, cancel_baton, pool);
}
void
svn_cl__check_boolean_prop_val(const char *propname, const char *propval,
apr_pool_t *pool)
{
svn_stringbuf_t *propbuf;
if (!svn_prop_is_boolean(propname))
return;
propbuf = svn_stringbuf_create(propval, pool);
svn_stringbuf_strip_whitespace(propbuf);
if (propbuf->data[0] == '\0'
|| svn_cstring_casecmp(propbuf->data, "0") == 0
|| svn_cstring_casecmp(propbuf->data, "no") == 0
|| svn_cstring_casecmp(propbuf->data, "off") == 0
|| svn_cstring_casecmp(propbuf->data, "false") == 0)
{
svn_error_t *err = svn_error_createf
(SVN_ERR_BAD_PROPERTY_VALUE, NULL,
_("To turn off the %s property, use 'svn propdel';\n"
"setting the property to '%s' will not turn it off."),
propname, propval);
svn_handle_warning2(stderr, err, "svn: ");
svn_error_clear(err);
}
}
svn_error_t *
svn_cl__try(svn_error_t *err,
apr_array_header_t *errors_seen,
svn_boolean_t quiet,
...)
{
if (err)
{
apr_status_t apr_err;
va_list ap;
va_start(ap, quiet);
while ((apr_err = va_arg(ap, apr_status_t)) != APR_SUCCESS)
{
if (errors_seen)
{
int i;
svn_boolean_t add = TRUE;
/* Don't report duplicate error codes. */
for (i = 0; i < errors_seen->nelts; i++)
{
if (APR_ARRAY_IDX(errors_seen, i,
apr_status_t) == err->apr_err)
{
add = FALSE;
break;
}
}
if (add)
APR_ARRAY_PUSH(errors_seen, apr_status_t) = err->apr_err;
}
if (err->apr_err == apr_err)
{
if (! quiet)
svn_handle_warning2(stderr, err, "svn: ");
svn_error_clear(err);
return SVN_NO_ERROR;
}
}
va_end(ap);
}
return svn_error_trace(err);
}
void
svn_handle_warning(FILE *stream, svn_error_t *err)
{
svn_handle_warning2(stream, err, "svn: ");
}
/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
svn_cl__resolve(apr_getopt_t *os,
void *baton,
apr_pool_t *scratch_pool)
{
svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
svn_wc_conflict_choice_t conflict_choice;
svn_error_t *err;
apr_array_header_t *targets;
int i;
apr_pool_t *iterpool;
switch (opt_state->accept_which)
{
case svn_cl__accept_working:
conflict_choice = svn_wc_conflict_choose_merged;
break;
case svn_cl__accept_base:
conflict_choice = svn_wc_conflict_choose_base;
break;
case svn_cl__accept_theirs_conflict:
conflict_choice = svn_wc_conflict_choose_theirs_conflict;
break;
case svn_cl__accept_mine_conflict:
conflict_choice = svn_wc_conflict_choose_mine_conflict;
break;
case svn_cl__accept_theirs_full:
conflict_choice = svn_wc_conflict_choose_theirs_full;
break;
case svn_cl__accept_mine_full:
conflict_choice = svn_wc_conflict_choose_mine_full;
break;
case svn_cl__accept_unspecified:
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("missing --accept option"));
default:
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("invalid 'accept' ARG"));
}
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
opt_state->targets,
ctx, FALSE,
scratch_pool));
if (! targets->nelts)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
if (opt_state->depth == svn_depth_unknown)
opt_state->depth = svn_depth_empty;
SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, scratch_pool));
SVN_ERR(svn_cl__check_targets_are_local_paths(targets));
iterpool = svn_pool_create(scratch_pool);
for (i = 0; i < targets->nelts; i++)
{
const char *target = APR_ARRAY_IDX(targets, i, const char *);
svn_pool_clear(iterpool);
SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
err = svn_client_resolve(target,
opt_state->depth, conflict_choice,
ctx,
iterpool);
if (err)
{
svn_handle_warning2(stderr, err, "svn: ");
svn_error_clear(err);
}
}
svn_pool_destroy(iterpool);
return SVN_NO_ERROR;
}
/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
svn_cl__resolve(apr_getopt_t *os,
void *baton,
apr_pool_t *scratch_pool)
{
svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
svn_wc_conflict_choice_t conflict_choice;
svn_error_t *err;
apr_array_header_t *targets;
int i;
apr_pool_t *iterpool;
svn_boolean_t had_error = FALSE;
switch (opt_state->accept_which)
{
case svn_cl__accept_working:
conflict_choice = svn_wc_conflict_choose_merged;
break;
case svn_cl__accept_base:
conflict_choice = svn_wc_conflict_choose_base;
break;
case svn_cl__accept_theirs_conflict:
conflict_choice = svn_wc_conflict_choose_theirs_conflict;
break;
case svn_cl__accept_mine_conflict:
conflict_choice = svn_wc_conflict_choose_mine_conflict;
break;
case svn_cl__accept_theirs_full:
conflict_choice = svn_wc_conflict_choose_theirs_full;
break;
case svn_cl__accept_mine_full:
conflict_choice = svn_wc_conflict_choose_mine_full;
break;
case svn_cl__accept_unspecified:
if (opt_state->non_interactive)
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("missing --accept option"));
conflict_choice = svn_wc_conflict_choose_unspecified;
break;
default:
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("invalid 'accept' ARG"));
}
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
opt_state->targets,
ctx, FALSE,
scratch_pool));
if (! targets->nelts)
svn_opt_push_implicit_dot_target(targets, scratch_pool);
if (opt_state->depth == svn_depth_unknown)
{
if (opt_state->accept_which == svn_cl__accept_unspecified)
opt_state->depth = svn_depth_infinity;
else
opt_state->depth = svn_depth_empty;
}
SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, scratch_pool));
SVN_ERR(svn_cl__check_targets_are_local_paths(targets));
iterpool = svn_pool_create(scratch_pool);
for (i = 0; i < targets->nelts; i++)
{
const char *target = APR_ARRAY_IDX(targets, i, const char *);
svn_pool_clear(iterpool);
SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
err = svn_client_resolve(target,
opt_state->depth, conflict_choice,
ctx,
iterpool);
if (err)
{
svn_handle_warning2(stderr, err, "svn: ");
svn_error_clear(err);
had_error = TRUE;
}
}
svn_pool_destroy(iterpool);
if (had_error)
return svn_error_create(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
_("Failure occurred resolving one or more "
"conflicts"));
return SVN_NO_ERROR;
}
/* This implements `svn_wc_notify_func2_t'.
* NOTE: This function can't fail, so we just ignore any print errors. */
static void
notify(void *baton, const svn_wc_notify_t *n, apr_pool_t *pool)
{
struct notify_baton *nb = baton;
char statchar_buf[5] = " ";
const char *path_local;
svn_error_t *err;
if (n->url)
path_local = n->url;
else
{
if (n->path_prefix)
path_local = svn_cl__local_style_skip_ancestor(n->path_prefix, n->path,
pool);
else /* skip nb->path_prefix, if it's non-null */
path_local = svn_cl__local_style_skip_ancestor(nb->path_prefix, n->path,
pool);
}
switch (n->action)
{
case svn_wc_notify_skip:
nb->skipped_paths++;
if (n->content_state == svn_wc_notify_state_missing)
{
if ((err = svn_cmdline_printf
(pool, _("Skipped missing target: '%s'\n"),
path_local)))
goto print_error;
}
else if (n->content_state == svn_wc_notify_state_source_missing)
{
if ((err = svn_cmdline_printf
(pool, _("Skipped target: '%s' -- copy-source is missing\n"),
path_local)))
goto print_error;
}
else
{
if ((err = svn_cmdline_printf
(pool, _("Skipped '%s'\n"), path_local)))
goto print_error;
}
break;
case svn_wc_notify_update_skip_obstruction:
nb->skipped_paths++;
if ((err = svn_cmdline_printf(
pool, _("Skipped '%s' -- An obstructing working copy was found\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_update_skip_working_only:
nb->skipped_paths++;
if ((err = svn_cmdline_printf(
pool, _("Skipped '%s' -- Has no versioned parent\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_update_skip_access_denied:
nb->skipped_paths++;
if ((err = svn_cmdline_printf(
pool, _("Skipped '%s' -- Access denied\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_skip_conflicted:
nb->skipped_paths++;
if ((err = svn_cmdline_printf(
pool, _("Skipped '%s' -- Node remains in conflict\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_update_delete:
case svn_wc_notify_exclude:
nb->received_some_change = TRUE;
if ((err = svn_cmdline_printf(pool, "D %s\n", path_local)))
goto print_error;
break;
case svn_wc_notify_update_external_removed:
nb->received_some_change = TRUE;
if (n->err && n->err->message)
{
if ((err = svn_cmdline_printf(pool, "Removed external '%s': %s\n",
path_local, n->err->message)))
goto print_error;
}
else
{
if ((err = svn_cmdline_printf(pool, "Removed external '%s'\n",
path_local)))
goto print_error;
}
break;
case svn_wc_notify_update_replace:
nb->received_some_change = TRUE;
if ((err = svn_cmdline_printf(pool, "R %s\n", path_local)))
goto print_error;
break;
case svn_wc_notify_update_add:
nb->received_some_change = TRUE;
if (n->content_state == svn_wc_notify_state_conflicted)
{
nb->text_conflicts++;
if ((err = svn_cmdline_printf(pool, "C %s\n", path_local)))
goto print_error;
}
else
{
if ((err = svn_cmdline_printf(pool, "A %s\n", path_local)))
goto print_error;
}
break;
case svn_wc_notify_exists:
nb->received_some_change = TRUE;
if (n->content_state == svn_wc_notify_state_conflicted)
{
nb->text_conflicts++;
statchar_buf[0] = 'C';
}
else
statchar_buf[0] = 'E';
if (n->prop_state == svn_wc_notify_state_conflicted)
{
nb->prop_conflicts++;
statchar_buf[1] = 'C';
}
else if (n->prop_state == svn_wc_notify_state_merged)
statchar_buf[1] = 'G';
if ((err = svn_cmdline_printf(pool, "%s %s\n", statchar_buf, path_local)))
goto print_error;
break;
case svn_wc_notify_restore:
if ((err = svn_cmdline_printf(pool, _("Restored '%s'\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_revert:
if ((err = svn_cmdline_printf(pool, _("Reverted '%s'\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_failed_revert:
if (( err = svn_cmdline_printf(pool, _("Failed to revert '%s' -- "
"try updating instead.\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_resolved:
if ((err = svn_cmdline_printf(pool,
_("Resolved conflicted state of '%s'\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_add:
/* We *should* only get the MIME_TYPE if PATH is a file. If we
do get it, and the mime-type is not textual, note that this
is a binary addition. */
if (n->mime_type && (svn_mime_type_is_binary(n->mime_type)))
{
if ((err = svn_cmdline_printf(pool, "A (bin) %s\n",
path_local)))
goto print_error;
}
else
{
if ((err = svn_cmdline_printf(pool, "A %s\n",
path_local)))
goto print_error;
}
break;
case svn_wc_notify_delete:
nb->received_some_change = TRUE;
if ((err = svn_cmdline_printf(pool, "D %s\n",
path_local)))
goto print_error;
break;
case svn_wc_notify_patch:
{
nb->received_some_change = TRUE;
if (n->content_state == svn_wc_notify_state_conflicted)
{
nb->text_conflicts++;
statchar_buf[0] = 'C';
}
else if (n->kind == svn_node_file)
{
if (n->content_state == svn_wc_notify_state_merged)
statchar_buf[0] = 'G';
else if (n->content_state == svn_wc_notify_state_changed)
statchar_buf[0] = 'U';
}
if (n->prop_state == svn_wc_notify_state_conflicted)
{
nb->prop_conflicts++;
statchar_buf[1] = 'C';
}
else if (n->prop_state == svn_wc_notify_state_changed)
statchar_buf[1] = 'U';
if (statchar_buf[0] != ' ' || statchar_buf[1] != ' ')
{
if ((err = svn_cmdline_printf(pool, "%s %s\n",
statchar_buf, path_local)))
goto print_error;
}
}
break;
case svn_wc_notify_patch_applied_hunk:
nb->received_some_change = TRUE;
if (n->hunk_original_start != n->hunk_matched_line)
{
apr_uint64_t off;
const char *s;
const char *minus;
if (n->hunk_matched_line > n->hunk_original_start)
{
off = n->hunk_matched_line - n->hunk_original_start;
minus = "";
}
else
{
off = n->hunk_original_start - n->hunk_matched_line;
minus = "-";
}
/* ### We're creating the localized strings without
* ### APR_INT64_T_FMT since it isn't translator-friendly */
if (n->hunk_fuzz)
{
if (n->prop_name)
{
s = _("> applied hunk ## -%lu,%lu +%lu,%lu ## "
"with offset %s");
err = svn_cmdline_printf(pool,
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT
" and fuzz %lu (%s)\n",
(char *)NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
n->hunk_modified_length,
minus, off, n->hunk_fuzz,
n->prop_name);
}
else
{
s = _("> applied hunk @@ -%lu,%lu +%lu,%lu @@ "
"with offset %s");
err = svn_cmdline_printf(pool,
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT
" and fuzz %lu\n",
(char *)NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
n->hunk_modified_length,
minus, off, n->hunk_fuzz);
}
if (err)
goto print_error;
}
else
{
if (n->prop_name)
{
s = _("> applied hunk ## -%lu,%lu +%lu,%lu ## "
"with offset %s");
err = svn_cmdline_printf(pool,
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT" (%s)\n",
(char *)NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
n->hunk_modified_length,
minus, off, n->prop_name);
}
else
{
s = _("> applied hunk @@ -%lu,%lu +%lu,%lu @@ "
"with offset %s");
err = svn_cmdline_printf(pool,
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT"\n",
(char *)NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
n->hunk_modified_length,
minus, off);
}
if (err)
goto print_error;
}
}
else if (n->hunk_fuzz)
{
if (n->prop_name)
err = svn_cmdline_printf(pool,
_("> applied hunk ## -%lu,%lu +%lu,%lu ## "
"with fuzz %lu (%s)\n"),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
n->hunk_modified_length,
n->hunk_fuzz,
n->prop_name);
else
err = svn_cmdline_printf(pool,
_("> applied hunk @@ -%lu,%lu +%lu,%lu @@ "
"with fuzz %lu\n"),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
n->hunk_modified_length,
n->hunk_fuzz);
if (err)
goto print_error;
}
break;
case svn_wc_notify_patch_rejected_hunk:
nb->received_some_change = TRUE;
if (n->prop_name)
err = svn_cmdline_printf(pool,
_("> rejected hunk "
"## -%lu,%lu +%lu,%lu ## (%s)\n"),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
n->hunk_modified_length,
n->prop_name);
else
err = svn_cmdline_printf(pool,
_("> rejected hunk "
"@@ -%lu,%lu +%lu,%lu @@\n"),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
n->hunk_modified_length);
if (err)
goto print_error;
break;
case svn_wc_notify_patch_hunk_already_applied:
nb->received_some_change = TRUE;
if (n->prop_name)
err = svn_cmdline_printf(pool,
_("> hunk "
"## -%lu,%lu +%lu,%lu ## "
"already applied (%s)\n"),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
n->hunk_modified_length,
n->prop_name);
else
err = svn_cmdline_printf(pool,
_("> hunk "
"@@ -%lu,%lu +%lu,%lu @@ "
"already applied\n"),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
n->hunk_modified_length);
if (err)
goto print_error;
break;
case svn_wc_notify_update_update:
case svn_wc_notify_merge_record_info:
{
if (n->content_state == svn_wc_notify_state_conflicted)
{
nb->text_conflicts++;
statchar_buf[0] = 'C';
}
else if (n->kind == svn_node_file)
{
if (n->content_state == svn_wc_notify_state_merged)
statchar_buf[0] = 'G';
else if (n->content_state == svn_wc_notify_state_changed)
statchar_buf[0] = 'U';
}
if (n->prop_state == svn_wc_notify_state_conflicted)
{
nb->prop_conflicts++;
statchar_buf[1] = 'C';
}
else if (n->prop_state == svn_wc_notify_state_merged)
statchar_buf[1] = 'G';
else if (n->prop_state == svn_wc_notify_state_changed)
statchar_buf[1] = 'U';
if (n->lock_state == svn_wc_notify_lock_state_unlocked)
statchar_buf[2] = 'B';
if (statchar_buf[0] != ' ' || statchar_buf[1] != ' ')
nb->received_some_change = TRUE;
if (statchar_buf[0] != ' ' || statchar_buf[1] != ' '
|| statchar_buf[2] != ' ')
{
if ((err = svn_cmdline_printf(pool, "%s %s\n",
statchar_buf, path_local)))
goto print_error;
}
}
break;
case svn_wc_notify_update_external:
/* Remember that we're now "inside" an externals definition. */
nb->in_external = TRUE;
/* Currently this is used for checkouts and switches too. If we
want different output, we'll have to add new actions. */
if ((err = svn_cmdline_printf(pool,
_("\nFetching external item into '%s':\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_failed_external:
/* If we are currently inside the handling of an externals
definition, then we can simply present n->err as a warning
and feel confident that after this, we aren't handling that
externals definition any longer. */
if (nb->in_external)
{
svn_handle_warning2(stderr, n->err, "svn: ");
nb->in_external = FALSE;
if ((err = svn_cmdline_printf(pool, "\n")))
goto print_error;
}
/* Otherwise, we'll just print two warnings. Why? Because
svn_handle_warning2() only shows the single "best message",
but we have two pretty important ones: that the external at
'/some/path' didn't pan out, and then the more specific
reason why (from n->err). */
else
{
svn_error_t *warn_err =
svn_error_createf(SVN_ERR_BASE, NULL,
_("Error handling externals definition for '%s':"),
path_local);
svn_handle_warning2(stderr, warn_err, "svn: ");
svn_error_clear(warn_err);
svn_handle_warning2(stderr, n->err, "svn: ");
}
break;
case svn_wc_notify_update_started:
if (! (nb->in_external ||
nb->is_checkout ||
nb->is_export))
{
if ((err = svn_cmdline_printf(pool, _("Updating '%s':\n"),
path_local)))
goto print_error;
}
break;
case svn_wc_notify_update_completed:
{
if (SVN_IS_VALID_REVNUM(n->revision))
{
if (nb->is_export)
{
if ((err = svn_cmdline_printf
(pool, nb->in_external
? _("Exported external at revision %ld.\n")
: _("Exported revision %ld.\n"),
n->revision)))
goto print_error;
}
else if (nb->is_checkout)
{
if ((err = svn_cmdline_printf
(pool, nb->in_external
? _("Checked out external at revision %ld.\n")
: _("Checked out revision %ld.\n"),
n->revision)))
goto print_error;
}
else
{
if (nb->received_some_change)
{
nb->received_some_change = FALSE;
if ((err = svn_cmdline_printf
(pool, nb->in_external
? _("Updated external to revision %ld.\n")
: _("Updated to revision %ld.\n"),
n->revision)))
goto print_error;
}
else
{
if ((err = svn_cmdline_printf
(pool, nb->in_external
? _("External at revision %ld.\n")
: _("At revision %ld.\n"),
n->revision)))
goto print_error;
}
}
}
else /* no revision */
{
if (nb->is_export)
{
if ((err = svn_cmdline_printf
(pool, nb->in_external
? _("External export complete.\n")
: _("Export complete.\n"))))
goto print_error;
}
else if (nb->is_checkout)
{
if ((err = svn_cmdline_printf
(pool, nb->in_external
? _("External checkout complete.\n")
: _("Checkout complete.\n"))))
goto print_error;
}
else
{
if ((err = svn_cmdline_printf
(pool, nb->in_external
? _("External update complete.\n")
: _("Update complete.\n"))))
goto print_error;
}
}
}
if (nb->in_external)
{
nb->in_external = FALSE;
if ((err = svn_cmdline_printf(pool, "\n")))
goto print_error;
}
break;
case svn_wc_notify_status_external:
if ((err = svn_cmdline_printf
(pool, _("\nPerforming status on external item at '%s':\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_status_completed:
if (SVN_IS_VALID_REVNUM(n->revision))
if ((err = svn_cmdline_printf(pool,
_("Status against revision: %6ld\n"),
n->revision)))
goto print_error;
break;
case svn_wc_notify_commit_modified:
/* xgettext: Align the %s's on this and the following 4 messages */
if ((err = svn_cmdline_printf(pool,
nb->is_wc_to_repos_copy
? _("Sending copy of %s\n")
: _("Sending %s\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_commit_added:
case svn_wc_notify_commit_copied:
if (n->mime_type && svn_mime_type_is_binary(n->mime_type))
{
if ((err = svn_cmdline_printf(pool,
nb->is_wc_to_repos_copy
? _("Adding copy of (bin) %s\n")
: _("Adding (bin) %s\n"),
path_local)))
goto print_error;
}
else
{
if ((err = svn_cmdline_printf(pool,
nb->is_wc_to_repos_copy
? _("Adding copy of %s\n")
: _("Adding %s\n"),
path_local)))
goto print_error;
}
break;
case svn_wc_notify_commit_deleted:
if ((err = svn_cmdline_printf(pool,
nb->is_wc_to_repos_copy
? _("Deleting copy of %s\n")
: _("Deleting %s\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_commit_replaced:
case svn_wc_notify_commit_copied_replaced:
if ((err = svn_cmdline_printf(pool,
nb->is_wc_to_repos_copy
? _("Replacing copy of %s\n")
: _("Replacing %s\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_commit_postfix_txdelta:
if (! nb->sent_first_txdelta)
{
nb->sent_first_txdelta = TRUE;
if ((err = svn_cmdline_printf(pool,
_("Transmitting file data "))))
goto print_error;
}
if ((err = svn_cmdline_printf(pool, ".")))
goto print_error;
break;
case svn_wc_notify_locked:
if ((err = svn_cmdline_printf(pool, _("'%s' locked by user '%s'.\n"),
path_local, n->lock->owner)))
goto print_error;
break;
case svn_wc_notify_unlocked:
if ((err = svn_cmdline_printf(pool, _("'%s' unlocked.\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_failed_lock:
case svn_wc_notify_failed_unlock:
svn_handle_warning2(stderr, n->err, "svn: ");
break;
case svn_wc_notify_changelist_set:
if ((err = svn_cmdline_printf(pool, "A [%s] %s\n",
n->changelist_name, path_local)))
goto print_error;
break;
case svn_wc_notify_changelist_clear:
case svn_wc_notify_changelist_moved:
if ((err = svn_cmdline_printf(pool,
"D [%s] %s\n",
n->changelist_name, path_local)))
goto print_error;
break;
case svn_wc_notify_merge_begin:
if (n->merge_range == NULL)
err = svn_cmdline_printf(pool,
_("--- Merging differences between "
"repository URLs into '%s':\n"),
path_local);
else if (n->merge_range->start == n->merge_range->end - 1
|| n->merge_range->start == n->merge_range->end)
err = svn_cmdline_printf(pool, _("--- Merging r%ld into '%s':\n"),
n->merge_range->end, path_local);
else if (n->merge_range->start - 1 == n->merge_range->end)
err = svn_cmdline_printf(pool,
_("--- Reverse-merging r%ld into '%s':\n"),
n->merge_range->start, path_local);
else if (n->merge_range->start < n->merge_range->end)
err = svn_cmdline_printf(pool,
_("--- Merging r%ld through r%ld into "
"'%s':\n"),
n->merge_range->start + 1,
n->merge_range->end, path_local);
else /* n->merge_range->start > n->merge_range->end - 1 */
err = svn_cmdline_printf(pool,
_("--- Reverse-merging r%ld through r%ld "
"into '%s':\n"),
n->merge_range->start,
n->merge_range->end + 1, path_local);
if (err)
goto print_error;
break;
case svn_wc_notify_merge_record_info_begin:
if (!n->merge_range)
{
err = svn_cmdline_printf(pool,
_("--- Recording mergeinfo for merge "
"between repository URLs into '%s':\n"),
path_local);
}
else
{
if (n->merge_range->start == n->merge_range->end - 1
|| n->merge_range->start == n->merge_range->end)
err = svn_cmdline_printf(
pool,
_("--- Recording mergeinfo for merge of r%ld into '%s':\n"),
n->merge_range->end, path_local);
else if (n->merge_range->start - 1 == n->merge_range->end)
err = svn_cmdline_printf(
pool,
_("--- Recording mergeinfo for reverse merge of r%ld into '%s':\n"),
n->merge_range->start, path_local);
else if (n->merge_range->start < n->merge_range->end)
err = svn_cmdline_printf(
pool,
_("--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n"),
n->merge_range->start + 1, n->merge_range->end, path_local);
else /* n->merge_range->start > n->merge_range->end - 1 */
err = svn_cmdline_printf(
pool,
_("--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n"),
n->merge_range->start, n->merge_range->end + 1, path_local);
}
if (err)
goto print_error;
break;
case svn_wc_notify_merge_elide_info:
if ((err = svn_cmdline_printf(pool,
_("--- Eliding mergeinfo from '%s':\n"),
path_local)))
goto print_error;
break;
case svn_wc_notify_foreign_merge_begin:
if (n->merge_range == NULL)
err = svn_cmdline_printf(pool,
_("--- Merging differences between "
"foreign repository URLs into '%s':\n"),
path_local);
else if (n->merge_range->start == n->merge_range->end - 1
|| n->merge_range->start == n->merge_range->end)
err = svn_cmdline_printf(pool,
_("--- Merging (from foreign repository) "
"r%ld into '%s':\n"),
n->merge_range->end, path_local);
else if (n->merge_range->start - 1 == n->merge_range->end)
err = svn_cmdline_printf(pool,
_("--- Reverse-merging (from foreign "
"repository) r%ld into '%s':\n"),
n->merge_range->start, path_local);
else if (n->merge_range->start < n->merge_range->end)
err = svn_cmdline_printf(pool,
_("--- Merging (from foreign repository) "
"r%ld through r%ld into '%s':\n"),
n->merge_range->start + 1,
n->merge_range->end, path_local);
else /* n->merge_range->start > n->merge_range->end - 1 */
err = svn_cmdline_printf(pool,
_("--- Reverse-merging (from foreign "
"repository) r%ld through r%ld into "
"'%s':\n"),
n->merge_range->start,
n->merge_range->end + 1, path_local);
if (err)
goto print_error;
break;
case svn_wc_notify_tree_conflict:
nb->tree_conflicts++;
if ((err = svn_cmdline_printf(pool, " C %s\n", path_local)))
goto print_error;
break;
case svn_wc_notify_update_shadowed_add:
nb->received_some_change = TRUE;
if ((err = svn_cmdline_printf(pool, " A %s\n", path_local)))
goto print_error;
break;
case svn_wc_notify_update_shadowed_update:
nb->received_some_change = TRUE;
if ((err = svn_cmdline_printf(pool, " U %s\n", path_local)))
goto print_error;
break;
case svn_wc_notify_update_shadowed_delete:
nb->received_some_change = TRUE;
if ((err = svn_cmdline_printf(pool, " D %s\n", path_local)))
goto print_error;
break;
case svn_wc_notify_property_modified:
case svn_wc_notify_property_added:
err = svn_cmdline_printf(pool,
_("property '%s' set on '%s'\n"),
n->prop_name, path_local);
if (err)
goto print_error;
break;
case svn_wc_notify_property_deleted:
err = svn_cmdline_printf(pool,
_("property '%s' deleted from '%s'.\n"),
n->prop_name, path_local);
if (err)
goto print_error;
break;
case svn_wc_notify_property_deleted_nonexistent:
err = svn_cmdline_printf(pool,
_("Attempting to delete nonexistent "
"property '%s' on '%s'\n"), n->prop_name,
path_local);
if (err)
goto print_error;
break;
case svn_wc_notify_revprop_set:
err = svn_cmdline_printf(pool,
_("property '%s' set on repository revision %ld\n"),
n->prop_name, n->revision);
if (err)
goto print_error;
break;
case svn_wc_notify_revprop_deleted:
err = svn_cmdline_printf(pool,
_("property '%s' deleted from repository revision %ld\n"),
n->prop_name, n->revision);
if (err)
goto print_error;
break;
case svn_wc_notify_upgraded_path:
err = svn_cmdline_printf(pool, _("Upgraded '%s'\n"), path_local);
if (err)
goto print_error;
break;
case svn_wc_notify_url_redirect:
err = svn_cmdline_printf(pool, _("Redirecting to URL '%s':\n"),
n->url);
if (err)
goto print_error;
break;
case svn_wc_notify_path_nonexistent:
err = svn_cmdline_printf(pool, _("'%s' is not under version control"),
path_local);
if (err)
goto print_error;
break;
default:
break;
}
if ((err = svn_cmdline_fflush(stdout)))
goto print_error;
return;
print_error:
/* If we had no errors before, print this error to stderr. Else, don't print
anything. The user already knows there were some output errors,
so there is no point in flooding her with an error per notification. */
if (!nb->had_print_error)
{
nb->had_print_error = TRUE;
/* Issue #3014:
* Don't print anything on broken pipes. The pipe was likely
* closed by the process at the other end. We expect that
* process to perform error reporting as necessary.
*
* ### This assumes that there is only one error in a chain for
* ### SVN_ERR_IO_PIPE_WRITE_ERROR. See svn_cmdline_fputs(). */
if (err->apr_err != SVN_ERR_IO_PIPE_WRITE_ERROR)
svn_handle_error2(err, stderr, FALSE, "svn: ");
}
svn_error_clear(err);
}
/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
svn_cl__list(apr_getopt_t *os,
void *baton,
apr_pool_t *pool)
{
svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
apr_array_header_t *targets;
int i;
apr_pool_t *subpool = svn_pool_create(pool);
apr_uint32_t dirent_fields;
struct print_baton pb;
svn_boolean_t seen_nonexistent_target = FALSE;
svn_error_t *err;
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
opt_state->targets,
ctx, FALSE, pool));
/* Add "." if user passed 0 arguments */
svn_opt_push_implicit_dot_target(targets, pool);
if (opt_state->xml)
{
/* The XML output contains all the information, so "--verbose"
does not apply. */
if (opt_state->verbose)
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("'verbose' option invalid in XML mode"));
/* If output is not incremental, output the XML header and wrap
everything in a top-level element. This makes the output in
its entirety a well-formed XML document. */
if (! opt_state->incremental)
SVN_ERR(svn_cl__xml_print_header("lists", pool));
}
else
{
if (opt_state->incremental)
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("'incremental' option only valid in XML "
"mode"));
}
if (opt_state->verbose || opt_state->xml)
dirent_fields = SVN_DIRENT_ALL;
else
dirent_fields = SVN_DIRENT_KIND; /* the only thing we actually need... */
pb.ctx = ctx;
pb.verbose = opt_state->verbose;
if (opt_state->depth == svn_depth_unknown)
opt_state->depth = svn_depth_immediates;
/* For each target, try to list it. */
for (i = 0; i < targets->nelts; i++)
{
const char *target = APR_ARRAY_IDX(targets, i, const char *);
const char *truepath;
svn_opt_revision_t peg_revision;
svn_pool_clear(subpool);
SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
/* Get peg revisions. */
SVN_ERR(svn_opt_parse_path(&peg_revision, &truepath, target,
subpool));
if (opt_state->xml)
{
svn_stringbuf_t *sb = svn_stringbuf_create("", pool);
svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "list",
"path", truepath[0] == '\0' ? "." : truepath,
NULL);
SVN_ERR(svn_cl__error_checked_fputs(sb->data, stdout));
}
err = svn_client_list2(truepath, &peg_revision,
&(opt_state->start_revision),
opt_state->depth,
dirent_fields,
(opt_state->xml || opt_state->verbose),
opt_state->xml ? print_dirent_xml : print_dirent,
&pb, ctx, subpool);
if (err)
{
/* If one of the targets is a non-existent URL or wc-entry,
don't bail out. Just warn and move on to the next target. */
if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND ||
err->apr_err == SVN_ERR_FS_NOT_FOUND)
svn_handle_warning2(stderr, err, "svn: ");
else
return svn_error_trace(err);
svn_error_clear(err);
err = NULL;
seen_nonexistent_target = TRUE;
}
if (opt_state->xml)
{
svn_stringbuf_t *sb = svn_stringbuf_create("", pool);
svn_xml_make_close_tag(&sb, pool, "list");
SVN_ERR(svn_cl__error_checked_fputs(sb->data, stdout));
}
}
svn_pool_destroy(subpool);
if (opt_state->xml && ! opt_state->incremental)
SVN_ERR(svn_cl__xml_print_footer("lists", pool));
if (seen_nonexistent_target)
return svn_error_create(
SVN_ERR_ILLEGAL_TARGET, NULL,
_("Could not list all targets because some targets don't exist"));
else
return SVN_NO_ERROR;
}
// notify is pretty much copied from subversion 1.8.10, with some
// things removed, partly since they don't apply and partly to get it
// to compile with SVN 1.6.
void notify(void *baton, const svn_wc_notify_t *n, apr_pool_t *subpool) {
notify_baton *nb = (notify_baton*)baton;
char statchar_buf[5] = " ";
const char *path_local;
svn_error_t *err;
if (n->url)
path_local = n->url;
else
{
if (n->path_prefix)
path_local = local_style_skip_ancestor(n->path_prefix, n->path, subpool);
else
path_local = local_style_skip_ancestor(nb->path_prefix, n->path, subpool);
}
switch (n->action) {
case svn_wc_notify_skip:
if ((err = svn_cmdline_printf(subpool, "Skipped '%s'\n", path_local)))
goto print_error;
break;
case svn_wc_notify_update_delete:
if ((err = svn_cmdline_printf(subpool, "D %s\n", path_local)))
goto print_error;
break;
case svn_wc_notify_update_replace:
if ((err = svn_cmdline_printf(subpool, "R %s\n", path_local)))
goto print_error;
break;
case svn_wc_notify_update_add:
if (n->content_state == svn_wc_notify_state_conflicted) {
if ((err = svn_cmdline_printf(subpool, "C %s\n", path_local)))
goto print_error;
} else {
if ((err = svn_cmdline_printf(subpool, "A %s\n", path_local)))
goto print_error;
}
break;
case svn_wc_notify_exists:
if (n->content_state == svn_wc_notify_state_conflicted)
statchar_buf[0] = 'C';
else
statchar_buf[0] = 'E';
if (n->prop_state == svn_wc_notify_state_conflicted)
statchar_buf[1] = 'C';
else if (n->prop_state == svn_wc_notify_state_merged)
statchar_buf[1] = 'G';
if ((err = svn_cmdline_printf(subpool, "%s %s\n", statchar_buf, path_local)))
goto print_error;
break;
case svn_wc_notify_restore:
if ((err = svn_cmdline_printf(subpool, "Restored '%s'\n", path_local)))
goto print_error;
break;
case svn_wc_notify_revert:
if ((err = svn_cmdline_printf(subpool, "Reverted '%s'\n", path_local)))
goto print_error;
break;
case svn_wc_notify_failed_revert:
if ((err = svn_cmdline_printf(subpool, "Failed to revert '%s' -- try updating instead.\n", path_local)))
goto print_error;
break;
case svn_wc_notify_resolved:
if ((err = svn_cmdline_printf(subpool, "Resolved conflicted state of '%s'\n", path_local)))
goto print_error;
break;
case svn_wc_notify_add:
/* We *should* only get the MIME_TYPE if PATH is a file. If we
do get it, and the mime-type is not textual, note that this
is a binary addition. */
if (n->mime_type && (svn_mime_type_is_binary(n->mime_type))) {
if ((err = svn_cmdline_printf(subpool, "A (bin) %s\n", path_local)))
goto print_error;
} else {
if ((err = svn_cmdline_printf(subpool, "A %s\n", path_local)))
goto print_error;
}
break;
case svn_wc_notify_delete:
if ((err = svn_cmdline_printf(subpool, "D %s\n", path_local)))
goto print_error;
break;
case svn_wc_notify_update_update:
{
if (n->content_state == svn_wc_notify_state_conflicted) {
statchar_buf[0] = 'C';
} else if (n->kind == svn_node_file) {
if (n->content_state == svn_wc_notify_state_merged)
statchar_buf[0] = 'G';
else if (n->content_state == svn_wc_notify_state_changed)
statchar_buf[0] = 'U';
}
if (n->prop_state == svn_wc_notify_state_conflicted)
statchar_buf[1] = 'C';
else if (n->prop_state == svn_wc_notify_state_merged)
statchar_buf[1] = 'G';
else if (n->prop_state == svn_wc_notify_state_changed)
statchar_buf[1] = 'U';
if (n->lock_state == svn_wc_notify_lock_state_unlocked)
statchar_buf[2] = 'B';
if (statchar_buf[0] != ' ' || statchar_buf[1] != ' ' || statchar_buf[2] != ' ') {
if ((err = svn_cmdline_printf(subpool, "%s %s\n", statchar_buf, path_local)))
goto print_error;
}
}
break;
case svn_wc_notify_locked:
if ((err = svn_cmdline_printf(subpool, "'%s' locked by user '%s'.\n", path_local, n->lock->owner)))
goto print_error;
break;
case svn_wc_notify_unlocked:
if ((err = svn_cmdline_printf(subpool, "'%s' unlocked.\n", path_local)))
goto print_error;
break;
case svn_wc_notify_failed_lock:
case svn_wc_notify_failed_unlock:
svn_handle_warning2(stderr, n->err, "svn: ");
break;
case svn_wc_notify_changelist_set:
if ((err = svn_cmdline_printf(subpool, "A [%s] %s\n", n->changelist_name, path_local)))
goto print_error;
break;
case svn_wc_notify_changelist_clear:
case svn_wc_notify_changelist_moved:
if ((err = svn_cmdline_printf(subpool, "D [%s] %s\n", n->changelist_name, path_local)))
goto print_error;
break;
case svn_wc_notify_tree_conflict:
if ((err = svn_cmdline_printf(subpool, " C %s\n", path_local)))
goto print_error;
break;
case svn_wc_notify_property_modified:
case svn_wc_notify_property_added:
err = svn_cmdline_printf(subpool, "property '%s' set on '%s'\n", n->prop_name, path_local);
if (err)
goto print_error;
break;
case svn_wc_notify_property_deleted:
err = svn_cmdline_printf(subpool, "property '%s' deleted from '%s'.\n", n->prop_name, path_local);
if (err)
goto print_error;
break;
case svn_wc_notify_property_deleted_nonexistent:
err = svn_cmdline_printf(subpool, "Attempting to delete nonexistent property '%s' on '%s'\n", n->prop_name, path_local);
if (err)
goto print_error;
break;
case svn_wc_notify_revprop_set:
err = svn_cmdline_printf(subpool, "property '%s' set on repository revision %ld\n", n->prop_name, n->revision);
if (err)
goto print_error;
break;
case svn_wc_notify_revprop_deleted:
err = svn_cmdline_printf(subpool, "property '%s' deleted from repository revision %ld\n", n->prop_name, n->revision);
if (err)
goto print_error;
break;
default:
break;
}
if ((err = svn_cmdline_fflush(stdout)))
goto print_error;
return;
print_error:
/* If we had no errors before, print this error to stderr. Else, don't print
anything. The user already knows there were some output errors,
so there is no point in flooding her with an error per notification. */
if (!nb->had_print_error) {
nb->had_print_error = true;
svn_handle_error2(err, stderr, FALSE, "svn: ");
}
svn_error_clear(err);
}
/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
svn_cl__blame(apr_getopt_t *os,
void *baton,
apr_pool_t *pool)
{
svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
apr_pool_t *subpool;
apr_array_header_t *targets;
blame_baton_t bl;
int i;
svn_boolean_t end_revision_unspecified = FALSE;
svn_diff_file_options_t *diff_options = svn_diff_file_options_create(pool);
svn_boolean_t seen_nonexistent_target = FALSE;
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
opt_state->targets,
ctx, FALSE, pool));
/* Blame needs a file on which to operate. */
if (! targets->nelts)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
if (opt_state->end_revision.kind == svn_opt_revision_unspecified)
{
if (opt_state->start_revision.kind != svn_opt_revision_unspecified)
{
/* In the case that -rX was specified, we actually want to set the
range to be -r1:X. */
opt_state->end_revision = opt_state->start_revision;
opt_state->start_revision.kind = svn_opt_revision_number;
opt_state->start_revision.value.number = 1;
}
else
end_revision_unspecified = TRUE;
}
if (opt_state->start_revision.kind == svn_opt_revision_unspecified)
{
opt_state->start_revision.kind = svn_opt_revision_number;
opt_state->start_revision.value.number = 1;
}
/* The final conclusion from issue #2431 is that blame info
is client output (unlike 'svn cat' which plainly cats the file),
so the EOL style should be the platform local one.
*/
if (! opt_state->xml)
SVN_ERR(svn_stream_for_stdout(&bl.out, pool));
else
bl.sbuf = svn_stringbuf_create("", pool);
bl.opt_state = opt_state;
subpool = svn_pool_create(pool);
if (opt_state->extensions)
{
apr_array_header_t *opts;
opts = svn_cstring_split(opt_state->extensions, " \t\n\r", TRUE, pool);
SVN_ERR(svn_diff_file_options_parse(diff_options, opts, pool));
}
if (opt_state->xml)
{
if (opt_state->verbose)
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("'verbose' option invalid in XML mode"));
/* If output is not incremental, output the XML header and wrap
everything in a top-level element. This makes the output in
its entirety a well-formed XML document. */
if (! opt_state->incremental)
SVN_ERR(svn_cl__xml_print_header("blame", pool));
}
else
{
if (opt_state->incremental)
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("'incremental' option only valid in XML "
"mode"));
}
for (i = 0; i < targets->nelts; i++)
{
svn_error_t *err;
const char *target = APR_ARRAY_IDX(targets, i, const char *);
const char *truepath;
svn_opt_revision_t peg_revision;
svn_client_blame_receiver3_t receiver;
svn_pool_clear(subpool);
SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
/* Check for a peg revision. */
SVN_ERR(svn_opt_parse_path(&peg_revision, &truepath, target,
subpool));
if (end_revision_unspecified)
{
if (peg_revision.kind != svn_opt_revision_unspecified)
opt_state->end_revision = peg_revision;
else if (svn_path_is_url(target))
opt_state->end_revision.kind = svn_opt_revision_head;
else
opt_state->end_revision.kind = svn_opt_revision_working;
}
if (opt_state->xml)
{
/* "<target ...>" */
/* We don't output this tag immediately, which avoids creating
a target element if this path is skipped. */
const char *outpath = truepath;
if (! svn_path_is_url(target))
outpath = svn_dirent_local_style(truepath, subpool);
svn_xml_make_open_tag(&bl.sbuf, pool, svn_xml_normal, "target",
"path", outpath, NULL);
receiver = blame_receiver_xml;
}
else
receiver = blame_receiver;
err = svn_client_blame5(truepath,
&peg_revision,
&opt_state->start_revision,
&opt_state->end_revision,
diff_options,
opt_state->force,
opt_state->use_merge_history,
receiver,
&bl,
ctx,
subpool);
if (err)
{
if (err->apr_err == SVN_ERR_CLIENT_IS_BINARY_FILE)
{
svn_error_clear(err);
SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
_("Skipping binary file: '%s'\n"),
target));
}
else if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND ||
err->apr_err == SVN_ERR_FS_NOT_FILE ||
err->apr_err == SVN_ERR_FS_NOT_FOUND)
{
svn_handle_warning2(stderr, err, "svn: ");
svn_error_clear(err);
err = NULL;
seen_nonexistent_target = TRUE;
}
else
{
return svn_error_trace(err);
}
}
else if (opt_state->xml)
{
/* "</target>" */
svn_xml_make_close_tag(&(bl.sbuf), pool, "target");
SVN_ERR(svn_cl__error_checked_fputs(bl.sbuf->data, stdout));
}
if (opt_state->xml)
svn_stringbuf_setempty(bl.sbuf);
}
svn_pool_destroy(subpool);
if (opt_state->xml && ! opt_state->incremental)
SVN_ERR(svn_cl__xml_print_footer("blame", pool));
if (seen_nonexistent_target)
return svn_error_create(
SVN_ERR_ILLEGAL_TARGET, NULL,
_("Could not perform blame on all targets because some "
"targets don't exist"));
else
return SVN_NO_ERROR;
}
/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
svn_cl__null_blame(apr_getopt_t *os,
void *baton,
apr_pool_t *pool)
{
svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
apr_pool_t *iterpool;
apr_array_header_t *targets;
int i;
svn_boolean_t end_revision_unspecified = FALSE;
svn_boolean_t seen_nonexistent_target = FALSE;
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
opt_state->targets,
ctx, FALSE, pool));
/* Blame needs a file on which to operate. */
if (! targets->nelts)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
if (opt_state->end_revision.kind == svn_opt_revision_unspecified)
{
if (opt_state->start_revision.kind != svn_opt_revision_unspecified)
{
/* In the case that -rX was specified, we actually want to set the
range to be -r1:X. */
opt_state->end_revision = opt_state->start_revision;
opt_state->start_revision.kind = svn_opt_revision_number;
opt_state->start_revision.value.number = 1;
}
else
end_revision_unspecified = TRUE;
}
if (opt_state->start_revision.kind == svn_opt_revision_unspecified)
{
opt_state->start_revision.kind = svn_opt_revision_number;
opt_state->start_revision.value.number = 1;
}
/* The final conclusion from issue #2431 is that blame info
is client output (unlike 'svn cat' which plainly cats the file),
so the EOL style should be the platform local one.
*/
iterpool = svn_pool_create(pool);
for (i = 0; i < targets->nelts; i++)
{
svn_error_t *err;
const char *target = APR_ARRAY_IDX(targets, i, const char *);
const char *parsed_path;
svn_opt_revision_t peg_revision;
svn_pool_clear(iterpool);
SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
/* Check for a peg revision. */
SVN_ERR(svn_opt_parse_path(&peg_revision, &parsed_path, target,
iterpool));
if (end_revision_unspecified)
{
if (peg_revision.kind != svn_opt_revision_unspecified)
opt_state->end_revision = peg_revision;
else if (svn_path_is_url(target))
opt_state->end_revision.kind = svn_opt_revision_head;
else
opt_state->end_revision.kind = svn_opt_revision_working;
}
err = bench_null_blame(parsed_path,
&peg_revision,
&opt_state->start_revision,
&opt_state->end_revision,
opt_state->use_merge_history,
opt_state->quiet,
ctx,
iterpool);
if (err)
{
if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND ||
err->apr_err == SVN_ERR_ENTRY_NOT_FOUND ||
err->apr_err == SVN_ERR_FS_NOT_FILE ||
err->apr_err == SVN_ERR_FS_NOT_FOUND)
{
svn_handle_warning2(stderr, err, "svn: ");
svn_error_clear(err);
err = NULL;
seen_nonexistent_target = TRUE;
}
else
{
return svn_error_trace(err);
}
}
}
svn_pool_destroy(iterpool);
if (seen_nonexistent_target)
return svn_error_create(
SVN_ERR_ILLEGAL_TARGET, NULL,
_("Could not perform blame on all targets because some "
"targets don't exist"));
else
return SVN_NO_ERROR;
}
/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
svn_cl__null_list(apr_getopt_t *os,
void *baton,
apr_pool_t *pool)
{
svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
apr_array_header_t *targets;
int i;
apr_pool_t *subpool = svn_pool_create(pool);
apr_uint32_t dirent_fields;
struct print_baton pb = { FALSE };
svn_boolean_t seen_nonexistent_target = FALSE;
svn_error_t *err;
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
opt_state->targets,
ctx, FALSE, pool));
/* Add "." if user passed 0 arguments */
svn_opt_push_implicit_dot_target(targets, pool);
if (opt_state->verbose)
dirent_fields = SVN_DIRENT_ALL;
else
dirent_fields = SVN_DIRENT_KIND; /* the only thing we actually need... */
pb.ctx = ctx;
pb.verbose = opt_state->verbose;
if (opt_state->depth == svn_depth_unknown)
opt_state->depth = svn_depth_immediates;
/* For each target, try to list it. */
for (i = 0; i < targets->nelts; i++)
{
const char *target = APR_ARRAY_IDX(targets, i, const char *);
const char *truepath;
svn_opt_revision_t peg_revision;
svn_pool_clear(subpool);
SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
/* Get peg revisions. */
SVN_ERR(svn_opt_parse_path(&peg_revision, &truepath, target,
subpool));
err = svn_client_list3(truepath, &peg_revision,
&(opt_state->start_revision),
opt_state->depth,
dirent_fields,
opt_state->verbose,
FALSE, /* include externals */
print_dirent,
&pb, ctx, subpool);
if (err)
{
/* If one of the targets is a non-existent URL or wc-entry,
don't bail out. Just warn and move on to the next target. */
if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND ||
err->apr_err == SVN_ERR_FS_NOT_FOUND)
svn_handle_warning2(stderr, err, "svnbench: ");
else
return svn_error_trace(err);
svn_error_clear(err);
err = NULL;
seen_nonexistent_target = TRUE;
}
else if (!opt_state->quiet)
SVN_ERR(svn_cmdline_printf(pool,
_("%15s directories\n"
"%15s files\n"
"%15s locks\n"),
svn__ui64toa_sep(pb.directories, ',', pool),
svn__ui64toa_sep(pb.files, ',', pool),
svn__ui64toa_sep(pb.locks, ',', pool)));
}
svn_pool_destroy(subpool);
if (seen_nonexistent_target)
return svn_error_create(
SVN_ERR_ILLEGAL_TARGET, NULL,
_("Could not list all targets because some targets don't exist"));
else
return SVN_NO_ERROR;
}
