[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Revision 2 of libsvn_client changes for issue 897

From: Erik Huelsmann <e.huelsmann_at_gmx.net>
Date: 2003-11-14 19:57:37 CET

Below revision 2 of the patch I submitted last week to improve error
messages in libsvn_client.

bye,

Erik.

PS: The patch is also available at
http://encorps.dnsalias.com/patches/897-libsvn_client-messages.patch
(with your subversion client you can still acquire the old patch; it's in
the repository /patches/ at a revision before 19)

Log
[[[
Change error messages cf issue 897 on library by library
basis; for starters: libsvn_client

* subversion/libsvn_client/relocate.c
* subversion/libsvn_client/switch.c
* subversion/libsvn_client/delete.c
* subversion/libsvn_client/export.c
* subversion/libsvn_client/revisions.c
* subversion/libsvn_client/status.c
* subversion/libsvn_client/prop_commands.c
* subversion/libsvn_client/auth.c
* subversion/libsvn_client/ra.c
* subversion/libsvn_client/checkout.c
* subversion/libsvn_client/cat.c
* subversion/libsvn_client/diff.c
* subversion/libsvn_client/copy.c
* subversion/libsvn_client/blame.c
* subversion/libsvn_client/log.c
* subversion/libsvn_client/update.c
* subversion/libsvn_client/commit_util.c
* subversion/libsvn_client/add.c
* subversion/libsvn_client/commit.c
  Start with upper case letter, remove function names
  from messages, rewrite 'we' messages to statements,
  change 'unversioned resource' messages and error codes
  to standard (SVN_ERR_UNVERSIONED_RESOURCE,
  "'%s' is an unversioned resource"

]]]

 
Index: subversion/libsvn_client/relocate.c
===================================================================
--- subversion/libsvn_client/relocate.c (revision 7744)
+++ subversion/libsvn_client/relocate.c (working copy)
@@ -52,7 +52,7 @@
 {
   return svn_error_createf
     (SVN_ERR_CLIENT_INVALID_RELOCATION, NULL,
- "The repository at %s has uuid '%s', but the WC has '%s'",
+ "The repository at '%s' has uuid '%s', but the WC has '%s'",
      url, actual_uuid, expected_uuid);
 }
 
Index: subversion/libsvn_client/switch.c
===================================================================
--- subversion/libsvn_client/switch.c (revision 7744)
+++ subversion/libsvn_client/switch.c (working copy)
@@ -107,13 +107,13 @@
   
   if (! entry)
     return svn_error_createf
- (SVN_ERR_WC_PATH_NOT_FOUND, NULL,
- "svn_client_switch: '%s' is not under version control", path);
+ (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
+ "'%s' is an unversioned resource", path);
 
   if (! entry->url)
     return svn_error_createf
       (SVN_ERR_ENTRY_MISSING_URL, NULL,
- "svn_client_switch: entry '%s' has no URL", path);
+ "Entry '%s' has no URL", path);
 
   if (entry->kind == svn_node_file)
     {
@@ -123,13 +123,13 @@
       SVN_ERR (svn_wc_entry (&session_entry, anchor, adm_access, FALSE,
pool));
       if (! session_entry)
         return svn_error_createf
- (SVN_ERR_WC_PATH_NOT_FOUND, NULL,
- "svn_client_switch: '%s' is not under version control", anchor);
+ (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
+ "'%s' is not under version control", anchor);
 
       if (! session_entry->url)
         return svn_error_createf
           (SVN_ERR_ENTRY_MISSING_URL, NULL,
- "svn_client_switch: directory '%s' has no URL", anchor);
+ "Directory '%s' has no URL", anchor);
     }
   else if (entry->kind == svn_node_dir)
     {
Index: subversion/libsvn_client/delete.c
===================================================================
--- subversion/libsvn_client/delete.c (revision 7744)
+++ subversion/libsvn_client/delete.c (working copy)
@@ -62,7 +62,7 @@
                                  "actually under version control.", path);
   else if (! status->entry)
     sb->err = svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control",
path);
+ "'%s' is an unversioned resource", path);
   
   else if ((status->text_status != svn_wc_status_normal
             && status->text_status != svn_wc_status_deleted
Index: subversion/libsvn_client/export.c
===================================================================
--- subversion/libsvn_client/export.c (revision 7744)
+++ subversion/libsvn_client/export.c (working copy)
@@ -521,10 +521,7 @@
         {
           return svn_error_createf
             (SVN_ERR_CHECKSUM_MISMATCH, NULL,
- "close_file: checksum mismatch for resulting fulltext\n"
- "(%s):\n"
- " expected checksum: %s\n"
- " actual checksum: %s\n",
+ "Checksum mismatch for '%s'; expected: '%s', actual: '%s'\n",
              fb->path, text_checksum, actual_checksum);
         }
     }
Index: subversion/libsvn_client/revisions.c
===================================================================
--- subversion/libsvn_client/revisions.c (revision 7744)
+++ subversion/libsvn_client/revisions.c (working copy)
@@ -55,9 +55,7 @@
           || (revision->kind == svn_opt_revision_head)))
     {
       return svn_error_create
- (SVN_ERR_CLIENT_RA_ACCESS_REQUIRED, NULL,
- "svn_client__get_revision_number: "
- "need ra_lib and session for date or head revisions.");
+ (SVN_ERR_CLIENT_RA_ACCESS_REQUIRED, NULL, NULL);
     }
 
   if (revision->kind == svn_opt_revision_number)
@@ -81,8 +79,7 @@
       if (path == NULL)
         return svn_error_create
           (SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED, NULL,
- "svn_client__get_revision_number: "
- "need a version-controlled path to fetch local revision info.");
+ "Need a version-controlled path to fetch local revision info.");
 
       SVN_ERR (svn_wc_adm_probe_open (&adm_access, NULL, path, FALSE,
FALSE,
                                       pool));
@@ -92,7 +89,7 @@
       if (! ent)
         return svn_error_createf
         (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "svn_client__get_revision: '%s' not under version control", path);
+ "'%s' is an unversioned resource", path);
       
       if ((revision->kind == svn_opt_revision_base)
           || (revision->kind == svn_opt_revision_working))
@@ -107,8 +104,7 @@
   else
     return svn_error_createf
       (SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "svn_client__get_revision_number: "
- "unrecognized revision type requested for '%s'", path);
+ "Unrecognized revision type requested for '%s'", path);
   
   return SVN_NO_ERROR;
 }
Index: subversion/libsvn_client/status.c
===================================================================
--- subversion/libsvn_client/status.c (revision 7744)
+++ subversion/libsvn_client/status.c (working copy)
@@ -114,7 +114,7 @@
   else if (! update)
     svn_path_split (path, &anchor, &target, pool);
   else
- return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
+ return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
                               "'%s' is not a versioned resource", path);
   
   /* Close up our ADM area. We'll be re-opening soon. */
@@ -156,12 +156,12 @@
       SVN_ERR (svn_wc_entry (&entry, anchor, anchor_access, FALSE, pool));
       if (! entry)
         return svn_error_createf
- (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "svn_client_status: '%s' is not under version control", anchor);
+ (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
+ "'%s' is an unversioned resource", anchor);
       if (! entry->url)
         return svn_error_createf
           (SVN_ERR_ENTRY_MISSING_URL, NULL,
- "svn_client_status: entry '%s' has no URL", anchor);
+ "Entry '%s' has no URL", anchor);
       URL = apr_pstrdup (pool, entry->url);
 
       /* Get the RA library that handles URL. */
Index: subversion/libsvn_client/prop_commands.c
===================================================================
--- subversion/libsvn_client/prop_commands.c (revision 7744)
+++ subversion/libsvn_client/prop_commands.c (working copy)
@@ -145,8 +145,8 @@
   SVN_ERR (svn_wc_adm_probe_open (&adm_access, NULL, target, TRUE, TRUE,
pool));
   SVN_ERR (svn_wc_entry (&node, target, adm_access, FALSE, pool));
   if (!node)
- return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "'%s' -- not a versioned resource",
+ return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
+ "'%s' is not a versioned resource",
                               target);
 
   if (recurse && node->kind == svn_node_dir)
@@ -374,7 +374,7 @@
       SVN_ERR (svn_wc_adm_open (&adm_access, NULL, pdir, FALSE, FALSE,
pool));
       SVN_ERR (svn_wc_entry (&entry, target, adm_access, FALSE, pool));
       if (! entry)
- return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
+ return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
                                   "'%s' is not a versioned resource",
                                   target);
       *new_target = entry->url;
@@ -429,7 +429,7 @@
     {
       return svn_error_createf
         (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "unknown node kind for \"%s\"",
+ "Unknown node kind for '%s'",
          svn_path_join (target_prefix, target_relative, pool));
     }
   
@@ -534,7 +534,7 @@
             {
               return svn_error_createf
                 (SVN_ERR_ILLEGAL_TARGET, NULL,
- "\"%s\" is a URL, but revision kind requires a working
copy",
+ "'%s' is a URL, but revision kind requires a working
copy",
                  target);
             }
 
@@ -545,7 +545,7 @@
       else
         {
           return svn_error_create
- (SVN_ERR_CLIENT_BAD_REVISION, NULL, "unknown revision kind");
+ (SVN_ERR_CLIENT_BAD_REVISION, NULL, "Unknown revision kind");
         }
 
       SVN_ERR (ra_lib->check_path (session, "", revnum, &kind, pool));
@@ -562,8 +562,8 @@
                                       pool));
       SVN_ERR (svn_wc_entry (&node, target, adm_access, FALSE, pool));
       if (! node)
- return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "'%s' -- not a versioned resource",
target);
+ return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
+ "'%s' is not a versioned resource",
target);
       
       SVN_ERR (svn_client__get_revision_number
                (&revnum, NULL, NULL, revision, target, pool));
@@ -701,7 +701,7 @@
     {
       return svn_error_createf
         (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "unknown node kind for \"%s\"",
+ "Unknown node kind for '%s'",
          svn_path_join (target_prefix, target_relative, pool));
     }
   
@@ -905,7 +905,7 @@
             {
               return svn_error_createf
                 (SVN_ERR_ILLEGAL_TARGET, NULL,
- "\"%s\" is a URL, but revision kind requires a working
copy",
+ "'%s' is a URL, but revision kind requires a working
copy",
                  target);
             }
 
@@ -916,7 +916,7 @@
       else
         {
           return svn_error_create
- (SVN_ERR_CLIENT_BAD_REVISION, NULL, "unknown revision kind");
+ (SVN_ERR_CLIENT_BAD_REVISION, NULL, "Unknown revision kind");
         }
 
       SVN_ERR (ra_lib->check_path (session, "", revnum, &kind, pool));
@@ -933,8 +933,8 @@
                                       pool));
       SVN_ERR (svn_wc_entry (&node, target, adm_access, FALSE, pool));
       if (! node)
- return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "'%s' -- not a versioned resource",
target);
+ return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
+ "'%s' is not a versioned resource",
target);
       
       SVN_ERR (svn_client__get_revision_number
                (&revnum, NULL, NULL, revision, target, pool));
Index: subversion/libsvn_client/auth.c
===================================================================
--- subversion/libsvn_client/auth.c (revision 7744)
+++ subversion/libsvn_client/auth.c (working copy)
@@ -73,7 +73,7 @@
     {
       return svn_error_createf
         (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "unknown node kind for '%s'", path);
+ "Unknown node kind for '%s'", path);
     }
   
   return SVN_NO_ERROR;
Index: subversion/libsvn_client/ra.c
===================================================================
--- subversion/libsvn_client/ra.c (revision 7744)
+++ subversion/libsvn_client/ra.c (working copy)
@@ -307,9 +307,8 @@
                          TRUE, /* show deleted */ pool));
 
   if (! entry)
- return svn_error_createf (SVN_ERR_WC_PATH_NOT_FOUND, NULL,
- "svn_client_uuid_from_path: "
- "can't find entry for '%s'", path);
+ return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
+ "Can't find entry for '%s'", path);
 
   if (entry->uuid)
     {
Index: subversion/libsvn_client/checkout.c
===================================================================
--- subversion/libsvn_client/checkout.c (revision 7744)
+++ subversion/libsvn_client/checkout.c (working copy)
@@ -65,8 +65,7 @@
   if ((revision->kind != svn_opt_revision_number)
       && (revision->kind != svn_opt_revision_date)
       && (revision->kind != svn_opt_revision_head))
- return svn_error_create (SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "Bogus revision passed to
svn_client_checkout");
+ return svn_error_create (SVN_ERR_CLIENT_BAD_REVISION, NULL, NULL);
 
   /* Canonicalize the URL. */
   URL = svn_path_canonicalize (URL, pool);
@@ -94,7 +93,7 @@
       SVN_ERR (ra_lib->check_path (session, "", revnum, &kind, pool));
       if (kind == svn_node_none)
         return svn_error_createf (SVN_ERR_RA_ILLEGAL_URL, NULL,
- "Source URL doesn't exist: %s.", URL);
+ "URL '%s' doesn't exist", URL);
 
       /* Get the repos UUID. */
       SVN_ERR (ra_lib->get_uuid (session, &uuid, pool));
Index: subversion/libsvn_client/cat.c
===================================================================
--- subversion/libsvn_client/cat.c (revision 7744)
+++ subversion/libsvn_client/cat.c (working copy)
@@ -80,7 +80,7 @@
 
   if (url_kind == svn_node_dir)
     return svn_error_createf(SVN_ERR_CLIENT_IS_DIRECTORY, NULL,
- "URL \"%s\" refers to directory", url);
+ "URL '%s' refers to a directory", url);
 
   /* Grab some properties we need to know in order to figure out if
anything
      special needs to be done with this file. */
@@ -123,7 +123,7 @@
       /* rewind our stream. */
       apr_err = apr_file_seek (tmp_file, APR_SET, &off);
       if (apr_err)
- return svn_error_createf (apr_err, NULL, "seek failed on '%s'.",
+ return svn_error_createf (apr_err, NULL, "Seek failed on '%s'.",
                                   tmp_filename);
 
       if (eol_style)
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 7744)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -164,32 +164,27 @@
     {
       return svn_error_createf
         (SVN_ERR_BAD_URL, NULL,
- "URLs have no schemas:\n"
- " '%s'\n"
- " '%s'", url, ent->url);
+ "URLs have no schema ('%s' and '%s')", url, ent->url);
     }
   else if (idx1 == NULL)
     {
       return svn_error_createf
         (SVN_ERR_BAD_URL, NULL,
- "URL has no schema: '%s'\n", url);
+ "URL has no schema: '%s'", url);
     }
   else if (idx2 == NULL)
     {
       return svn_error_createf
         (SVN_ERR_BAD_URL, NULL,
- "URL has no schema: '%s'\n", ent->url);
+ "URL has no schema: '%s'", ent->url);
     }
   else if (((idx1 - url) != (idx2 - ent->url))
            || (strncmp (url, ent->url, idx1 - url) != 0))
     {
       return svn_error_createf
         (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Access method (schema) mixtures not yet supported:\n"
- " '%s'\n"
- " '%s'\n"
- "See http://subversion.tigris.org/issues/show_bug.cgi?id=1321 "
- "for details.", url, ent->url);
+ "Access schema mixtures not yet supported ('%s' and '%s')",
+ url, ent->url);
     }
 
   /* else */
@@ -1173,8 +1168,8 @@
   SVN_ERR (svn_wc_entry (&entry, path, adm_access, FALSE, pool));
   SVN_ERR (svn_wc_adm_close (adm_access));
   if (! entry)
- return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "convert_to_url: '%s' is not versioned",
path);
+ return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
+ "'%s' is not versioned", path);
 
   if (entry->url)
     *url = apr_pstrdup (pool, entry->url);
@@ -1219,8 +1214,8 @@
       || (revision2->kind == svn_opt_revision_unspecified))
     {
       return svn_error_create
- (SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "do_merge: caller failed to specify all revisions");
+ (SVN_ERR_CLIENT_BAD_REVISION, NULL,
+ "Not all required revisions specified");
     }
 
   SVN_ERR (svn_client__default_auth_dir (&auth_dir, target_wcpath, pool));
@@ -1475,8 +1470,8 @@
     return unsupported_diff_error
       (svn_error_create
        (SVN_ERR_INCORRECT_PARAMS, NULL,
- "diff_wc_wc: we only support diffs between a path's text-base "
- "and its working files at this time"));
+ "Only diffs between a path's text-base "
+ "and its working files are supported at this time"));
 
   SVN_ERR (svn_wc_get_actual_target (path1, &anchor, &target, pool));
   SVN_ERR (svn_io_check_path (path1, &kind, pool));
@@ -1809,7 +1804,7 @@
   if ((revision1->kind == svn_opt_revision_unspecified)
       || (revision2->kind == svn_opt_revision_unspecified))
     return svn_error_create (SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "do_diff: not all revisions are specified");
+ "Not all required revisions are specified");
 
   /* Revisions can be said to be local or remote. BASE and WORKING,
      for example, are local. */
@@ -2007,9 +2002,8 @@
 
   SVN_ERR (svn_wc_entry (&entry, target_wcpath, adm_access, FALSE, pool));
   if (entry == NULL)
- return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "Can't merge changes into '%s':"
- "it's not under version control.",
+ return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
+ "'%s' is an unversioned resource",
                               target_wcpath);
 
   merge_cmd_baton.force = force;
Index: subversion/libsvn_client/copy.c
===================================================================
--- subversion/libsvn_client/copy.c (revision 7744)
+++ subversion/libsvn_client/copy.c (working copy)
@@ -77,7 +77,7 @@
   SVN_ERR (svn_io_check_path (src_path, &src_kind, pool));
   if (src_kind == svn_node_none)
     return svn_error_createf (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "path '%s' does not exist.", src_path);
+ "Path '%s' does not exist.", src_path);
 
   /* If DST_PATH does not exist, then its basename will become a new
      file or dir added to its parent (possibly an implicit '.'). If
@@ -96,7 +96,7 @@
     }
   else
     return svn_error_createf (SVN_ERR_ENTRY_EXISTS, NULL,
- "file '%s' already exists.", dst_path);
+ "File '%s' already exists.", dst_path);
 
   if (is_move)
     {
@@ -319,7 +319,7 @@
   /* We can't move something into itself, period. */
   if (svn_path_is_empty (src_rel) && is_move)
     return svn_error_createf (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "cannot move URL '%s' into itself", src_url);
+ "Cannot move URL '%s' into itself", src_url);
 
   /* Get the RA vtable that matches URL. */
   SVN_ERR (svn_ra_init_ra_libs (&ra_baton, pool));
@@ -348,9 +348,8 @@
         {
           return svn_error_createf
             (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Source and dest appear not to be in the same repository:\n"
- " src is '%s'\n"
- " dst is '%s'",
+ "Source and dest appear not to be in the same repository "
+ "(src: '%s'; dst: '%s')",
              src_url, dst_url);
         }
       else
@@ -383,7 +382,7 @@
   if (src_kind == svn_node_none)
     return svn_error_createf
       (SVN_ERR_FS_NOT_FOUND, NULL,
- "path '%s' does not exist in revision '%" SVN_REVNUM_T_FMT "'",
+ "Path '%s' does not exist in revision '%" SVN_REVNUM_T_FMT "'",
        src_url, src_revnum);
 
   /* Figure out the basename that will result from this operation. */
@@ -396,7 +395,7 @@
     {
       /* We disallow the overwriting of files. */
       return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, NULL,
- "fs path '%s' already exists.", dst_rel);
+ "Path '%s' already exists.", dst_rel);
     }
   else if (dst_kind == svn_node_dir)
     {
@@ -412,12 +411,12 @@
                                    &attempt_kind, pool));
       if (attempt_kind != svn_node_none)
         return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, NULL,
- "fs path '%s' already exists.", dst_rel);
+ "Path '%s' already exists.", dst_rel);
     }
   else
     {
       return svn_error_createf (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "unrecognized node kind of '%s'.",
dst_url);
+ "Unrecognized node kind of '%s'.",
dst_url);
     }
 
   /* Create a new commit item and add it to the array. */
@@ -633,7 +632,7 @@
       /* DST_URL is an existing file, which can't be overwritten or
          used as a container, so error out. */
       return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, NULL,
- "file '%s' already exists.", dst_url);
+ "File '%s' already exists.", dst_url);
     }
 
   /* Create a new commit item and add it to the array. */
@@ -784,12 +783,12 @@
       if (SVN_IS_VALID_REVNUM (src_revnum))
         return svn_error_createf
           (SVN_ERR_FS_NOT_FOUND, NULL,
- "path '%s' not found in revision '%" SVN_REVNUM_T_FMT "'",
+ "Path '%s' not found in revision '%" SVN_REVNUM_T_FMT "'",
            src_url, src_revnum);
       else
         return svn_error_createf
           (SVN_ERR_FS_NOT_FOUND, NULL,
- "path '%s' not found in head revision", src_url);
+ "Path '%s' not found in head revision", src_url);
     }
 
   /* There are two interfering sets of cases to watch out for here:
@@ -826,7 +825,7 @@
   else if (dst_kind != svn_node_none) /* must be a file */
     {
       return svn_error_createf (SVN_ERR_ENTRY_EXISTS, NULL,
- "file '%s' already exists.", dst_path);
+ "File '%s' already exists.", dst_path);
     }
 
   /* Now that dst_path has possibly been reset, check that there's
@@ -849,8 +848,7 @@
     if (ent && (ent->kind != svn_node_dir))
       return svn_error_createf
         (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "there is already an entry for '%s'\n"
- " (though the working file is missing)",
+ "Entry for '%s' exists (though the working file is missing)",
          dst_path);
   }
 
@@ -999,7 +997,7 @@
       && svn_path_is_child (src_path, dst_path, pool))
     return svn_error_createf
       (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "cannot copy path '%s' into its own child '%s'",
+ "Cannot copy path '%s' into its own child '%s'",
        src_path, dst_path);
 
   if (is_move)
@@ -1009,7 +1007,7 @@
           if (strcmp (src_path, dst_path) == 0)
             return svn_error_createf
               (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "cannot move path '%s' into itself",
+ "Cannot move path '%s' into itself",
                src_path);
         }
       else
@@ -1017,7 +1015,7 @@
           /* Disallow moves between the working copy and the repository. */
           return svn_error_create
             (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "no support for repos <--> working copy moves");
+ "No support for repos <--> working copy moves");
         }
 
       /* It doesn't make sense to specify revisions in a move. */
@@ -1032,7 +1030,7 @@
         {
           return svn_error_create
             (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "cannot specify revisions with move operations");
+ "Cannot specify revisions with move operations");
         }
     }
   else
@@ -1054,8 +1052,8 @@
 
               if (! entry)
                 return svn_error_createf
- (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "Source path '%s' is not under version control.",
src_path);
+ (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
+ "'%s' is an unversioned resource", src_path);
 
               src_path = entry->url;
               src_is_url = TRUE;
Index: subversion/libsvn_client/blame.c
===================================================================
--- subversion/libsvn_client/blame.c (revision 7744)
+++ subversion/libsvn_client/blame.c (working copy)
@@ -361,8 +361,7 @@
   if (start->kind == svn_opt_revision_unspecified
       || end->kind == svn_opt_revision_unspecified)
     return svn_error_create
- (SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "svn_client_blame: caller failed to supply revisions");
+ (SVN_ERR_CLIENT_BAD_REVISION, NULL, NULL);
 
   iterpool = svn_pool_create (pool);
 
@@ -389,13 +388,13 @@
   if (end_revnum < start_revnum)
     return svn_error_create
       (SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "svn_client_blame: start revision must precede end revision");
+ "Start revision must precede end revision");
 
   SVN_ERR (ra_lib->check_path (session, "", end_revnum, &kind, pool));
 
   if (kind == svn_node_dir)
     return svn_error_createf (SVN_ERR_CLIENT_IS_DIRECTORY, NULL,
- "URL \"%s\" refers to directory", url);
+ "URL '%s' refers to directory", url);
 
   condensed_targets = apr_array_make (pool, 1, sizeof (const char *));
   (*((const char **)apr_array_push (condensed_targets))) = "";
@@ -458,7 +457,7 @@
           SVN_ERR (svn_diff_output (diff, &db, &output_fns));
           apr_err = apr_file_remove (last, iterpool);
           if (apr_err != APR_SUCCESS)
- return svn_error_createf (apr_err, NULL, "error removing %s",
+ return svn_error_createf (apr_err, NULL, "Error removing '%s'",

                                       last);
         }
       else
@@ -469,7 +468,7 @@
 
   apr_err = apr_file_open (&file, last, APR_READ, APR_OS_DEFAULT, pool);
   if (apr_err != APR_SUCCESS)
- return svn_error_createf (apr_err, NULL, "error opening %s", last);
+ return svn_error_createf (apr_err, NULL, "Error opening '%s'", last);
 
   stream = svn_stream_from_aprfile (file, pool);
   for (walk = db.blame; walk; walk = walk->next)
@@ -493,9 +492,10 @@
 
   SVN_ERR (svn_stream_close (stream));
   SVN_ERR (svn_io_file_close (file, pool));
+
   apr_err = apr_file_remove (last, pool);
   if (apr_err != APR_SUCCESS)
- return svn_error_createf (apr_err, NULL, "error removing %s", last);
+ return svn_error_createf (apr_err, NULL, "Error removing '%s'", last);
 
   apr_pool_destroy (iterpool);
   return SVN_NO_ERROR;
Index: subversion/libsvn_client/log.c
===================================================================
--- subversion/libsvn_client/log.c (revision 7744)
+++ subversion/libsvn_client/log.c (working copy)
@@ -71,7 +71,7 @@
     {
       return svn_error_create
         (SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "svn_client_log: caller failed to supply revision");
+ "Missing required revision specification");
     }
 
   start_revnum = end_revnum = SVN_INVALID_REVNUM;
@@ -141,7 +141,7 @@
           if (! entry->url)
             return svn_error_createf
               (SVN_ERR_ENTRY_MISSING_URL, NULL,
- "svn_client_log: entry '%s' has no URL", target);
+ "Entry '%s' has no URL", target);
           URL = apr_pstrdup (pool, entry->url);
           SVN_ERR (svn_wc_adm_close (adm_access));
           (*((const char **)apr_array_push (target_urls))) = URL;
Index: subversion/libsvn_client/update.c
===================================================================
--- subversion/libsvn_client/update.c (revision 7744)
+++ subversion/libsvn_client/update.c (working copy)
@@ -73,11 +73,11 @@
   if (! entry)
     return svn_error_createf
       (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "svn_client_update: '%s' is not under version control", anchor);
+ "'%s' is an unversioned resource", anchor);
   if (! entry->url)
     return svn_error_createf
       (SVN_ERR_ENTRY_MISSING_URL, NULL,
- "svn_client_update: entry '%s' has no URL", anchor);
+ "Entry '%s' has no URL", anchor);
   URL = apr_pstrdup (pool, entry->url);
 
   /* Get revnum set to something meaningful, so we can fetch the
Index: subversion/libsvn_client/commit_util.c
===================================================================
--- subversion/libsvn_client/commit_util.c (revision 7744)
+++ subversion/libsvn_client/commit_util.c (working copy)
@@ -208,7 +208,7 @@
      entry was written. */
   if ((entry->kind != svn_node_file) && (entry->kind != svn_node_dir))
     return svn_error_createf
- (SVN_ERR_NODE_UNKNOWN_KIND, NULL, "Unknown entry kind for \"%s\"",
path);
+ (SVN_ERR_NODE_UNKNOWN_KIND, NULL, "Unknown entry kind for '%s'",
path);
 
   SVN_ERR (svn_io_check_path (path, &kind, pool));
 
@@ -217,7 +217,7 @@
       && (kind != svn_node_none))
     {
       return svn_error_createf
- (SVN_ERR_NODE_UNKNOWN_KIND, NULL, "Unknown kind for \"%s\"", path);
+ (SVN_ERR_NODE_UNKNOWN_KIND, NULL, "Unknown entry kind for '%s'",
path);
     }
 
   /* Get a fully populated entry for PATH if we can, and check for
@@ -614,8 +614,7 @@
           if (! p_entry)
             return svn_error_createf
               (SVN_ERR_WC_CORRUPT, NULL,
- "Entry for '%s' is scheduled for addition, yet its parent\n"
- "directory does not appear to be under version control",
+ "'%s' is scheduled for addition within unversioned parent",
                target);
           if ((p_entry->schedule == svn_wc_schedule_add)
               || (p_entry->schedule == svn_wc_schedule_replace))
Index: subversion/libsvn_client/add.c
===================================================================
--- subversion/libsvn_client/add.c (revision 7744)
+++ subversion/libsvn_client/add.c (working copy)
@@ -312,7 +312,7 @@
       apr_err = apr_dir_close (dir);
       if (apr_err)
         return svn_error_createf
- (apr_err, NULL, "error closing dir '%s'", dirname);
+ (apr_err, NULL, "error closing directory '%s'", dirname);
     }
 
   /* Opened by svn_wc_add */
Index: subversion/libsvn_client/commit.c
===================================================================
--- subversion/libsvn_client/commit.c (revision 7744)
+++ subversion/libsvn_client/commit.c (working copy)
@@ -293,7 +293,7 @@
   if (! (APR_STATUS_IS_ENOENT (err->apr_err)))
     {
       return svn_error_createf
- (err->apr_err, err, "error during import of '%s'", path);
+ (err->apr_err, err, "Error during import of '%s'", path);
     }
   /* Yes, it exited cleanly, so close the dir. */
   else
@@ -301,7 +301,7 @@
       svn_error_clear (err);
       if ((apr_err = apr_dir_close (dir)))
         return svn_error_createf
- (apr_err, NULL, "error closing dir '%s'", path);
+ (apr_err, NULL, "Error closing dir '%s'", path);
     }
 
   svn_pool_destroy (subpool);
@@ -406,7 +406,7 @@
           if (! new_entry)
             return svn_error_create
                 (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "new entry name required when importing a file");
+ "New entry name required when importing a file");
 
           SVN_ERR (import_file (editor, root_baton,
                                 path, new_entry, ctx, pool));
@@ -516,7 +516,7 @@
                                       &kind, pool));
       if (kind == svn_node_none)
         return svn_error_createf (SVN_ERR_FS_NO_SUCH_ENTRY, NULL,
- "the path '%s' does not exist",
+ "Path '%s' does not exist",
                                   base_url);
     }
 
@@ -646,14 +646,14 @@
       if (kind == svn_node_file && (! new_entry))
         return svn_error_createf
           (SVN_ERR_ENTRY_EXISTS, NULL,
- "the path \"%s\" already exists", url);
+ "Path '%s' already exists", url);
     }
 
   /* The repository doesn't know about the reserved. */
   if (new_entry && (strcmp (new_entry, SVN_WC_ADM_DIR_NAME) == 0))
     return svn_error_createf
       (SVN_ERR_CL_ADM_DIR_RESERVED, NULL,
- "the name \"%s\" is reserved and cannot be imported",
+ "'%s' is a reserved name and cannot be imported",
        SVN_WC_ADM_DIR_NAME);
 
 

-- 
NEU FÜR ALLE - GMX MediaCenter - für Fotos, Musik, Dateien...
Fotoalbum, File Sharing, MMS, Multimedia-Gruß, GMX FotoService
Jetzt kostenlos anmelden unter http://www.gmx.net
+++ GMX - die erste Adresse für Mail, Message, More! +++
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 14 19:58:47 2003

This is an archived mail posted to the Subversion Dev mailing list.