You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/07/12 11:56:23 UTC
svn commit: r1145515 - in /subversion/trunk/subversion: include/svn_fs.h
libsvn_fs_base/fs.c libsvn_fs_fs/fs_fs.c svnadmin/main.c tests/svn_test_fs.c
Author: danielsh
Date: Tue Jul 12 09:56:22 2011
New Revision: 1145515
URL: http://svn.apache.org/viewvc?rev=1145515&view=rev
Log:
Nuke the --pre-1.7-compatible option from the FS and svnadmin API's.
(We will have a pre-1.8-compatible option in 1.8. If someone sees
a problem in any of this, speak up.)
This ties to issue #3952: it removes a now-no-op option.
* subversion/include/svn_fs.h
(SVN_FS_CONFIG_PRE_1_7_COMPATIBLE): Remove.
* subversion/svnadmin/main.c
(svnadmin__pre_1_7_compatible): Remove enumerator.
(--pre-1.7-compatible): Remove cmdline option.
(svnadmin_opt_state.pre_1_7_compatible): Remove member.
(subcommand_create):
Stop checking for pre_1_7_compatible and setting
SVN_FS_CONFIG_PRE_1_7_COMPATIBLE.
(main): Stop parsing removed option.
* subversion/libsvn_fs_fs/fs_fs.c
(svn_fs_fs__create): Stop checking for SVN_FS_CONFIG_PRE_1_7_COMPATIBLE.
* subversion/libsvn_fs_base/fs.c
(base_create): Stop checking for SVN_FS_CONFIG_PRE_1_7_COMPATIBLE.
* subversion/tests/svn_test_fs.c
(make_fs_config):
Don't set SVN_FS_CONFIG_PRE_1_7_COMPATIBLE.
Modified:
subversion/trunk/subversion/include/svn_fs.h
subversion/trunk/subversion/libsvn_fs_base/fs.c
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/svnadmin/main.c
subversion/trunk/subversion/tests/svn_test_fs.c
Modified: subversion/trunk/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1145515&r1=1145514&r2=1145515&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Tue Jul 12 09:56:22 2011
@@ -113,13 +113,6 @@ typedef struct svn_fs_t svn_fs_t;
* @since New in 1.6.
*/
#define SVN_FS_CONFIG_PRE_1_6_COMPATIBLE "pre-1.6-compatible"
-
-/** Create repository format compatible with Subversion versions
- * earlier than 1.7.
- *
- * @since New in 1.7.
- */
-#define SVN_FS_CONFIG_PRE_1_7_COMPATIBLE "pre-1.7-compatible"
/** @} */
Modified: subversion/trunk/subversion/libsvn_fs_base/fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/fs.c?rev=1145515&r1=1145514&r2=1145515&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/fs.c Tue Jul 12 09:56:22 2011
@@ -669,9 +669,6 @@ base_create(svn_fs_t *fs, const char *pa
else if (apr_hash_get(fs->config, SVN_FS_CONFIG_PRE_1_6_COMPATIBLE,
APR_HASH_KEY_STRING))
format = 3;
- else if (apr_hash_get(fs->config, SVN_FS_CONFIG_PRE_1_7_COMPATIBLE,
- APR_HASH_KEY_STRING))
- format = 4;
}
/* Create the environment and databases. */
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1145515&r1=1145514&r2=1145515&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Tue Jul 12 09:56:22 2011
@@ -6584,9 +6584,6 @@ svn_fs_fs__create(svn_fs_t *fs,
else if (apr_hash_get(fs->config, SVN_FS_CONFIG_PRE_1_6_COMPATIBLE,
APR_HASH_KEY_STRING))
format = 3;
- else if (apr_hash_get(fs->config, SVN_FS_CONFIG_PRE_1_7_COMPATIBLE,
- APR_HASH_KEY_STRING))
- format = 4;
}
ffd->format = format;
Modified: subversion/trunk/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/main.c?rev=1145515&r1=1145514&r2=1145515&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/main.c (original)
+++ subversion/trunk/subversion/svnadmin/main.c Tue Jul 12 09:56:22 2011
@@ -186,8 +186,7 @@ enum svnadmin__cmdline_options_t
svnadmin__wait,
svnadmin__pre_1_4_compatible,
svnadmin__pre_1_5_compatible,
- svnadmin__pre_1_6_compatible,
- svnadmin__pre_1_7_compatible
+ svnadmin__pre_1_6_compatible
};
/* Option codes and descriptions.
@@ -276,10 +275,6 @@ static const apr_getopt_option_t options
N_("use format compatible with Subversion versions\n"
" earlier than 1.6")},
- {"pre-1.7-compatible", svnadmin__pre_1_7_compatible, 0,
- N_("use format compatible with Subversion versions\n"
- " earlier than 1.7")},
-
{"memory-cache-size", 'M', 1,
N_("size of the extra in-memory cache in MB used to\n"
" minimize redundant operations. Default: 16.\n"
@@ -305,8 +300,8 @@ static const svn_opt_subcommand_desc2_t
"Create a new, empty repository at REPOS_PATH.\n"),
{svnadmin__bdb_txn_nosync, svnadmin__bdb_log_keep,
svnadmin__config_dir, svnadmin__fs_type, svnadmin__pre_1_4_compatible,
- svnadmin__pre_1_5_compatible, svnadmin__pre_1_6_compatible,
- svnadmin__pre_1_7_compatible} },
+ svnadmin__pre_1_5_compatible, svnadmin__pre_1_6_compatible
+ } },
{"deltify", subcommand_deltify, {0}, N_
("usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n\n"
@@ -457,7 +452,6 @@ struct svnadmin_opt_state
svn_boolean_t pre_1_4_compatible; /* --pre-1.4-compatible */
svn_boolean_t pre_1_5_compatible; /* --pre-1.5-compatible */
svn_boolean_t pre_1_6_compatible; /* --pre-1.6-compatible */
- svn_boolean_t pre_1_7_compatible; /* --pre-1.7-compatible */
svn_opt_revision_t start_revision, end_revision; /* -r X[:Y] */
svn_boolean_t help; /* --help or -? */
svn_boolean_t version; /* --version */
@@ -608,11 +602,6 @@ subcommand_create(apr_getopt_t *os, void
APR_HASH_KEY_STRING,
"1");
- if (opt_state->pre_1_7_compatible)
- apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_7_COMPATIBLE,
- APR_HASH_KEY_STRING,
- "1");
-
SVN_ERR(svn_repos_create(&repos, opt_state->repository_path,
NULL, NULL, NULL, fs_config, pool));
svn_fs_set_warning_func(svn_repos_fs(repos), warning_func, NULL);
@@ -1733,9 +1722,6 @@ main(int argc, const char *argv[])
case svnadmin__pre_1_6_compatible:
opt_state.pre_1_6_compatible = TRUE;
break;
- case svnadmin__pre_1_7_compatible:
- opt_state.pre_1_7_compatible = TRUE;
- break;
case svnadmin__fs_type:
err = svn_utf_cstring_to_utf8(&opt_state.fs_type, opt_arg, pool);
if (err)
Modified: subversion/trunk/subversion/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_fs.c?rev=1145515&r1=1145514&r2=1145515&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_fs.c (original)
+++ subversion/trunk/subversion/tests/svn_test_fs.c Tue Jul 12 09:56:22 2011
@@ -82,8 +82,7 @@ make_fs_config(const char *fs_type,
if (server_minor_version)
{
if (server_minor_version == 6)
- apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_7_COMPATIBLE,
- APR_HASH_KEY_STRING, "1");
+ /* no SVN_FS_CONFIG_PRE_1_7_COMPATIBLE */;
else if (server_minor_version == 5)
apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_6_COMPATIBLE,
APR_HASH_KEY_STRING, "1");