Removed string composition in preparation for more _() markers. * subversion/clients/cmdline/notify.c (notify): Remove sentence fragments as arguments in conditionals to printf, factoring out the condition into an if statement outside the printf. * subversion/libsvn_wc/adm_ops.c (revert_error): Remove, factoring out it into its callers. * subversion/libsvn_wc/props.c (validate_prop_against_node_kind): Restructure so that each error message is complete. Index: subversion/libsvn_wc/props.c =================================================================== --- subversion/libsvn_wc/props.c (revision 9694) +++ subversion/libsvn_wc/props.c (arbetskopia) @@ -912,29 +912,30 @@ SVN_PROP_MIME_TYPE, NULL }; const char **node_kind_prohibit; - const char *node_kind_text; switch (node_kind) { case svn_node_dir: node_kind_prohibit = dir_prohibit; - node_kind_text = _("directory"); + while (*node_kind_prohibit) + if (strcmp (name, *node_kind_prohibit++) == 0) + return svn_error_createf (SVN_ERR_ILLEGAL_TARGET, NULL, + _("Cannot set '%s' on a directory (%s)"), + name, path); break; case svn_node_file: node_kind_prohibit = file_prohibit; - node_kind_text = _("file"); + while (*node_kind_prohibit) + if (strcmp (name, *node_kind_prohibit++) == 0) + return svn_error_createf (SVN_ERR_ILLEGAL_TARGET, NULL, + _("Cannot set '%s' on a file (%s)"), + name, path); break; default: return svn_error_createf (SVN_ERR_NODE_UNEXPECTED_KIND, NULL, _("'%s' is not a file or directory"), path); } - while (*node_kind_prohibit) - if (strcmp (name, *node_kind_prohibit++) == 0) - return svn_error_createf (SVN_ERR_ILLEGAL_TARGET, NULL, - _("Cannot set '%s' on a %s (%s)"), - name, node_kind_text, path); - return SVN_NO_ERROR; } Index: subversion/libsvn_wc/adm_ops.c =================================================================== --- subversion/libsvn_wc/adm_ops.c (revision 9694) +++ subversion/libsvn_wc/adm_ops.c (arbetskopia) @@ -1131,20 +1131,6 @@ */ -/* Return a new wrapping of error ERR regarding the revert subcommand, - while doing VERB on PATH. Use POOL for allocations. -*/ -static svn_error_t * -revert_error (svn_error_t *err, - const char *path, - const char *verb, - apr_pool_t *pool) -{ - return svn_error_quick_wrap - (err, apr_psprintf (pool, _("Error '%s' for '%s'"), verb, path)); -} - - /* Revert ENTRY for NAME in directory represented by ADM_ACCESS, altering *MODIFY_FLAGS to indicate what parts of the entry were reverted (for example, if property changes were reverted, then set the @@ -1193,10 +1179,14 @@ { if ((working_props_kind == svn_node_file) && (err = svn_wc__prep_file_for_replacement (thing, FALSE, pool))) - return revert_error (err, fullpath, _("restoring props"), pool); + return svn_error_quick_wrap + (err, apr_psprintf (pool, _("Error restoring props for '%s'"), + fullpath)); if ((err = svn_io_copy_file (base_thing, thing, FALSE, pool))) - return revert_error (err, fullpath, _("restoring props"), pool); + return svn_error_quick_wrap + (err, apr_psprintf (pool, _("Error restoring props for '%s'"), + fullpath)); SVN_ERR (svn_io_file_affected_time (&tstamp, thing, pool)); entry->prop_time = tstamp; @@ -1204,7 +1194,9 @@ else if (working_props_kind == svn_node_file) { if ((err = svn_io_remove_file (thing, pool))) - return revert_error (err, fullpath, _("removing props"), pool); + return svn_error_quick_wrap + (err, apr_psprintf (pool, _("Error removing props for '%s'"), + fullpath)); } /* Modify our entry structure. */ @@ -1228,7 +1220,9 @@ if (kind == svn_node_file) { if ((err = svn_io_copy_file (base_thing, thing, FALSE, pool))) - return revert_error (err, fullpath, _("restoring props"), pool); + return svn_error_quick_wrap + (err, apr_psprintf (pool, _("Error restoring props for '%s'"), + fullpath)); SVN_ERR (svn_io_file_affected_time (&tstamp, thing, pool)); entry->prop_time = tstamp; @@ -1268,7 +1262,9 @@ keywords, TRUE, /* expand keywords */ pool))) - return revert_error (err, fullpath, _("restoring text"), pool); + return svn_error_quick_wrap + (err, apr_psprintf (pool, _("Error restoring text for '%s'"), + fullpath)); /* If necessary, tweak the new working file's executable bit. */ SVN_ERR (svn_wc__maybe_set_executable (NULL, fullpath, adm_access, Index: subversion/clients/cmdline/notify.c =================================================================== --- subversion/clients/cmdline/notify.c (revision 9694) +++ subversion/clients/cmdline/notify.c (arbetskopia) @@ -178,24 +178,44 @@ if (SVN_IS_VALID_REVNUM (revision)) { if (nb->is_export) - printf ("Exported %srevision %ld.\n", - nb->in_external ? "external at " : "", - revision); + { + if (nb->in_external) + printf ("Exported external at revision %ld.\n", + revision); + else + printf ("Exported revision %ld.\n", + revision); + } else if (nb->is_checkout) - printf ("Checked out %srevision %ld.\n", - nb->in_external ? "external at " : "", - revision); - else { - if (nb->received_some_change) - printf ("Updated %sto revision %ld.\n", - nb->in_external ? "external " : "", + if (nb->in_external) + printf ("Checked out external at revision %ld.\n", revision); else - printf ("%st revision %ld.\n", - nb->in_external ? "External a" : "A", + printf ("Checked out revision %ld.\n", revision); } + else + { + if (nb->received_some_change) + { + if (nb->in_external) + printf ("Updated external to revision %ld.\n", + revision); + else + printf ("Updated to revision %ld.\n", + revision); + } + else + { + if (nb->in_external) + printf ("External at revision %ld.\n", + revision); + else + printf ("At revision %ld.\n", + revision); + } + } } else /* no revision */ { @@ -203,11 +223,19 @@ printf (nb->in_external ? _("External export complete.\n") : _("Export complete.\n")); else if (nb->is_checkout) - printf ("%sheckout complete.\n", - nb->in_external ? "External c" : "C"); + { + if (nb->in_external) + printf ("External checkout complete.\n"); + else + printf ("Checkout complete.\n"); + } else - printf ("%spdate complete.\n", - nb->in_external ? "External u" : "U"); + { + if (nb->in_external) + printf ("External update complete.\n"); + else + printf ("Update complete.\n"); + } } } }