Author: svn-role
Date: Wed Jun 19 04:00:36 2013
New Revision: 1494438
URL: http://svn.apache.org/r1494438
Log:
Merge r1492005 from trunk:
* r1492005
Optimize 'svn mergeinfo --show-revs' network usage.
Justification:
Simple fixes to improve performance.
Votes:
+1: ivan, rhuijben, danielsh
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/svn/mergeinfo-cmd.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1492005
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1494438&r1=1494437&r2=1494438&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jun 19 04:00:36 2013
@@ -223,13 +223,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1492005
- Optimize 'svn mergeinfo --show-revs' network usage.
- Justification:
- Simple fixes to improve performance.
- Votes:
- +1: ivan, rhuijben, danielsh
-
* r1492295
Fix swig-rb tests with out-of-tree builds.
Justification:
Modified: subversion/branches/1.8.x/subversion/svn/mergeinfo-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svn/mergeinfo-cmd.c?rev=1494438&r1=1494437&r2=1494438&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/branches/1.8.x/subversion/svn/mergeinfo-cmd.c Wed Jun 19
04:00:36 2013
@@ -311,22 +311,32 @@ svn_cl__mergeinfo(apr_getopt_t *os,
/* Do the real work, depending on the requested data flavor. */
if (opt_state->show_revs == svn_cl__show_revs_merged)
{
+ apr_array_header_t *revprops;
+
+ /* We need only revisions number, not revision properties. */
+ revprops = apr_array_make(pool, 0, sizeof(const char *));
+
SVN_ERR(svn_client_mergeinfo_log2(TRUE, target, &tgt_peg_revision,
source, &src_peg_revision,
src_start_revision,
src_end_revision,
print_log_rev, NULL,
- TRUE, depth, NULL, ctx,
+ TRUE, depth, revprops, ctx,
pool));
}
else if (opt_state->show_revs == svn_cl__show_revs_eligible)
{
+ apr_array_header_t *revprops;
+
+ /* We need only revisions number, not revision properties. */
+ revprops = apr_array_make(pool, 0, sizeof(const char *));
+
SVN_ERR(svn_client_mergeinfo_log2(FALSE, target, &tgt_peg_revision,
source, &src_peg_revision,
src_start_revision,
src_end_revision,
print_log_rev, NULL,
- TRUE, depth, NULL, ctx,
+ TRUE, depth, revprops, ctx,
pool));
}
else
