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

Re: [PATCH] Revision 2 of libsvn_client changes for issue 897

From: David Kimdon <david_at_kimdon.org>
Date: 2003-11-15 02:43:36 CET

Very nice cleanup. Some notes below. In all cases, feel free to take
or not take these suggestions as you see fit.

-David

On Fri, Nov 14, 2003 at 07:57:37PM +0100, Erik Huelsmann wrote:

> 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);

Sometimes we say, 'not a versioned resource' . . .

>
> /* 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);

and sometimes we say 'is an unversioned resource' . . .

> Index: subversion/libsvn_client/prop_commands.c
> ===================================================================
> --- subversion/libsvn_client/prop_commands.c (revision 7744)
> +++ subversion/libsvn_client/prop_commands.c (working copy)
> @@ -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);
>

and sometimes we say, 'is not versioned', maybe this is confusing.
Perhaps we should say it the same way each time. Oh, I just read the
other not in this thread, hmm, well you have my blessing :-)

> Index: subversion/libsvn_client/copy.c
> ===================================================================
> --- subversion/libsvn_client/copy.c (revision 7744)
> +++ subversion/libsvn_client/copy.c (working copy)
> @@ -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);

                                                 node kind for

I can understand how 'of' can make sense, but to me using 'of' could
easily be misunderstood to mean that 'dst_url' is a kind of node.

> Index: subversion/libsvn_client/blame.c
> ===================================================================
> --- subversion/libsvn_client/blame.c (revision 7744)
> +++ subversion/libsvn_client/blame.c (working copy)
> @@ -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);

                                                  to a directory

The article makes it sound more like a human rather than a computer
talking.

> 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);

                             "Error

That's all,

-David

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Nov 15 01:52:17 2003

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