Author: julianfoad
Date: Wed May 26 12:31:24 2010
New Revision: 948409
URL: http://svn.apache.org/viewvc?rev=948409&view=rev
Log:
Hide some WC-1-only text-base functions when SVN_EXPERIMENTAL_PRISTINE is
defined.
* subversion/libsvn_wc/adm_files.h,
subversion/libsvn_wc/adm_files.c
(svn_wc__sync_text_base, svn_wc__text_base_path, svn_wc__text_revert_path,
svn_wc__text_revert_path_to_read): Hide in #ifndef
SVN_EXPERIMENTAL_PRISTINE.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_files.c
subversion/trunk/subversion/libsvn_wc/adm_files.h
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=948409&r1=948408&r2=948409&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Wed May 26 12:31:24 2010
@@ -188,6 +188,7 @@ make_adm_subdir(const char *path,
/*** Syncing files in the adm area. ***/
+#ifndef SVN_EXPERIMENTAL_PRISTINE
svn_error_t *
svn_wc__sync_text_base(svn_wc__db_t *db,
const char *local_abspath,
@@ -203,7 +204,9 @@ svn_wc__sync_text_base(svn_wc__db_t *db,
return SVN_NO_ERROR;
}
+#endif
+#ifndef SVN_EXPERIMENTAL_PRISTINE
svn_error_t *
svn_wc__text_base_path(const char **result_abspath,
svn_wc__db_t *db,
@@ -224,6 +227,7 @@ svn_wc__text_base_path(const char **resu
return SVN_NO_ERROR;
}
+#endif
svn_error_t *
svn_wc__text_base_deterministic_tmp_path(const char **result_abspath,
@@ -242,6 +246,7 @@ svn_wc__text_base_deterministic_tmp_path
return SVN_NO_ERROR;
}
+#ifndef SVN_EXPERIMENTAL_PRISTINE
svn_error_t *
svn_wc__text_revert_path(const char **result_abspath,
svn_wc__db_t *db,
@@ -262,6 +267,7 @@ svn_wc__text_revert_path(const char **re
return SVN_NO_ERROR;
}
+#endif
svn_error_t *
@@ -308,6 +314,7 @@ svn_wc__text_base_path_to_read(const cha
}
+#ifndef SVN_EXPERIMENTAL_PRISTINE
svn_error_t *
svn_wc__text_revert_path_to_read(const char **result_abspath,
svn_wc__db_t *db,
@@ -330,6 +337,7 @@ svn_wc__text_revert_path_to_read(const c
return SVN_NO_ERROR;
}
+#endif
svn_error_t *
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.h?rev=948409&r1=948408&r2=948409&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.h (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.h Wed May 26 12:31:24 2010
@@ -52,6 +52,7 @@ svn_boolean_t svn_wc__adm_area_exists(co
apr_pool_t *pool);
+#ifndef SVN_EXPERIMENTAL_PRISTINE
/* Atomically rename a temporary text-base file TMP_TEXT_BASE_ABSPATH to its
canonical location. LOCAL_ABSPATH in DB is the working file whose
text-base is to be moved. The tmp file should be closed already. */
@@ -60,8 +61,10 @@ svn_wc__sync_text_base(svn_wc__db_t *db,
const char *local_abspath,
const char *tmp_text_base_path,
apr_pool_t *scratch_pool);
+#endif
+#ifndef SVN_EXPERIMENTAL_PRISTINE
/* Set *RESULT_ABSPATH to the absolute path to where LOCAL_ABSPATH's
"normal text-base" file is or should be created. The file does not
necessarily exist.
@@ -74,6 +77,7 @@ svn_wc__text_base_path(const char **resu
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *pool);
+#endif
/* Set *RESULT_ABSPATH to the deterministic absolute path to where
LOCAL_ABSPATH's temporary text-base file is or should be created. */
@@ -121,12 +125,14 @@ svn_wc__get_ultimate_base_contents(svn_s
apr_pool_t *scratch_pool);
+#ifndef SVN_EXPERIMENTAL_PRISTINE
/* Set *RESULT_ABSPATH to the absolute path to LOCAL_ABSPATH's revert file. */
svn_error_t *
svn_wc__text_revert_path(const char **result_abspath,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *pool);
+#endif
/* Set *PROP_PATH to PATH's PROPS_KIND properties file.
PATH can be a directory or file, and even have changed w.r.t. the
@@ -164,6 +170,7 @@ svn_wc__text_base_path_to_read(const cha
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
+#ifndef SVN_EXPERIMENTAL_PRISTINE
/* Set *RESULT_ABSPATH to the path of the WC-1 "revert-base" text of the
versioned file LOCAL_ABSPATH in DB.
@@ -174,6 +181,7 @@ svn_wc__text_revert_path_to_read(const c
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *result_pool);
+#endif
/* Set *RESULT_ABSPATH to the path of the ultimate base text of the
versioned file LOCAL_ABSPATH in DB. In WC-1 terms this means the
