You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/02/09 23:59:03 UTC
svn commit: r1069162 - in /subversion/trunk/subversion/libsvn_wc: upgrade.c
wc_db.c wc_db.h
Author: hwright
Date: Wed Feb 9 22:59:02 2011
New Revision: 1069162
URL: http://svn.apache.org/viewvc?rev=1069162&view=rev
Log:
Remove a no-longer-needed wc_db temp function.
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_temp_reset_format): Remove.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_temp_reset_format): Remove.
* subversion/libsvn_wc/upgrade.c
(upgrade_to_wcng): Don't bother calling the old function.
Modified:
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1069162&r1=1069161&r2=1069162&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Wed Feb 9 22:59:02 2011
@@ -1263,8 +1263,6 @@ upgrade_to_wcng(void **dir_baton,
entries_write_new() writes in current format rather than
f12. Thus, this function bumps a working copy all the way to
current. */
- SVN_ERR(svn_wc__db_temp_reset_format(SVN_WC__VERSION, db,
- data->root_abspath, scratch_pool));
SVN_ERR(svn_wc__db_wclock_obtain(db, data->root_abspath, 0, FALSE,
scratch_pool));
}
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1069162&r1=1069161&r2=1069162&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Feb 9 22:59:02 2011
@@ -7225,41 +7225,6 @@ svn_wc__db_temp_get_format(int *format,
return SVN_NO_ERROR;
}
-
-/* ### temporary API. remove before release. */
-svn_error_t *
-svn_wc__db_temp_reset_format(int format,
- svn_wc__db_t *db,
- const char *local_dir_abspath,
- apr_pool_t *scratch_pool)
-{
- svn_wc__db_pdh_t *pdh;
-
- SVN_ERR_ASSERT(svn_dirent_is_absolute(local_dir_abspath));
- SVN_ERR_ASSERT(format >= 1);
- /* ### assert that we were passed a directory? */
-
- /* Do not create a PDH. If we don't have one, then we don't have any
- cached version information. */
- pdh = svn_wc__db_pdh_get_or_create(db, local_dir_abspath, FALSE,
- scratch_pool);
- if (pdh != NULL)
- {
- /* ### ideally, we would reset this to UNKNOWN, and then read the working
- ### copy to see what format it is in. however, we typically *write*
- ### whatever we *read*. so to break the cycle and write a different
- ### version (during upgrade), then we have to force a new format. */
-
- /* ### since this is a temporary API, I feel I can indulge in a hack
- ### here. If we are upgrading *to* wc-ng, we need to blow away the
- ### pdh->wcroot member. If we are upgrading to format 11 (pre-wc-ng),
- ### we just need to store the format number. */
- pdh->wcroot = NULL;
- }
-
- return SVN_NO_ERROR;
-}
-
/* ### temporary API. remove before release. */
svn_error_t *
svn_wc__db_temp_forget_directory(svn_wc__db_t *db,
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1069162&r1=1069161&r2=1069162&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Wed Feb 9 22:59:02 2011
@@ -2303,14 +2303,6 @@ svn_wc__db_temp_get_format(int *format,
const char *local_dir_abspath,
apr_pool_t *scratch_pool);
-/* ### reset any cached format version. it has probably changed. */
-svn_error_t *
-svn_wc__db_temp_reset_format(int format,
- svn_wc__db_t *db,
- const char *local_dir_abspath,
- apr_pool_t *scratch_pool);
-
-
/* ### temp functions to manage/store access batons within the DB. */
svn_wc_adm_access_t *
svn_wc__db_temp_get_access(svn_wc__db_t *db,