subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1695722 - /subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
Date Thu, 13 Aug 2015 14:53:08 GMT
Author: stefan2
Date: Thu Aug 13 14:53:07 2015
New Revision: 1695722

URL: http://svn.apache.org/r1695722
Log:
On the svn-mergeinfo-normalizer branch:
Always show the "removing obsolete entries" header when scanning all
m/i entries for obsoletes.

* tools/client-side/svn-mergeinfo-normalizer/logic.c
  (show_removing_obsoletes): Move up here.
  (remove_obsolete_lines): Always show the header.
  (normalize): Don't show the header here anymore.

Modified:
    subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c

Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c?rev=1695722&r1=1695721&r2=1695722&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
(original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
Thu Aug 13 14:53:07 2015
@@ -472,6 +472,17 @@ remove_obsolete_line(deletion_state_t *s
 }
 
 static svn_error_t *
+show_removing_obsoletes(svn_min__opt_state_t *opt_state,
+                        apr_pool_t *scratch_pool)
+{
+  if (opt_state->remove_obsoletes && opt_state->verbose)
+    SVN_ERR(svn_cmdline_printf(scratch_pool,
+                               _("\n    Removing obsolete entries ...\n")));
+
+  return SVN_NO_ERROR;
+}
+
+static svn_error_t *
 remove_obsolete_lines(svn_min__branch_lookup_t *lookup,
                       svn_min__log_t *log,
                       svn_mergeinfo_t mergeinfo,
@@ -487,6 +498,8 @@ remove_obsolete_lines(svn_min__branch_lo
   if (!opt_state->remove_obsoletes)
     return SVN_NO_ERROR;
 
+  SVN_ERR(show_removing_obsoletes(opt_state, scratch_pool));
+
   iterpool = svn_pool_create(scratch_pool);
   sorted_mi = svn_sort__hash(mergeinfo,
                              svn_sort_compare_items_lexically,
@@ -967,17 +980,6 @@ show_elision_header(const char *parent_p
 }
 
 static svn_error_t *
-show_removing_obsoletes(svn_min__opt_state_t *opt_state,
-                        apr_pool_t *scratch_pool)
-{
-  if (opt_state->remove_obsoletes && opt_state->verbose)
-    SVN_ERR(svn_cmdline_printf(scratch_pool,
-                               _("\n    Removing obsolete entries ...\n")));
-
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
 show_elision_result(svn_mergeinfo_t parent_mergeinfo,
                     svn_mergeinfo_t subtree_mergeinfo,
                     svn_min__opt_state_t *opt_state,
@@ -1105,7 +1107,6 @@ normalize(apr_array_header_t *wc_mergein
             {
               /* We have to keep the sub-tree m/i but we can remove entries
                  for deleted branches from it. */
-              SVN_ERR(show_removing_obsoletes(opt_state, iterpool));
               SVN_ERR(remove_obsolete_lines(lookup, log, subtree_mergeinfo,
                                             opt_state, &progress, FALSE,
                                             iterpool));



Mime
View raw message