svn commit: r1483847 - /subversion/trunk/subversion/svnadmin/svnadmin.c

[da...@apache.org]

Author: danielsh
Date: Fri May 17 15:10:26 2013
New Revision: 1483847

URL: http://svn.apache.org/r1483847
Log:
Tweak 'svnadmin info' output.

* subversion/svnadmin/svnadmin.c
  (subcommand_info):
    Print the FS format number where all other FS info is printed.

New output:
    Path: r
    Repository Format: 5
    Compatible With Version: 1.8.0
    Repository Capabilities: mergeinfo
    Filesystem Type: fsfs
    Filesystem Format: 6
    FSFS Sharded: yes
    FSFS Shard Size: 1000
    FSFS Packed: yes
    Configuration File: r/db/fsfs.conf

Modified:
    subversion/trunk/subversion/svnadmin/svnadmin.c

Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1483847&r1=1483846&r2=1483847&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Fri May 17 15:10:26 2013
@@ -1636,6 +1636,7 @@ subcommand_info(apr_getopt_t *os, void *
   struct svnadmin_opt_state *opt_state = baton;
   svn_repos_t *repos;
   svn_fs_t *fs;
+  int fs_format;
 
   /* Expect no more arguments. */
   SVN_ERR(parse_args(NULL, os, 0, 0, pool));
@@ -1647,7 +1648,7 @@ subcommand_info(apr_getopt_t *os, void *
                                                     pool)));
 
   {
-    int repos_format, fs_format, minor;
+    int repos_format, minor;
     svn_version_t *repos_version, *fs_version;
     SVN_ERR(svn_repos_info_format(&repos_format, &repos_version,
                                   repos, pool, pool));
@@ -1656,8 +1657,7 @@ subcommand_info(apr_getopt_t *os, void *
 
     SVN_ERR(svn_fs_info_format(&fs_format, &fs_version,
                                fs, pool, pool));
-    SVN_ERR(svn_cmdline_printf(pool, _("Filesystem Format: %d\n"),
-                               fs_format));
+    /* fs_format will be printed later. */
 
     SVN_ERR_ASSERT(repos_version->major == SVN_VER_MAJOR);
     SVN_ERR_ASSERT(fs_version->major == SVN_VER_MAJOR);
@@ -1694,6 +1694,8 @@ subcommand_info(apr_getopt_t *os, void *
     SVN_ERR(svn_fs_info(&info, fs, pool, pool));
     SVN_ERR(svn_cmdline_printf(pool, _("Filesystem Type: %s\n"),
                                info->fs_type));
+    SVN_ERR(svn_cmdline_printf(pool, _("Filesystem Format: %d\n"),
+                               fs_format));
     if (!strcmp(info->fs_type, SVN_FS_TYPE_FSFS))
       {
         const svn_fs_fsfs_info_t *fsfs_info = (const void *)info;