svn commit: r1548262 - in /subversion/trunk/subversion/svn: mergeinfo-cmd.c svn.c

[br...@apache.org]

Author: breser
Date: Thu Dec  5 20:07:00 2013
New Revision: 1548262

URL: http://svn.apache.org/r1548262
Log:
Add an --incremental option to mergeinfo for use with --log

* subversion/svn/mergeinfo-cmd.c
  (mergeinfo_log): Add incremental argument and don't print log separator
    when it is true.
  (svn_cl__mergeinfo): Reject --incremental option when not used with --log and
    pass state of option to mergeinfo_log().

Modified:
    subversion/trunk/subversion/svn/mergeinfo-cmd.c
    subversion/trunk/subversion/svn/svn.c

Modified: subversion/trunk/subversion/svn/mergeinfo-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/mergeinfo-cmd.c?rev=1548262&r1=1548261&r2=1548262&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/trunk/subversion/svn/mergeinfo-cmd.c Thu Dec  5 20:07:00 2013
@@ -273,6 +273,7 @@ mergeinfo_log(svn_boolean_t finding_merg
               svn_boolean_t include_log_details,
               svn_boolean_t quiet,
               svn_boolean_t verbose,
+              svn_boolean_t incremental,
               svn_client_ctx_t *ctx,
               apr_pool_t *pool)
 {
@@ -325,7 +326,7 @@ mergeinfo_log(svn_boolean_t finding_merg
                                     TRUE, depth, revprops, ctx,
                                     pool));
 
-  if (include_log_details)
+  if (include_log_details && !incremental)
     SVN_ERR(svn_cmdline_printf(pool, SVN_CL__LOG_SEP_STRING));
 
   return SVN_NO_ERROR;
@@ -407,6 +408,11 @@ svn_cl__mergeinfo(apr_getopt_t *os,
         return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
                                 _("--verbose (-v) option valid only with "
                                   "--log option"));
+
+      if (opt_state->incremental)
+        return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+                                _("--incremental option valid only with "
+                                  "--log option"));
     }
 
   /* Do the real work, depending on the requested data flavor. */
@@ -418,7 +424,7 @@ svn_cl__mergeinfo(apr_getopt_t *os,
                             src_end_revision,
                             depth, opt_state->mergeinfo_log,
                             opt_state->quiet, opt_state->verbose,
-                            ctx, pool));
+                            opt_state->incremental, ctx, pool));
     }
   else if (opt_state->show_revs == svn_cl__show_revs_eligible)
     {
@@ -428,7 +434,7 @@ svn_cl__mergeinfo(apr_getopt_t *os,
                             src_end_revision,
                             depth, opt_state->mergeinfo_log,
                             opt_state->quiet, opt_state->verbose,
-                            ctx, pool));
+                            opt_state->incremental, ctx, pool));
     }
   else
     {

Modified: subversion/trunk/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1548262&r1=1548261&r2=1548262&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Thu Dec  5 20:07:00 2013
@@ -1142,7 +1142,8 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "  and the default for TARGET is HEAD for a URL or BASE for a WC path.\n"
      "\n"
      "  The depth can be 'empty' or 'infinity'; the default is 'empty'.\n"),
-    {'r', 'R', 'q', 'v', opt_depth, opt_show_revs, opt_mergeinfo_log } },
+    {'r', 'R', 'q', 'v', opt_depth, opt_show_revs, opt_mergeinfo_log,
+      opt_incremental } },
 
   { "mkdir", svn_cl__mkdir, {0}, N_
     ("Create a new directory under version control.\n"