svn commit: r1547517 - in /subversion/trunk/subversion/svn: cat-cmd.c svn.c

[ph...@apache.org]

Author: philip
Date: Tue Dec  3 18:41:33 2013
New Revision: 1547517

URL: http://svn.apache.org/r1547517
Log:
Enable 'svn cat --ignore-keywords'.

* subversion/svn/svn.c
  (svn_cl__cmd_table): Add option.

* subversion/svn/cat-cmd.c
  (svn_cl__cat): Update to non-deprecated function and pass option.

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

Modified: subversion/trunk/subversion/svn/cat-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cat-cmd.c?rev=1547517&r1=1547516&r2=1547517&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cat-cmd.c (original)
+++ subversion/trunk/subversion/svn/cat-cmd.c Tue Dec  3 18:41:33 2013
@@ -76,9 +76,10 @@ svn_cl__cat(apr_getopt_t *os,
       SVN_ERR(svn_opt_parse_path(&peg_revision, &truepath, target,
                                  subpool));
 
-      SVN_ERR(svn_cl__try(svn_client_cat2(out, truepath, &peg_revision,
+      SVN_ERR(svn_cl__try(svn_client_cat3(NULL, out, truepath, &peg_revision,
                                           &(opt_state->start_revision),
-                                          ctx, subpool),
+                                          !opt_state->ignore_keywords,
+                                          ctx, subpool, subpool),
                            errors, opt_state->quiet,
                            SVN_ERR_UNVERSIONED_RESOURCE,
                            SVN_ERR_ENTRY_NOT_FOUND,

Modified: subversion/trunk/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1547517&r1=1547516&r2=1547517&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Tue Dec  3 18:41:33 2013
@@ -460,7 +460,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "\n"
      "  If specified, REV determines in which revision the target is first\n"
      "  looked up.\n"),
-    {'r'} },
+    {'r', opt_ignore_keywords} },
 
   { "changelist", svn_cl__changelist, {"cl"}, N_
     ("Associate (or dissociate) changelist CLNAME with the named files.\n"