svn commit: r1095446 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_client/prop_commands.c svn/notify.c

[hw...@apache.org]

Author: hwright
Date: Wed Apr 20 16:04:23 2011
New Revision: 1095446

URL: http://svn.apache.org/viewvc?rev=1095446&view=rev
Log:
Replace the generic warning notification with one specific to the current
application (at the request of Bert, on behalf of GUI API consumers).

* subversion/svn/notify.c
  (notify): Handle the updated notification type.

* subversion/include/svn_wc.h
  (svn_wc_notify_warning): Remove.
  (svn_wc_notify_path_nonexistent): New.
  (svn_wc_notify_t): Update docs.
 
* subversion/libsvn_client/prop_commands.c
  (svn_client_propset4): Use the more specific notification type.

Modified:
    subversion/trunk/subversion/include/svn_wc.h
    subversion/trunk/subversion/libsvn_client/prop_commands.c
    subversion/trunk/subversion/svn/notify.c

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1095446&r1=1095445&r2=1095446&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Wed Apr 20 16:04:23 2011
@@ -1170,9 +1170,9 @@ typedef enum svn_wc_notify_action_t
    * @since New in 1.7. */
   svn_wc_notify_url_redirect,
 
-  /** A warning has been issued.
+  /** The operation was attempted on a path which doesn't exist.
    * @since New in 1.7. */
-  svn_wc_notify_warning
+  svn_wc_notify_path_nonexistent
 
 } svn_wc_notify_action_t;
 
@@ -1281,8 +1281,7 @@ typedef struct svn_wc_notify_t {
 
   /** Points to an error describing the reason for the failure when @c
    * action is one of the following: #svn_wc_notify_failed_lock,
-   * #svn_wc_notify_failed_unlock, #svn_wc_notify_failed_external,
-   * #svn_wc_notify_warning.
+   * #svn_wc_notify_failed_unlock, #svn_wc_notify_failed_external.
    * Is @c NULL otherwise. */
   svn_error_t *err;
 

Modified: subversion/trunk/subversion/libsvn_client/prop_commands.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/prop_commands.c?rev=1095446&r1=1095445&r2=1095446&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/prop_commands.c (original)
+++ subversion/trunk/subversion/libsvn_client/prop_commands.c Wed Apr 20 16:04:23 2011
@@ -457,11 +457,10 @@ svn_client_propset4(const char *propname
               if (ctx->notify_func2)
                 {
                   svn_wc_notify_t *notify = svn_wc_create_notify(
-                                                    target_abspath,
-                                                    svn_wc_notify_warning,
-                                                    iterpool);
+                                              target_abspath,
+                                              svn_wc_notify_path_nonexistent,
+                                              iterpool);
 
-                  notify->err = err;
                   ctx->notify_func2(ctx->notify_baton2, notify, iterpool);
                 }
 

Modified: subversion/trunk/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1095446&r1=1095445&r2=1095446&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Wed Apr 20 16:04:23 2011
@@ -951,8 +951,11 @@ notify(void *baton, const svn_wc_notify_
         goto print_error;
       break;
 
-    case svn_wc_notify_warning:
-      svn_handle_warning2(stderr, n->err, "svn: ");
+    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: