subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1549825 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_client/cleanup.c libsvn_wc/cleanup.c libsvn_wc/deprecated.c
Date Tue, 10 Dec 2013 12:14:12 GMT
Author: rhuijben
Date: Tue Dec 10 12:14:12 2013
New Revision: 1549825

URL: http://svn.apache.org/r1549825
Log:
Extend the new in 1.9 svn_wc_cleanup4() api with notification support.
This will allow future patches to add some information on where the time
is spent during the cleanup (that used to be +- instant in 1.6).

* subversion/include/svn_wc.h
  (svn_wc_cleanup4): Update prototype.

* subversion/libsvn_client/cleanup.c
  (do_cleanup): Update caller.

* subversion/libsvn_wc/cleanup.c
  (svn_wc_cleanup4): Update prototype.

* subversion/libsvn_wc/deprecated.c
  (svn_wc_cleanup3): Update caller.

Modified:
    subversion/trunk/subversion/include/svn_wc.h
    subversion/trunk/subversion/libsvn_client/cleanup.c
    subversion/trunk/subversion/libsvn_wc/cleanup.c
    subversion/trunk/subversion/libsvn_wc/deprecated.c

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1549825&r1=1549824&r2=1549825&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Tue Dec 10 12:14:12 2013
@@ -7353,11 +7353,14 @@ svn_wc_cleanup4(svn_wc_context_t *wc_ctx
                 svn_boolean_t vacuum_pristines,
                 svn_cancel_func_t cancel_func,
                 void *cancel_baton,
+                svn_wc_notify_func2_t notify_func,
+                void *notify_baton,
                 apr_pool_t *scratch_pool);
 
 /**
  * Similar to svn_wc_cleanup4() but will always break locks, fix recorded
- * timestamps, clear the dav cache and vacuum pristines.
+ * timestamps, clear the dav cache and vacuum pristines. This function also
+ * doesn't support notifications.
  *
  * @since New in 1.7.
  * @deprecated Provided for backward compatibility with the 1.8 API.

Modified: subversion/trunk/subversion/libsvn_client/cleanup.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cleanup.c?rev=1549825&r1=1549824&r2=1549825&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_client/cleanup.c Tue Dec 10 12:14:12 2013
@@ -82,6 +82,7 @@ do_cleanup(const char *local_abspath,
                           clear_dav_cache,
                           vacuum_pristines,
                           ctx->cancel_func, ctx->cancel_baton,
+                          ctx->notify_func2, ctx->notify_baton2,
                           scratch_pool));
 
   if (fix_timestamps)

Modified: subversion/trunk/subversion/libsvn_wc/cleanup.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/cleanup.c?rev=1549825&r1=1549824&r2=1549825&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_wc/cleanup.c Tue Dec 10 12:14:12 2013
@@ -206,6 +206,8 @@ svn_wc_cleanup4(svn_wc_context_t *wc_ctx
                 svn_boolean_t vacuum_pristines,
                 svn_cancel_func_t cancel_func,
                 void *cancel_baton,
+                svn_wc_notify_func2_t notify_func,
+                void *notify_baton,
                 apr_pool_t *scratch_pool)
 {
   svn_wc__db_t *db;

Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=1549825&r1=1549824&r2=1549825&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Tue Dec 10 12:14:12 2013
@@ -4202,6 +4202,7 @@ svn_wc_cleanup3(svn_wc_context_t *wc_ctx
                             TRUE /* clear_dav_cache */,
                             TRUE /* clean_pristines */,
                             cancel_func, cancel_baton,
+                            NULL, NULL /* notify */,
                             scratch_pool));
 }
 



Mime
View raw message