You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2013/02/05 18:46:36 UTC
svn commit: r1442676 - /subversion/trunk/subversion/svn/diff-cmd.c
Author: julianfoad
Date: Tue Feb 5 17:46:36 2013
New Revision: 1442676
URL: http://svn.apache.org/viewvc?rev=1442676&view=rev
Log:
* subversion/svn/diff-cmd.c
(svn_cl__diff): Simplify a tiny bit more, following r1442659.
Modified:
subversion/trunk/subversion/svn/diff-cmd.c
Modified: subversion/trunk/subversion/svn/diff-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/diff-cmd.c?rev=1442676&r1=1442675&r2=1442676&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/diff-cmd.c (original)
+++ subversion/trunk/subversion/svn/diff-cmd.c Tue Feb 5 17:46:36 2013
@@ -240,13 +240,11 @@ svn_cl__diff(apr_getopt_t *os,
/* Set default start/end revisions based on target types, in the same
* manner as done for the corresponding '--old X --new Y' cases. */
if (opt_state->start_revision.kind == svn_opt_revision_unspecified)
- opt_state->start_revision.kind
- = svn_path_is_url(APR_ARRAY_IDX(targets, 0, const char *))
+ opt_state->start_revision.kind = svn_path_is_url(old_target)
? svn_opt_revision_head : svn_opt_revision_base;
if (opt_state->end_revision.kind == svn_opt_revision_unspecified)
- opt_state->end_revision.kind
- = svn_path_is_url(APR_ARRAY_IDX(targets, 1, const char *))
+ opt_state->end_revision.kind = svn_path_is_url(new_target)
? svn_opt_revision_head : svn_opt_revision_working;
}
else if (opt_state->old_target)
@@ -260,9 +258,8 @@ svn_cl__diff(apr_getopt_t *os,
tmp = apr_array_make(pool, 2, sizeof(const char *));
APR_ARRAY_PUSH(tmp, const char *) = (opt_state->old_target);
APR_ARRAY_PUSH(tmp, const char *) = (opt_state->new_target
- ? opt_state->new_target
- : APR_ARRAY_IDX(tmp, 0,
- const char *));
+ ? opt_state->new_target
+ : opt_state->old_target);
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&tmp2, os, tmp,
ctx, FALSE, pool));