subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1483879 - /subversion/trunk/subversion/svnadmin/svnadmin.c
Date Fri, 17 May 2013 15:47:37 GMT
Author: danielsh
Date: Fri May 17 15:47:37 2013
New Revision: 1483879

URL: http://svn.apache.org/r1483879
Log:
Tweak 'svnadmin info' output for packed FSFS filesystems.

* subversion/svnadmin/svnadmin.c
  (subcommand_info):
    Replace a tristate output field with two binary fields.  This adds
    information (there are four possible outputs, rather than three).  The
    old tristate output was misleading, since it could print "yes" and "no"
    like binary fields do.

New output:
    % svnadmin info 5 | me
    Filesystem Type: fsfs
    Filesystem Format: 6
    FSFS Sharded: yes
    FSFS Shard Size: 4
    FSFS Packed: yes
    FSFS Packable: no

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=1483879&r1=1483878&r2=1483879&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Fri May 17 15:47:37 2013
@@ -1709,12 +1709,17 @@ subcommand_info(apr_getopt_t *os, void *
           SVN_ERR(svn_cmdline_printf(pool, _("FSFS Shard Size: %d\n"),
                                      fsfs_info->shard_size));
 
-        if (fsfs_info->min_unpacked_rev + fsfs_info->shard_size > youngest + 1)
+        /* "Has 'svnadmin pack' been run?" */
+        if (fsfs_info->min_unpacked_rev)
           SVN_ERR(svn_cmdline_printf(pool, _("FSFS Packed: yes\n")));
-        else if (fsfs_info->min_unpacked_rev)
-          SVN_ERR(svn_cmdline_printf(pool, _("FSFS Packed: partly\n")));
         else
           SVN_ERR(svn_cmdline_printf(pool, _("FSFS Packed: no\n")));
+
+        /* "Would 'svnadmin pack' be a no-op?" */
+        if (fsfs_info->min_unpacked_rev + fsfs_info->shard_size > youngest + 1)
+          SVN_ERR(svn_cmdline_printf(pool, _("FSFS Packable: no\n")));
+        else
+          SVN_ERR(svn_cmdline_printf(pool, _("FSFS Packable: yes\n")));
       }
   }
 



Mime
View raw message