subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ne...@apache.org
Subject svn commit: r1171351 - /subversion/trunk/subversion/libsvn_wc/status.c
Date Fri, 16 Sep 2011 01:26:39 GMT
Author: neels
Date: Fri Sep 16 01:26:38 2011
New Revision: 1171351

URL: http://svn.apache.org/viewvc?rev=1171351&view=rev
Log:
Cosmetic, take an indent out of an upcoming patch.
* subversion/libsvn_wc/status.c (one_child_status): Collapse nested if.

Modified:
    subversion/trunk/subversion/libsvn_wc/status.c

Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1171351&r1=1171350&r2=1171351&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Fri Sep 16 01:26:38 2011
@@ -1129,43 +1129,41 @@ one_child_status(const struct walk_statu
                  apr_pool_t *result_pool,
                  apr_pool_t *scratch_pool)
 {
-  if (info)
+  if (info
+      && info->status != svn_wc__db_status_not_present
+      && info->status != svn_wc__db_status_excluded
+      && info->status != svn_wc__db_status_server_excluded)
     {
-      if (info->status != svn_wc__db_status_not_present
-          && info->status != svn_wc__db_status_excluded
-          && info->status != svn_wc__db_status_server_excluded)
+      if (depth == svn_depth_files
+          && info->kind == svn_wc__db_kind_dir)
         {
-          if (depth == svn_depth_files
-              && info->kind == svn_wc__db_kind_dir)
-            {
-              return SVN_NO_ERROR;
-            }
-
-          SVN_ERR(send_status_structure(wb, local_abspath,
-                                        dir_repos_root_url,
-                                        dir_repos_relpath,
-                                        dir_repos_uuid,
-                                        info, dirent, get_all,
-                                        status_func, status_baton,
-                                        scratch_pool));
+          return SVN_NO_ERROR;
+        }
 
-          /* Descend in subdirectories. */
-          if (depth == svn_depth_infinity
-              && info->kind == svn_wc__db_kind_dir)
-            {
-              SVN_ERR(get_dir_status(wb, local_abspath, TRUE,
-                                     dir_repos_root_url, dir_repos_relpath,
-                                     dir_repos_uuid, info,
-                                     dirent, ignore_patterns,
-                                     svn_depth_infinity, get_all,
-                                     no_ignore,
-                                     status_func, status_baton,
-                                     cancel_func, cancel_baton,
-                                     scratch_pool));
-            }
+      SVN_ERR(send_status_structure(wb, local_abspath,
+                                    dir_repos_root_url,
+                                    dir_repos_relpath,
+                                    dir_repos_uuid,
+                                    info, dirent, get_all,
+                                    status_func, status_baton,
+                                    scratch_pool));
 
-          return SVN_NO_ERROR;
+      /* Descend in subdirectories. */
+      if (depth == svn_depth_infinity
+          && info->kind == svn_wc__db_kind_dir)
+        {
+          SVN_ERR(get_dir_status(wb, local_abspath, TRUE,
+                                 dir_repos_root_url, dir_repos_relpath,
+                                 dir_repos_uuid, info,
+                                 dirent, ignore_patterns,
+                                 svn_depth_infinity, get_all,
+                                 no_ignore,
+                                 status_func, status_baton,
+                                 cancel_func, cancel_baton,
+                                 scratch_pool));
         }
+
+      return SVN_NO_ERROR;
     }
 
   if (tree_conflicted)



Mime
View raw message