svn commit: r1054739 - in /subversion/branches/ignore-mergeinfo-log/subversion/svn: cl.h main.c

[hw...@apache.org]

Author: hwright
Date: Mon Jan  3 20:41:14 2011
New Revision: 1054739

URL: http://svn.apache.org/viewvc?rev=1054739&view=rev
Log:
On the ignore-mergeinfo-log branch:
Add the ignore_mergeinfo flag to the commandline client, and let 'svn log' accept
it.  Don't actually do anything with it yet.

* subversion/svn/cl.h
  (svn_cl__opt_state_t): New ignore_mergeinfo member.

* subversion/svn/main.c
  (svn_cl__longopt_t): Add opt_ignore_mergeinfo member.
  (svn_cl__options): Document the ignore-mergeinfo flag.
  (svn_cl__cmd_table): Accept ignore-mergeinfo for log operations.
  (main): If given --ignore-mergeinfo, set the option flag to TRUE.

Modified:
    subversion/branches/ignore-mergeinfo-log/subversion/svn/cl.h
    subversion/branches/ignore-mergeinfo-log/subversion/svn/main.c

Modified: subversion/branches/ignore-mergeinfo-log/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/svn/cl.h?rev=1054739&r1=1054738&r2=1054739&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/svn/cl.h (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/svn/cl.h Mon Jan  3 20:41:14 2011
@@ -230,6 +230,7 @@ typedef struct svn_cl__opt_state_t
   svn_boolean_t internal_diff;    /* override diff_cmd in config file */
   svn_boolean_t use_git_diff_format; /* Use git's extended diff format */
   svn_boolean_t allow_mixed_rev; /* Allow operation on mixed-revision WC */
+  svn_boolean_t ignore_mergeinfo; /* ignore mergeinfo in reporting commands. */
 } svn_cl__opt_state_t;
 
 

Modified: subversion/branches/ignore-mergeinfo-log/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/svn/main.c?rev=1054739&r1=1054738&r2=1054739&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/svn/main.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/svn/main.c Mon Jan  3 20:41:14 2011
@@ -123,6 +123,7 @@ typedef enum svn_cl__longopt_t {
   opt_internal_diff,
   opt_use_git_diff_format,
   opt_allow_mixed_revisions,
+  opt_ignore_mergeinfo
 } svn_cl__longopt_t;
 
 #define SVN_CL__OPTION_CONTINUATION_INDENT "                             "
@@ -339,6 +340,8 @@ const apr_getopt_option_t svn_cl__option
                        "Use of this option is not recommended!\n"
                        SVN_CL__OPTION_CONTINUATION_INDENT
                        "Please run 'svn update' instead.")},
+  {"ignore-mergeinfo",  opt_ignore_mergeinfo, 0,
+                    N_("ignore changes to mergeinfo")},
 
   /* Long-opt Aliases
    *
@@ -1089,7 +1092,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "          >   local missing, incoming edit upon update\n"
      "    D       wc/qax.c\n"),
     { 'u', 'v', 'N', opt_depth, 'q', opt_no_ignore, opt_incremental, opt_xml,
-      opt_ignore_externals, opt_changelist} },
+      opt_ignore_externals, opt_changelist, opt_ignore_mergeinfo} },
 
   { "switch", svn_cl__switch, {"sw"}, N_
     ("Update the working copy to a different URL within the same repository.\n"
@@ -1818,6 +1821,9 @@ main(int argc, const char *argv[])
       case opt_allow_mixed_revisions:
         opt_state.allow_mixed_rev = TRUE;
         break;
+      case opt_ignore_mergeinfo:
+        opt_state.ignore_mergeinfo = TRUE;
+        break;
       default:
         /* Hmmm. Perhaps this would be a good place to squirrel away
            opts that commands like svn diff might need. Hmmm indeed. */