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 12:03:37 UTC
svn commit: r1145517 - in /subversion/branches/revprop-packing: ./
subversion/include/ subversion/include/private/ subversion/libsvn_fs_base/
subversion/libsvn_fs_fs/ subversion/libsvn_subr/ subversion/svnadmin/
subversion/tests/
Author: danielsh
Date: Tue Jul 12 10:03:36 2011
New Revision: 1145517
URL: http://svn.apache.org/viewvc?rev=1145517&view=rev
Log:
On the revprop-packing branch:
Bump the --pre-1.7-compatible option to --pre-1.8-compatible.
This also record-only-merges r1145515 from trunk, which dropped the
former option there (prior to the 1.7.0 release).
Suggested by: philip
* subversion/include/svn_fs.h
(SVN_FS_CONFIG_PRE_1_7_COMPATIBLE): Rename to..
(SVN_FS_CONFIG_PRE_1_8_COMPATIBLE): ..this.
* subversion/svnadmin/main.c
(svnadmin__pre_1_7_compatible): Rename to..
(svnadmin__pre_1_8_compatible): ..this.
(--pre-1.7-compatible): Rename to..
(--pre-1.7-compatible): ..this.
(svnadmin_opt_state.pre_1_7_compatible): Rename to..
(svnadmin_opt_state.pre_1_8_compatible): ..this.
(subcommand_create, main): Track renames.
* subversion/libsvn_fs_fs/fs_fs.c
(svn_fs_fs__create): Track renames.
* subversion/libsvn_fs_base/fs.c
(base_create):
Add commented-out boilerplate for handling SVN_FS_CONFIG_PRE_1_8_COMPATIBLE.
* subversion/tests/svn_test_fs.c
(make_fs_config):
Track rename, taking account of the gap at SERVER_MINOR_VERSION=7.
Modified:
subversion/branches/revprop-packing/ (props changed)
subversion/branches/revprop-packing/subversion/include/private/svn_adler32.h (props changed)
subversion/branches/revprop-packing/subversion/include/private/svn_string_private.h (props changed)
subversion/branches/revprop-packing/subversion/include/private/svn_temp_serializer.h (props changed)
subversion/branches/revprop-packing/subversion/include/svn_fs.h
subversion/branches/revprop-packing/subversion/libsvn_fs_base/fs.c
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c (props changed)
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h (props changed)
subversion/branches/revprop-packing/subversion/libsvn_subr/adler32.c (props changed)
subversion/branches/revprop-packing/subversion/libsvn_subr/svn_temp_serializer.c (props changed)
subversion/branches/revprop-packing/subversion/svnadmin/main.c
subversion/branches/revprop-packing/subversion/tests/svn_test_fs.c
Propchange: subversion/branches/revprop-packing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:03:36 2011
@@ -52,4 +52,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1143817-1144579
+/subversion/trunk:1143817-1144579,1145515
Propchange: subversion/branches/revprop-packing/subversion/include/private/svn_adler32.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:03:36 2011
@@ -43,4 +43,4 @@
/subversion/branches/tc_url_rev/subversion/libsvn_diff/diff.h:874351-874483
/subversion/branches/tree-conflicts/subversion/libsvn_diff/diff.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/libsvn_diff/diff.h:873926-874008
-/subversion/trunk/subversion/include/private/svn_adler32.h:1143817-1144579
+/subversion/trunk/subversion/include/private/svn_adler32.h:1143817-1144579,1145515
Propchange: subversion/branches/revprop-packing/subversion/include/private/svn_string_private.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:03:36 2011
@@ -52,4 +52,4 @@
/subversion/branches/tree-conflicts/subversion/include/svn_string.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/include/svn_string.h:873926-874008
/subversion/branches/uris-as-urls/subversion/include/svn_string.h:1060426-1064427
-/subversion/trunk/subversion/include/private/svn_string_private.h:1143817-1144579
+/subversion/trunk/subversion/include/private/svn_string_private.h:1143817-1144579,1145515
Propchange: subversion/branches/revprop-packing/subversion/include/private/svn_temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:03:36 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301,1143817-1144579
+/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301,1143817-1144579,1145515
Modified: subversion/branches/revprop-packing/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/include/svn_fs.h?rev=1145517&r1=1145516&r2=1145517&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/include/svn_fs.h (original)
+++ subversion/branches/revprop-packing/subversion/include/svn_fs.h Tue Jul 12 10:03:36 2011
@@ -115,11 +115,11 @@ typedef struct svn_fs_t svn_fs_t;
#define SVN_FS_CONFIG_PRE_1_6_COMPATIBLE "pre-1.6-compatible"
/** Create repository format compatible with Subversion versions
- * earlier than 1.7.
+ * earlier than 1.8.
*
- * @since New in 1.7.
+ * @since New in 1.8.
*/
-#define SVN_FS_CONFIG_PRE_1_7_COMPATIBLE "pre-1.7-compatible"
+#define SVN_FS_CONFIG_PRE_1_8_COMPATIBLE "pre-1.8-compatible"
/** @} */
Modified: subversion/branches/revprop-packing/subversion/libsvn_fs_base/fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/libsvn_fs_base/fs.c?rev=1145517&r1=1145516&r2=1145517&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/libsvn_fs_base/fs.c (original)
+++ subversion/branches/revprop-packing/subversion/libsvn_fs_base/fs.c Tue Jul 12 10:03:36 2011
@@ -669,9 +669,13 @@ 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,
+#if 0
+ /* Uncomment if you bump the libsvn_fs_base format number in the
+ 1.8 release cycle. */
+ else if (apr_hash_get(fs->config, SVN_FS_CONFIG_PRE_1_8_COMPATIBLE,
APR_HASH_KEY_STRING))
format = 4;
+#endif
}
/* Create the environment and databases. */
Modified: subversion/branches/revprop-packing/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/libsvn_fs_fs/fs_fs.c?rev=1145517&r1=1145516&r2=1145517&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/revprop-packing/subversion/libsvn_fs_fs/fs_fs.c Tue Jul 12 10:03:36 2011
@@ -6887,7 +6887,7 @@ 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,
+ else if (apr_hash_get(fs->config, SVN_FS_CONFIG_PRE_1_8_COMPATIBLE,
APR_HASH_KEY_STRING))
format = 4;
}
Propchange: subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:03:36 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301,1143817-1144579
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301,1143817-1144579,1145515
Propchange: subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:03:36 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301,1143817-1144579
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301,1143817-1144579,1145515
Propchange: subversion/branches/revprop-packing/subversion/libsvn_subr/adler32.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:03:36 2011
@@ -1,4 +1,4 @@
/subversion/branches/diff-optimizations/subversion/libsvn_subr/adler32.c:1031270-1037352
/subversion/branches/diff-optimizations-bytes/subversion/libsvn_subr/adler32.c:1037353-1067789
/subversion/branches/performance/subversion/libsvn_subr/adler32.c:1067697-1078365
-/subversion/trunk/subversion/libsvn_subr/adler32.c:1143817-1144579
+/subversion/trunk/subversion/libsvn_subr/adler32.c:1143817-1144579,1145515
Propchange: subversion/branches/revprop-packing/subversion/libsvn_subr/svn_temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:03:36 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301,1143817-1144579
+/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301,1143817-1144579,1145515
Modified: subversion/branches/revprop-packing/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/svnadmin/main.c?rev=1145517&r1=1145516&r2=1145517&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/svnadmin/main.c (original)
+++ subversion/branches/revprop-packing/subversion/svnadmin/main.c Tue Jul 12 10:03:36 2011
@@ -187,7 +187,7 @@ enum svnadmin__cmdline_options_t
svnadmin__pre_1_4_compatible,
svnadmin__pre_1_5_compatible,
svnadmin__pre_1_6_compatible,
- svnadmin__pre_1_7_compatible
+ svnadmin__pre_1_8_compatible
};
/* Option codes and descriptions.
@@ -276,9 +276,9 @@ 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,
+ {"pre-1.8-compatible", svnadmin__pre_1_8_compatible, 0,
N_("use format compatible with Subversion versions\n"
- " earlier than 1.7")},
+ " earlier than 1.8")},
{"memory-cache-size", 'M', 1,
N_("size of the extra in-memory cache in MB used to\n"
@@ -306,7 +306,7 @@ static const svn_opt_subcommand_desc2_t
{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_8_compatible} },
{"deltify", subcommand_deltify, {0}, N_
("usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n\n"
@@ -457,7 +457,7 @@ 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_boolean_t pre_1_8_compatible; /* --pre-1.8-compatible */
svn_opt_revision_t start_revision, end_revision; /* -r X[:Y] */
svn_boolean_t help; /* --help or -? */
svn_boolean_t version; /* --version */
@@ -608,8 +608,8 @@ 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,
+ if (opt_state->pre_1_8_compatible)
+ apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_8_COMPATIBLE,
APR_HASH_KEY_STRING,
"1");
@@ -1732,8 +1732,8 @@ 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;
+ case svnadmin__pre_1_8_compatible:
+ opt_state.pre_1_8_compatible = TRUE;
break;
case svnadmin__fs_type:
err = svn_utf_cstring_to_utf8(&opt_state.fs_type, opt_arg, pool);
Modified: subversion/branches/revprop-packing/subversion/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/tests/svn_test_fs.c?rev=1145517&r1=1145516&r2=1145517&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/tests/svn_test_fs.c (original)
+++ subversion/branches/revprop-packing/subversion/tests/svn_test_fs.c Tue Jul 12 10:03:36 2011
@@ -81,8 +81,11 @@ make_fs_config(const char *fs_type,
fs_type);
if (server_minor_version)
{
- if (server_minor_version == 6)
- apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_7_COMPATIBLE,
+ if (server_minor_version == 7)
+ apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_8_COMPATIBLE,
+ APR_HASH_KEY_STRING, "1");
+ else if (server_minor_version == 6)
+ apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_8_COMPATIBLE,
APR_HASH_KEY_STRING, "1");
else if (server_minor_version == 5)
apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_6_COMPATIBLE,