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

Re: [PATCH] libsvn_wc: issue # 897 error messages (work-in-progress)

From: David Kimdon <david_at_kimdon.org>
Date: 2003-11-16 00:57:55 CET

On Sat, Nov 15, 2003 at 10:46:28PM +0100, Erik Huelsmann wrote:
>
> My continuing story with issue #897 has led to another patch. I took on
> libsvn_wc. The patch is a work in progress, but since I am not really satisfied
> with some of the rephrasing, I decided to ask you what you think of it.

This patch can be applied on top of your original patch. The changes
that look like no-ops are changing tabs to spaces.

-David

diff -u subversion/libsvn_wc/props.c subversion/libsvn_wc/props.c
--- subversion/libsvn_wc/props.c (working copy)
+++ subversion/libsvn_wc/props.c (working copy)
@@ -783,7 +783,7 @@
   if (err)
     return
       svn_error_quick_wrap
- (err, "Failed to load props from disk.");
+ (err, "Failed to load properties from disk.");
 
   *value = apr_hash_get (prophash, name, APR_HASH_KEY_STRING);
   return SVN_NO_ERROR;
@@ -806,7 +806,7 @@
   if (err)
     return
       svn_error_quick_wrap
- (err, "Failed to load props from disk.");
+ (err, "Failed to load properties from disk.");
 
   /* Now we have all the properties in our hash. Simply merge the new
      property into it. */
@@ -823,7 +823,7 @@
   apr_err = svn_hash_write (prophash, fp, pool);
   if (apr_err)
     return svn_error_createf (apr_err, NULL,
- "Can't write prop hash for '%s'", path);
+ "Cannot write property hash for '%s'", path);
   
   /* Close file, and doing an atomic "move". */
   SVN_ERR (svn_wc__close_props (fp, path, 0, 1,
@@ -1099,7 +1099,7 @@
   if (err)
     return
       svn_error_quick_wrap
- (err, "Failed to load props from disk.");
+ (err, "Failed to load properties from disk.");
 
   /* If we're changing this file's list of expanded keywords, then
    * we'll need to invalidate its text timestamp, since keyword
@@ -1130,7 +1130,7 @@
   apr_err = svn_hash_write (prophash, fp, pool);
   if (apr_err)
     return svn_error_createf (apr_err, NULL,
- "Can't write prop hash for '%s'", path);
+ "Cannot write property hash for '%s'", path);
   
   /* Close file, and doing an atomic "move". */
   SVN_ERR (svn_wc__close_props (fp, path, 0, 0,
diff -u subversion/libsvn_wc/entries.c subversion/libsvn_wc/entries.c
--- subversion/libsvn_wc/entries.c (working copy)
+++ subversion/libsvn_wc/entries.c (working copy)
@@ -1407,15 +1407,15 @@
         return
           svn_error_createf
           (SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
- "Can't add '%s' to deleted directory"
- " -- try undeleting its parent directory first",
+ "Can't add '%s' to deleted directory;"
+ "Try undeleting its parent directory first",
            name);
       if (*schedule == svn_wc_schedule_replace)
         return
           svn_error_createf
           (SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
- "Can't replace '%s' in deleted directory"
- " -- try undeleting its parent directory first",
+ "Can't replace '%s' in deleted directory;"
+ "Try undeleting its parent directory first",
            name);
     }
 
@@ -1423,7 +1423,7 @@
     {
       return svn_error_createf
         (SVN_ERR_WC_SCHEDULE_CONFLICT, NULL,
- "'%s' is marked as absent, so cannot be scheduled for addition",
+ "'%s' is marked as absent, so it cannot be scheduled for addition",
          name);
     }
 
@@ -1830,3 +1830,3 @@
                               "Unexpectedly found '%s': "
- "path is marked 'missing'", path);
+ "path is marked 'missing'", path);
 }
diff -u subversion/libsvn_wc/copy.c subversion/libsvn_wc/copy.c
--- subversion/libsvn_wc/copy.c (working copy)
+++ subversion/libsvn_wc/copy.c (working copy)
@@ -170,15 +170,15 @@
   if (! src_entry)
     return svn_error_createf
       (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "Cannot copy or move '%s': it's not under version control",
+ "Cannot copy or move '%s': it is not under version control",
        src_path);
   if ((src_entry->schedule == svn_wc_schedule_add)
       || (! src_entry->url)
       || (src_entry->copied))
     return svn_error_createf
       (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Cannot copy or move '%s': it's not in the repository yet; "
- "try committing first",
+ "Cannot copy or move '%s': it is not in the repository yet; "
+ "Try committing first",
        src_path);
 
   /* Now, make an actual copy of the working file. */
@@ -292,7 +292,7 @@
       || (src_entry->copied))
     return svn_error_createf
       (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Not allowed to copy or move '%s': it's not in the repository yet; "
+ "Not allowed to copy or move '%s': it is not in the repository yet; "
        "Try committing first",
        src_path);
 
diff -u subversion/libsvn_wc/adm_crawler.c subversion/libsvn_wc/adm_crawler.c
--- subversion/libsvn_wc/adm_crawler.c (working copy)
+++ subversion/libsvn_wc/adm_crawler.c (working copy)
@@ -353,8 +353,8 @@
             {
               return svn_error_createf
                 (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "The entry '%s' is not a directory, "
- "which blocks updates; remove entry before updating",
+ "The entry '%s' is no longer a directory. "
+ "The update cannot continue. Remove the entry before updating",
                  this_path);
             }
 
@@ -670,7 +670,7 @@
                   return svn_error_createf
                     (SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
                      "Checksum mismatch for '%s': "
- "expected '%s', actual: '%s'",
+ "expected '%s', actual: '%s'",
                      tb, ent->checksum, base_digest_hex);
                 }
             }
diff -u subversion/libsvn_wc/log.c subversion/libsvn_wc/log.c
--- subversion/libsvn_wc/log.c (working copy)
+++ subversion/libsvn_wc/log.c (working copy)
@@ -667,7 +667,7 @@
       || ((! is_this_dir) && (orig_entry->kind != svn_node_file)))
     return svn_error_createf (pick_error_code (loggy), NULL,
                               "Log command for directory '%s' is mislocated",
- name);
+ name);
 
   entry = svn_wc_entry_dup (orig_entry, pool);
 
@@ -834,7 +834,7 @@
       tmpf = svn_wc__text_base_path (wf, 1, pool);
       if ((err = svn_io_check_path (tmpf, &kind, pool)))
         return svn_error_createf (pick_error_code (loggy), err,
- "Error checking existence of %s", name);
+ "Error checking existence of '%s'", name);
       if (kind == svn_node_file)
         {
           svn_boolean_t modified;
@@ -1191,7 +1191,7 @@
                                    NULL,
                                    "Unrecognized logfile element '%s' in '%s'",
                                    eltname,
- svn_wc_adm_access_path (loggy->adm_access)));
+ svn_wc_adm_access_path (loggy->adm_access)));
       return;
     }
 
diff -u subversion/libsvn_wc/adm_files.c subversion/libsvn_wc/adm_files.c
--- subversion/libsvn_wc/adm_files.c (working copy)
+++ subversion/libsvn_wc/adm_files.c (working copy)
@@ -195,7 +195,7 @@
          segfault or other obvious indicator that something went
          wrong. Even so, not sure if it's appropriate. Thoughts? */
       err = svn_error_create
- (0, NULL, "bad type indicator");
+ (0, NULL, "Bad type indicator");
     }
 
   return err;
@@ -658,8 +658,8 @@
 
   if (base && wcprops)
     return svn_error_create (SVN_ERR_WC_PATH_NOT_FOUND, NULL,
- "no such thing as 'base' "
- "working copy properties!");
+ "No such thing as 'base' "
+ "working copy properties!");
 
   else if (base)
     {
@@ -733,8 +733,8 @@
 
   if (base && wcprops)
     return svn_error_create (SVN_ERR_WC_PATH_NOT_FOUND, NULL,
- "no such thing as 'base' "
- "working copy properties!");
+ "No such thing as 'base' "
+ "working copy properties!");
 
   else if (base)
     {
@@ -797,8 +797,8 @@
 
   if (base && wcprops)
     return svn_error_create (SVN_ERR_WC_PATH_NOT_FOUND, NULL,
- "no such thing as 'base' "
- "working copy properties!");
+ "No such thing as 'base' "
+ "working copy properties!");
 
   else if (base)
     {
diff -u subversion/libsvn_wc/update_editor.c subversion/libsvn_wc/update_editor.c
--- subversion/libsvn_wc/update_editor.c (working copy)
+++ subversion/libsvn_wc/update_editor.c (working copy)
@@ -1467,7 +1467,7 @@
   if ((! adding) && (! entry))
     return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
                               "File '%s' in directory '%s' "
- "is not a versioned resource",
+ "is not under version control",
                               fb->name, pb->path);
   
   /* ### todo: right now the incoming copyfrom* args are being
@@ -2709,7 +2709,7 @@
   if (! entry)
     return svn_error_createf
       (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not a versioned resource", path);
+ "'%s' is not under version control", path);
   if (kind)
     *kind = entry->kind;
 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Nov 16 00:06:45 2003

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