You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2010/04/20 06:10:03 UTC
svn commit: r935797 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Author: gstein
Date: Tue Apr 20 04:10:03 2010
New Revision: 935797
URL: http://svn.apache.org/viewvc?rev=935797&view=rev
Log:
Simplify a bit of the postcommit processing.
* subversion/libsvn_wc/adm_ops.c:
(process_deletion_postcommit): folded into ...
(process_committed_leaf): ... here. just a single call to
svn_wc__wq_add_deletion_postcommit
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=935797&r1=935796&r2=935797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Apr 20 04:10:03 2010
@@ -323,25 +323,6 @@ svn_wc__do_update_cleanup(svn_wc__db_t *
}
-/* */
-static svn_error_t *
-process_deletion_postcommit(svn_wc__db_t *db,
- const char *adm_abspath,
- const char *local_abspath,
- svn_revnum_t new_revision,
- svn_boolean_t no_unlock,
- apr_pool_t *scratch_pool)
-{
-#ifdef NOT_NEEDED_NOW__CALLER_DOES_THIS
- SVN_ERR(svn_wc__write_check(db, adm_abspath, scratch_pool));
-#endif
-
- return svn_error_return(svn_wc__wq_add_deletion_postcommit(
- db, local_abspath, new_revision, no_unlock,
- scratch_pool));
-}
-
-
/* CHECKSUM is the checksum of the new text base for LOCAL_ABSPATH, and must
* be provided if there is one, else NULL. */
static svn_error_t *
@@ -387,9 +368,8 @@ process_committed_leaf(svn_wc__db_t *db,
if (status == svn_wc__db_status_deleted
|| status == svn_wc__db_status_obstructed_delete)
{
- return svn_error_return(process_deletion_postcommit(
- db, adm_abspath, local_abspath,
- new_revnum, no_unlock,
+ return svn_error_return(svn_wc__wq_add_deletion_postcommit(
+ db, local_abspath, new_revnum, no_unlock,
scratch_pool));
}