svn commit: r930145 - in /subversion/trunk/subversion/libsvn_wc: workqueue.c workqueue.h

[gs...@apache.org]

Author: gstein
Date: Fri Apr  2 01:11:16 2010
New Revision: 930145

URL: http://svn.apache.org/viewvc?rev=930145&view=rev
Log:
Provide a bit of flexibility for svn_wc__wq_add_loggy()

* subversion/libsvn_wc/workqueue.h:
  (svn_wc__wq_add_loggy): note that the log content can be NULL or empty

* subversion/libsvn_wc/workqueue.c:
  (svn_wc__wq_add_loggy): don't queue a work item if the log_content is
    NULL or has no instructions

Modified:
    subversion/trunk/subversion/libsvn_wc/workqueue.c
    subversion/trunk/subversion/libsvn_wc/workqueue.h

Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=930145&r1=930144&r2=930145&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Fri Apr  2 01:11:16 2010
@@ -937,7 +937,12 @@ svn_wc__wq_add_loggy(svn_wc__db_t *db,
                      const svn_stringbuf_t *log_content,
                      apr_pool_t *scratch_pool)
 {
-  svn_skel_t *work_item = svn_skel__make_empty_list(scratch_pool);
+  svn_skel_t *work_item;
+
+  if (log_content == NULL || svn_stringbuf_isempty(log_content))
+    return SVN_NO_ERROR;
+
+  work_item = svn_skel__make_empty_list(scratch_pool);
 
   /* The skel still points at ADM_ABSPATH and LOG_CONTENT, but the skel will
      be serialized just below in the wq_add call.  */

Modified: subversion/trunk/subversion/libsvn_wc/workqueue.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.h?rev=930145&r1=930144&r2=930145&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.h (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.h Fri Apr  2 01:11:16 2010
@@ -129,7 +129,11 @@ svn_wc__wq_add_killme(svn_wc__db_t *db,
                       apr_pool_t *scratch_pool);
 
 
-/* ### temporary compat for mapping the old loggy into workqueue space.  */
+/* ### temporary compat for mapping the old loggy into workqueue space.
+
+   LOG_CONTENT may be NULL or reference an empty log. No work item will be
+   queued in this case.
+*/
 svn_error_t *
 svn_wc__wq_add_loggy(svn_wc__db_t *db,
                      const char *adm_abspath,