subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1166096 - in /subversion/trunk/subversion: include/svn_repos.h svnadmin/main.c
Date Wed, 07 Sep 2011 10:19:32 GMT
Author: danielsh
Date: Wed Sep  7 10:19:32 2011
New Revision: 1166096

URL: http://svn.apache.org/viewvc?rev=1166096&view=rev
Log:
Teach the svn_repos_notify_* interface to say "I won't repeat this warning
in the future".

* subversion/include/svn_repos.h
  (svn_repos_notify_t): New member LAST_WARNING.

* subversion/svnadmin/main.c
  (repos_notify_handler): Consume new member.

Modified:
    subversion/trunk/subversion/include/svn_repos.h
    subversion/trunk/subversion/svnadmin/main.c

Modified: subversion/trunk/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1166096&r1=1166095&r2=1166096&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Wed Sep  7 10:19:32 2011
@@ -315,6 +315,10 @@ typedef struct svn_repos_notify_t
   /** For #svn_repos_notify_load_node_start, the path of the node. */
   const char *path;
 
+  /** Whether future instances of this warning will be suppressed.
+   * @since New in 1.8. */
+  svn_boolean_t last_warning;
+
   /* NOTE: Add new fields at the end to preserve binary compatibility.
      Also, if you add fields here, you have to update
      svn_repos_notify_create(). */

Modified: subversion/trunk/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/main.c?rev=1166096&r1=1166095&r2=1166096&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/main.c (original)
+++ subversion/trunk/subversion/svnadmin/main.c Wed Sep  7 10:19:32 2011
@@ -678,6 +678,12 @@ repos_notify_handler(void *baton,
       svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
                                         "WARNING 0x%04x: %s\n", notify->warning,
                                         notify->warning_str));
+      if (notify->last_warning)
+        svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                                          "WARNING 0x%04x: %s\n",
+                                          notify->warning,
+                                          _("Future instances of this warning "
+                                            "will be suppressed\n")));
       return;
 
     case svn_repos_notify_dump_rev_end:



Mime
View raw message