You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gb...@apache.org on 2013/11/17 15:56:28 UTC
svn commit: r1542741 [3/3] - in
/subversion/branches/invoke-diff-cmd-feature: BRANCH-README
subversion/include/svn_io.h subversion/libsvn_client/diff.c
subversion/svn/svn.c subversion/svnlook/svnlook.c
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_io.h?rev=1542741&r1=1542740&r2=1542741&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_io.h (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_io.h Sun Nov 17 14:56:28 2013
@@ -1835,7 +1835,7 @@ svn_io_run_cmd(const char *path,
* @a diff_cmd must be non-NULL.
*
* Do all allocation in @a pool.
- * @since New in 1.6.0.
+ * @since New in 1.6.0.
*/
svn_error_t *
svn_io_run_diff2(const char *dir,
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c?rev=1542741&r1=1542740&r2=1542741&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c Sun Nov 17 14:56:28 2013
@@ -615,7 +615,6 @@ struct diff_cmd_baton {
/* Whether the local diff target of a repos->wc diff is a copy. */
svn_boolean_t repos_wc_diff_target_is_copy;
-
};
/* An helper for diff_dir_props_changed, diff_file_changed and diff_file_added
@@ -825,6 +824,7 @@ diff_content_changed(svn_boolean_t *wrot
SVN_ERR(svn_io_open_unique_file3(&outfile, &outfilename, NULL,
svn_io_file_del_on_pool_cleanup,
scratch_pool, scratch_pool));
+
errfile = svn_stream__aprfile(errstream);
if (errfile)
errfilename = NULL;
@@ -2498,9 +2498,10 @@ set_up_diff_cmd_and_options(struct diff_
options = svn_cstring_split(diff_extensions, " \t\n\r", TRUE, pool);
}
}
+
if (options == NULL)
options = apr_array_make(pool, 0, sizeof(const char *));
-
+
if (diff_cmd)
SVN_ERR(svn_path_cstring_to_utf8(&diff_cmd_baton->diff_cmd,
diff_cmd, pool));
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/svn/svn.c?rev=1542741&r1=1542740&r2=1542741&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/svn/svn.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/svn/svn.c Sun Nov 17 14:56:28 2013
@@ -2823,7 +2823,7 @@ sub_main(int argc, const char *argv[], a
/* XXX: Only diff_cmd for now, overlay rest later and stop passing
opt_state altogether? */
- if (opt_state.diff.diff_cmd)
+ if (opt_state.diff.diff_cmd)
svn_config_set(cfg_config, SVN_CONFIG_SECTION_HELPERS,
SVN_CONFIG_OPTION_DIFF_CMD, opt_state.diff.diff_cmd);
if (opt_state.diff.invoke_diff_cmd)
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/svnlook/svnlook.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/svnlook/svnlook.c?rev=1542741&r1=1542740&r2=1542741&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/svnlook/svnlook.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/svnlook/svnlook.c Sun Nov 17 14:56:28 2013
@@ -2541,6 +2541,7 @@ main(int argc, const char *argv[])
_("Invalid revision number supplied")));
}
break;
+
case 't':
opt_state.txn = opt_arg;
break;