subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1467421 - in /subversion/branches/1.8.x-svn_fs_info-removal/subversion: include/ libsvn_fs/ libsvn_fs_base/ libsvn_fs_fs/ libsvn_repos/ tests/libsvn_fs/ tests/libsvn_repos/
Date Fri, 12 Apr 2013 19:13:13 GMT
Author: danielsh
Date: Fri Apr 12 19:13:13 2013
New Revision: 1467421

URL: http://svn.apache.org/r1467421
Log:
On the 1.8.x-svn_fs_info-removal branch, remove trunk-only code that has been
#define'd away on 1.8.x.

Modified:
    subversion/branches/1.8.x-svn_fs_info-removal/subversion/include/svn_fs.h
    subversion/branches/1.8.x-svn_fs_info-removal/subversion/include/svn_repos.h
    subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs/fs-loader.c
    subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs/fs-loader.h
    subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_base/fs.c
    subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/fs.c
    subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/tree.h
    subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_repos/repos.c
    subversion/branches/1.8.x-svn_fs_info-removal/subversion/tests/libsvn_fs/fs-test.c
    subversion/branches/1.8.x-svn_fs_info-removal/subversion/tests/libsvn_repos/repos-test.c

Modified: subversion/branches/1.8.x-svn_fs_info-removal/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-svn_fs_info-removal/subversion/include/svn_fs.h?rev=1467421&r1=1467420&r2=1467421&view=diff
==============================================================================
--- subversion/branches/1.8.x-svn_fs_info-removal/subversion/include/svn_fs.h (original)
+++ subversion/branches/1.8.x-svn_fs_info-removal/subversion/include/svn_fs.h Fri Apr 12 19:13:13
2013
@@ -2039,43 +2039,6 @@ svn_fs_youngest_rev(svn_revnum_t *younge
                     apr_pool_t *pool);
 
 
-#ifdef SVN_FS_INFO
-/**
- * Return filesystem format information for @a fs.
- *
- * Set @a *fs_format to the filesystem format number of @a fs, which is
- * an integer that increases when incompatible changes are made (such as
- * by #svn_fs_upgrade).
- *
- * Set @a *supports_version to the version number of the minimum Subversion GA
- * release that can read and write @a fs.
- *
- * @see svn_repos_info_format()
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_fs_info_format(int *fs_format,
-                   svn_version_t **supports_version,
-                   svn_fs_t *fs,
-                   apr_pool_t *result_pool,
-                   apr_pool_t *scratch_pool);
-
-/**
- * Return a list of admin-serviceable config files for @a fs.  @a *files
- * will be set to an array containing paths as C strings.
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_fs_info_config_files(apr_array_header_t **files,
-                         svn_fs_t *fs,
-                         apr_pool_t *result_pool,
-                         apr_pool_t *scratch_pool);
-#endif /* SVN_FS_INFO */
-
-
-
 /** Provide filesystem @a fs the opportunity to compress storage relating to
  * associated with  @a revision in filesystem @a fs.  Use @a pool for all
  * allocations.
@@ -2536,80 +2499,6 @@ svn_fs_verify_root(svn_fs_root_t *root,
 
 /** @} */
 
-#ifdef SVN_FS_INFO
-/**
- * @defgroup fs_info Filesystem information subsystem
- * @{
- */
-
-/**
- * A structure that provides some information about a filesystem.
- * Returned by svn_fs_info().
- *
- * @note Fields may be added to the end of this structure in future
- * versions.  Therefore, users shouldn't allocate structures of this
- * type, to preserve binary compatibility.
- *
- * @since New in 1.8.
- */
-typedef struct svn_fs_info_t {
-
-#if 0
-  /* Potential future feature. */
-  svn_boolean_t is_write_locked;
-#endif
-
-  /** Filesystem backend (#fs_type) -specific information.
-   * @see SVN_FS_FSFS_INFO_* */
-  apr_hash_t *fsap_info;
-
-} svn_fs_info_t;
-
-/**
- * Set @a *info to an info struct describing @a fs.
- *
- * @see #svn_fs_info_t
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_fs_info(const svn_fs_info_t **info,
-            svn_fs_t *fs,
-            apr_pool_t *result_pool,
-            apr_pool_t *scratch_pool);
-
-/**
- * Return a duplicate of @a info, allocated in @a pool. No part of the new
- * structure will be shared with @a info.
- *
- * @since New in 1.8.
- */
-svn_fs_info_t *
-svn_fs_info_dup(const svn_fs_info_t *info,
-                apr_pool_t *result_pool);
-
-/** @name FSFS-specific #svn_fs_info_t information.
- * @since New in 1.8.
- * @{
- */
-
-/** Value: shard size (as int), or 0 if the filesystem is
- * not currently sharded. */
-#define SVN_FS_FSFS_INFO_SHARDED "sharded"
-
-/** Value: abspath to rep-cache.db, or absent if that doesn't exist.
- @note Do not modify the db schema or tables!
- */
-#define SVN_FS_FSFS_INFO_REP_CACHE_PATH "rep-cache-path"
-
-/** The smallest revision (as #svn_revnum_t) which is not in a pack file.
- * @note Zero (0) if (but not iff) the format does not support packing. */
-#define SVN_FS_FSFS_INFO_MIN_UNPACKED_REV "min-unpacked-rev"
-/** @} */
-
-/** @} */
-#endif /* SVN_FS_INFO */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Modified: subversion/branches/1.8.x-svn_fs_info-removal/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-svn_fs_info-removal/subversion/include/svn_repos.h?rev=1467421&r1=1467420&r2=1467421&view=diff
==============================================================================
--- subversion/branches/1.8.x-svn_fs_info-removal/subversion/include/svn_repos.h (original)
+++ subversion/branches/1.8.x-svn_fs_info-removal/subversion/include/svn_repos.h Fri Apr 12
19:13:13 2013
@@ -494,26 +494,6 @@ svn_repos_has_capability(svn_repos_t *re
                          const char *capability,
                          apr_pool_t *pool);
 
-#ifdef SVN_FS_INFO
-/**
- * Return a set capabilities supported by the running Subversion library and by
- * @a repos.  (Capabilities supported by this version of Subversion but not by
- * @a repos are not listed.  This may happen when svn_repos_upgrade2() has not
- * been called after a software upgrade.)
- *
- * The set is represented as a hash whose keys are the set members.  The values
- * are not defined.
- *
- * @see svn_repos_info()
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_repos_capabilities(apr_hash_t **capabilities,
-                       svn_repos_t *repos,
-                       apr_pool_t *result_pool,
-                       apr_pool_t *scratch_pool);
-#endif /* SVN_FS_INFO */
 /** @} */
 
 /**
@@ -2488,29 +2468,6 @@ svn_repos_node_editor(const svn_delta_ed
 svn_repos_node_t *
 svn_repos_node_from_baton(void *edit_baton);
 
-#ifdef SVN_FS_INFO
-/**
- * Return repository format information for @a repos.
- *
- * Set @a *repos_format to the repository format number of @a repos, which is
- * an integer that increases when incompatible changes are made (such as
- * by #svn_repos_upgrade).
- *
- * Set @a *supports_version to the version number of the minimum Subversion GA
- * release that can read and write @a repos.
- *
- * @see svn_fs_info_format()
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_repos_info_format(int *repos_format,
-                      svn_version_t **supports_version,
-                      svn_repos_t *repos,
-                      apr_pool_t *result_pool,
-                      apr_pool_t *scratch_pool);
-#endif /* SVN_FS_INFO */
-
 /** @} */
 
 /* ---------------------------------------------------------------*/

Modified: subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs/fs-loader.c?rev=1467421&r1=1467420&r2=1467421&view=diff
==============================================================================
--- subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs/fs-loader.c Fri Apr
12 19:13:13 2013
@@ -1306,31 +1306,6 @@ svn_fs_youngest_rev(svn_revnum_t *younge
   return svn_error_trace(fs->vtable->youngest_rev(youngest_p, fs, pool));
 }
 
-#ifdef SVN_FS_INFO
-svn_error_t *
-svn_fs_info_format(int *fs_format,
-                   svn_version_t **supports_version,
-                   svn_fs_t *fs,
-                   apr_pool_t *result_pool,
-                   apr_pool_t *scratch_pool)
-{
-  return svn_error_trace(fs->vtable->info_format(fs_format, supports_version,
-                                                 fs,
-                                                 result_pool, scratch_pool));
-}
-
-svn_error_t *
-svn_fs_info_config_files(apr_array_header_t **files,
-                         svn_fs_t *fs,
-                         apr_pool_t *result_pool,
-                         apr_pool_t *scratch_pool)
-{
-  return svn_error_trace(fs->vtable->info_config_files(files, fs,
-                                                       result_pool,
-                                                       scratch_pool));
-}
-#endif
-
 svn_error_t *
 svn_fs_deltify_revision(svn_fs_t *fs, svn_revnum_t revision, apr_pool_t *pool)
 {
@@ -1615,26 +1590,3 @@ svn_fs_version(void)
 {
   SVN_VERSION_BODY;
 }
-
-
-#ifdef SVN_FS_INFO
-/** info **/
-svn_error_t *
-svn_fs_info(const svn_fs_info_t **info,
-            svn_fs_t *fs,
-            apr_pool_t *result_pool,
-            apr_pool_t *scratch_pool)
-{
-  SVN__NOT_IMPLEMENTED();
-}
-
-svn_fs_info_t *
-svn_fs_info_dup(const svn_fs_info_t *info,
-                apr_pool_t *result_pool)
-{
-  /* Not implemented. */
-  SVN_ERR_MALFUNCTION_NO_RETURN();
-  return NULL;
-}
-#endif
-

Modified: subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs/fs-loader.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs/fs-loader.h?rev=1467421&r1=1467420&r2=1467421&view=diff
==============================================================================
--- subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs/fs-loader.h (original)
+++ subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs/fs-loader.h Fri Apr
12 19:13:13 2013
@@ -212,15 +212,6 @@ typedef struct fs_vtable_t
                             svn_fs_get_locks_callback_t get_locks_func,
                             void *get_locks_baton,
                             apr_pool_t *pool);
-  svn_error_t *(*info_format)(int *fs_format,
-                              svn_version_t **supports_version,
-                              svn_fs_t *fs,
-                              apr_pool_t *result_pool,
-                              apr_pool_t *scratch_pool);
-  svn_error_t *(*info_config_files)(apr_array_header_t **files,
-                                    svn_fs_t *fs,
-                                    apr_pool_t *result_pool,
-                                    apr_pool_t *scratch_pool);
   svn_error_t *(*verify_root)(svn_fs_root_t *root,
                               apr_pool_t *pool);
   svn_error_t *(*freeze)(svn_fs_t *fs,

Modified: subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_base/fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_base/fs.c?rev=1467421&r1=1467420&r2=1467421&view=diff
==============================================================================
--- subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_base/fs.c (original)
+++ subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_base/fs.c Fri Apr 12
19:13:13 2013
@@ -471,59 +471,6 @@ bdb_write_config(svn_fs_t *fs)
 }
 
 static svn_error_t *
-base_bdb_info_format(int *fs_format,
-                     svn_version_t **supports_version,
-                     svn_fs_t *fs,
-                     apr_pool_t *result_pool,
-                     apr_pool_t *scratch_pool)
-{
-  base_fs_data_t *bfd = fs->fsap_data;
-
-  *fs_format = bfd->format;
-  *supports_version = apr_palloc(result_pool, sizeof(svn_version_t));
-
-  (*supports_version)->major = SVN_VER_MAJOR;
-  (*supports_version)->minor = 0;
-  (*supports_version)->patch = 0;
-  (*supports_version)->tag = "";
-
-  switch (bfd->format)
-    {
-    case 1:
-      break;
-    case 2:
-      (*supports_version)->minor = 4;
-      break;
-    case 3:
-      (*supports_version)->minor = 5;
-      break;
-    case 4:
-      (*supports_version)->minor = 6;
-      break;
-#ifdef SVN_DEBUG
-# if SVN_FS_BASE__FORMAT_NUMBER != 4
-#  error "Need to add a 'case' statement here"
-# endif
-#endif
-    }
-
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-base_bdb_info_config_files(apr_array_header_t **files,
-                           svn_fs_t *fs,
-                           apr_pool_t *result_pool,
-                           apr_pool_t *scratch_pool)
-{
-  *files = apr_array_make(result_pool, 1, sizeof(const char *));
-  APR_ARRAY_PUSH(*files, const char *) = svn_dirent_join(fs->path,
-                                                         BDB_CONFIG_FILE,
-                                                         result_pool);
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
 base_bdb_verify_root(svn_fs_root_t *root,
                      apr_pool_t *scratch_pool)
 {
@@ -560,8 +507,6 @@ static fs_vtable_t fs_vtable = {
   svn_fs_base__unlock,
   svn_fs_base__get_lock,
   svn_fs_base__get_locks,
-  base_bdb_info_format,
-  base_bdb_info_config_files,
   base_bdb_verify_root,
   base_bdb_freeze,
   base_bdb_set_errcall,

Modified: subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/fs.c?rev=1467421&r1=1467420&r2=1467421&view=diff
==============================================================================
--- subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/fs.c (original)
+++ subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/fs.c Fri Apr 12
19:13:13 2013
@@ -184,8 +184,6 @@ static fs_vtable_t fs_vtable = {
   svn_fs_fs__unlock,
   svn_fs_fs__get_lock,
   svn_fs_fs__get_locks,
-  svn_fs_fs__info_format,
-  svn_fs_fs__info_config_files,
   svn_fs_fs__verify_root,
   fs_freeze,
   fs_set_errcall

Modified: subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/fs_fs.c?rev=1467421&r1=1467420&r2=1467421&view=diff
==============================================================================
--- subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/fs_fs.c Fri Apr
12 19:13:13 2013
@@ -11467,57 +11467,3 @@ svn_fs_fs__hotcopy(svn_fs_t *src_fs,
 
   return SVN_NO_ERROR;
 }
-
-svn_error_t *
-svn_fs_fs__info_format(int *fs_format,
-                       svn_version_t **supports_version,
-                       svn_fs_t *fs,
-                       apr_pool_t *result_pool,
-                       apr_pool_t *scratch_pool)
-{
-  fs_fs_data_t *ffd = fs->fsap_data;
-  *fs_format = ffd->format;
-  *supports_version = apr_palloc(result_pool, sizeof(svn_version_t));
-
-  (*supports_version)->major = SVN_VER_MAJOR;
-  (*supports_version)->minor = 1;
-  (*supports_version)->patch = 0;
-  (*supports_version)->tag = "";
-
-  switch (ffd->format)
-    {
-    case 1:
-      break;
-    case 2:
-      (*supports_version)->minor = 4;
-      break;
-    case 3:
-      (*supports_version)->minor = 5;
-      break;
-    case 4:
-      (*supports_version)->minor = 6;
-      break;
-    case 6:
-      (*supports_version)->minor = 8;
-      break;
-#ifdef SVN_DEBUG
-# if SVN_FS_FS__FORMAT_NUMBER != 6
-#  error "Need to add a 'case' statement here"
-# endif
-#endif
-    }
-
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_fs_fs__info_config_files(apr_array_header_t **files,
-                             svn_fs_t *fs,
-                             apr_pool_t *result_pool,
-                             apr_pool_t *scratch_pool)
-{
-  *files = apr_array_make(result_pool, 1, sizeof(const char *));
-  APR_ARRAY_PUSH(*files, const char *) = svn_dirent_join(fs->path, PATH_CONFIG,
-                                                         result_pool);
-  return SVN_NO_ERROR;
-}

Modified: subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/tree.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/tree.h?rev=1467421&r1=1467420&r2=1467421&view=diff
==============================================================================
--- subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/tree.h (original)
+++ subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_fs_fs/tree.h Fri Apr 12
19:13:13 2013
@@ -91,20 +91,6 @@ svn_error_t *
 svn_fs_fs__verify_root(svn_fs_root_t *root,
                        apr_pool_t *pool);
 
-svn_error_t *
-svn_fs_fs__info_format(int *fs_format,
-                       svn_version_t **supports_version,
-                       svn_fs_t *fs,
-                       apr_pool_t *result_pool,
-                       apr_pool_t *scratch_pool);
-
-
-svn_error_t *
-svn_fs_fs__info_config_files(apr_array_header_t **files,
-                             svn_fs_t *fs,
-                             apr_pool_t *result_pool,
-                             apr_pool_t *scratch_pool);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Modified: subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_repos/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_repos/repos.c?rev=1467421&r1=1467420&r2=1467421&view=diff
==============================================================================
--- subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_repos/repos.c (original)
+++ subversion/branches/1.8.x-svn_fs_info-removal/subversion/libsvn_repos/repos.c Fri Apr
12 19:13:13 2013
@@ -1677,65 +1677,6 @@ svn_repos_has_capability(svn_repos_t *re
   return SVN_NO_ERROR;
 }
 
-#ifdef SVN_FS_INFO
-svn_error_t *
-svn_repos_capabilities(apr_hash_t **capabilities,
-                       svn_repos_t *repos,
-                       apr_pool_t *result_pool,
-                       apr_pool_t *scratch_pool)
-{
-  static const char *const queries[] = {
-    SVN_REPOS_CAPABILITY_MERGEINFO,
-    NULL
-  };
-  const char *const *i;
-
-  *capabilities = apr_hash_make(result_pool);
-
-  for (i = queries; *i; i++)
-    {
-      svn_boolean_t has;
-      SVN_ERR(svn_repos_has_capability(repos, &has, *i, scratch_pool));
-      if (has)
-        svn_hash_sets(*capabilities, *i, *i);
-    }
-
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_repos_info_format(int *repos_format,
-                      svn_version_t **supports_version,
-                      svn_repos_t *repos,
-                      apr_pool_t *result_pool,
-                      apr_pool_t *scratch_pool)
-{
-  *repos_format = repos->format;
-  *supports_version = apr_palloc(result_pool, sizeof(svn_version_t));
-
-  (*supports_version)->major = SVN_VER_MAJOR;
-  (*supports_version)->minor = 0;
-  (*supports_version)->patch = 0;
-  (*supports_version)->tag = "";
-
-  switch (repos->format)
-    {
-    case SVN_REPOS__FORMAT_NUMBER_LEGACY:
-      break;
-    case SVN_REPOS__FORMAT_NUMBER_1_4:
-      (*supports_version)->minor = 4;
-      break;
-#ifdef SVN_DEBUG
-# if SVN_REPOS__FORMAT_NUMBER != SVN_REPOS__FORMAT_NUMBER_1_4
-#  error "Need to add a 'case' statement here"
-# endif
-#endif
-    }
-
-  return SVN_NO_ERROR;
-}
-#endif
-
 svn_fs_t *
 svn_repos_fs(svn_repos_t *repos)
 {

Modified: subversion/branches/1.8.x-svn_fs_info-removal/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-svn_fs_info-removal/subversion/tests/libsvn_fs/fs-test.c?rev=1467421&r1=1467420&r2=1467421&view=diff
==============================================================================
--- subversion/branches/1.8.x-svn_fs_info-removal/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/branches/1.8.x-svn_fs_info-removal/subversion/tests/libsvn_fs/fs-test.c Fri
Apr 12 19:13:13 2013
@@ -4984,29 +4984,6 @@ filename_trailing_newline(const svn_test
   return SVN_NO_ERROR;
 }
 
-#ifdef SVN_FS_INFO
-static svn_error_t *
-test_fs_info_format(const svn_test_opts_t *opts,
-                    apr_pool_t *pool)
-{
-  svn_fs_t *fs;
-  int fs_format;
-  svn_version_t *supports_version;
-  svn_version_t v1_5_0 = {1, 5, 0, ""};
-  svn_test_opts_t opts2;
-
-  opts2 = *opts;
-  opts2.server_minor_version = 5;
-
-  SVN_ERR(svn_test__create_fs(&fs, "test-fs-format-info", &opts2, pool));
-  SVN_ERR(svn_fs_info_format(&fs_format, &supports_version, fs, pool, pool));
-  SVN_TEST_ASSERT(fs_format == 3); /* happens to be the same for FSFS and BDB */
-  SVN_TEST_ASSERT(svn_ver_equal(supports_version, &v1_5_0));
-
-  return SVN_NO_ERROR;
-}
-#endif
-
 /* ------------------------------------------------------------------------ */
 
 /* The test table.  */
@@ -5089,9 +5066,5 @@ struct svn_test_descriptor_t test_funcs[
                        "test svn_fs_delete_fs"),
     SVN_TEST_OPTS_PASS(filename_trailing_newline,
                        "filenames with trailing \\n might be rejected"),
-#ifdef SVN_FS_INFO
-    SVN_TEST_OPTS_PASS(test_fs_info_format,
-                       "test svn_fs_info_format"),
-#endif
     SVN_TEST_NULL
   };

Modified: subversion/branches/1.8.x-svn_fs_info-removal/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-svn_fs_info-removal/subversion/tests/libsvn_repos/repos-test.c?rev=1467421&r1=1467420&r2=1467421&view=diff
==============================================================================
--- subversion/branches/1.8.x-svn_fs_info-removal/subversion/tests/libsvn_repos/repos-test.c
(original)
+++ subversion/branches/1.8.x-svn_fs_info-removal/subversion/tests/libsvn_repos/repos-test.c
Fri Apr 12 19:13:13 2013
@@ -3260,46 +3260,6 @@ filename_with_control_chars(const svn_te
   return SVN_NO_ERROR;
 }
 
-#ifdef SVN_FS_INFO
-static svn_error_t *
-test_repos_info(const svn_test_opts_t *opts,
-                apr_pool_t *pool)
-{
-  svn_repos_t *repos;
-  svn_test_opts_t opts2;
-  apr_hash_t *capabilities;
-  svn_version_t *supports_version;
-  svn_version_t v1_0_0 = {1, 0, 0, ""};
-  svn_version_t v1_4_0 = {1, 4, 0, ""};
-  int repos_format;
-
-  opts2 = *opts;
-
-  opts2.server_minor_version = 3;
-  SVN_ERR(svn_test__create_repos(&repos, "test-repo-info-3",
-                                 &opts2, pool));
-  SVN_ERR(svn_repos_capabilities(&capabilities, repos, pool, pool));
-  SVN_TEST_ASSERT(apr_hash_count(capabilities) == 0);
-  SVN_ERR(svn_repos_info_format(&repos_format, &supports_version, repos,
-                                pool, pool));
-  SVN_TEST_ASSERT(repos_format == 3);
-  SVN_TEST_ASSERT(svn_ver_equal(supports_version, &v1_0_0));
-
-  opts2.server_minor_version = 8;
-  SVN_ERR(svn_test__create_repos(&repos, "test-repo-info-8",
-                                 &opts2, pool));
-  SVN_ERR(svn_repos_capabilities(&capabilities, repos, pool, pool));
-  SVN_TEST_ASSERT(apr_hash_count(capabilities) == 1);
-  SVN_TEST_ASSERT(svn_hash_gets(capabilities, SVN_REPOS_CAPABILITY_MERGEINFO));
-  SVN_ERR(svn_repos_info_format(&repos_format, &supports_version, repos,
-                                pool, pool));
-  SVN_TEST_ASSERT(repos_format == 5);
-  SVN_TEST_ASSERT(svn_ver_equal(supports_version, &v1_4_0));
-
-  return SVN_NO_ERROR;
-}
-#endif
-
 
 /* The test table.  */
 
@@ -3346,9 +3306,5 @@ struct svn_test_descriptor_t test_funcs[
                        "test svn_repos_delete"),
     SVN_TEST_OPTS_PASS(filename_with_control_chars,
                        "test filenames with control characters"),
-#ifdef SVN_FS_INFO
-    SVN_TEST_OPTS_PASS(test_repos_info,
-                       "test svn_repos_info_*"),
-#endif
     SVN_TEST_NULL
   };



Mime
View raw message