Author: julianfoad
Date: Tue Jan 23 15:43:47 2018
New Revision: 1822020
URL: http://svn.apache.org/viewvc?rev=1822020&view=rev
Log:
Update the last caller of svn_client_diff6() to svn_client_diff7(),
except in shelving, following r1822014.
* subversion/libsvn_client/diff.c
Update comments and an error message to mention svn_client_diff7().
* subversion/svn/log-cmd.c
(display_diff): Use svn_client_diff7().
Modified:
subversion/trunk/subversion/libsvn_client/diff.c
subversion/trunk/subversion/svn/log-cmd.c
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1822020&r1=1822019&r2=1822020&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Tue Jan 23 15:43:47 2018
@@ -489,7 +489,7 @@ print_git_diff_header(svn_stream_t *os,
/* A helper func that writes out verbal descriptions of property diffs
to OUTSTREAM. Of course, OUTSTREAM will probably be whatever was
- passed to svn_client_diff6(), which is probably stdout.
+ passed to svn_client_diff7(), which is probably stdout.
### FIXME needs proper docstring
@@ -1776,8 +1776,8 @@ diff_prepare_repos_repos(const char **ur
/* A Theoretical Note From Ben, regarding do_diff().
- This function is really svn_client_diff6(). If you read the public
- API description for svn_client_diff6(), it sounds quite Grand. It
+ This function is really svn_client_diff7(). If you read the public
+ API description for svn_client_diff7(), it sounds quite Grand. It
sounds really generalized and abstract and beautiful: that it will
diff any two paths, be they working-copy paths or URLs, at any two
revisions.
@@ -1801,7 +1801,7 @@ diff_prepare_repos_repos(const char **ur
pigeonholed into one of these use-cases, we currently bail with a
friendly apology.
- Perhaps someday a brave soul will truly make svn_client_diff6()
+ Perhaps someday a brave soul will truly make svn_client_diff7()
perfectly general. For now, we live with the 90% case. Certainly,
the commandline client only calls this function in legal ways.
When there are other users of svn_client.h, maybe this will become
@@ -1814,7 +1814,7 @@ static svn_error_t *
unsupported_diff_error(svn_error_t *child_err)
{
return svn_error_create(SVN_ERR_INCORRECT_PARAMS, child_err,
- _("Sorry, svn_client_diff6 was called in a way "
+ _("Sorry, svn_client_diff7 was called in a way "
"that is not yet supported"));
}
@@ -1823,7 +1823,7 @@ unsupported_diff_error(svn_error_t *chil
PATH1 and PATH2 are both working copy paths. REVISION1 and
REVISION2 are their respective revisions.
- All other options are the same as those passed to svn_client_diff6(). */
+ All other options are the same as those passed to svn_client_diff7(). */
static svn_error_t *
diff_wc_wc(const char **root_relpath,
svn_boolean_t *root_is_dir,
@@ -1888,7 +1888,7 @@ diff_wc_wc(const char **root_relpath,
and the actual two paths compared are determined by following copy
history from PATH_OR_URL2.
- All other options are the same as those passed to svn_client_diff6(). */
+ All other options are the same as those passed to svn_client_diff7(). */
static svn_error_t *
diff_repos_repos(const char **root_relpath,
svn_boolean_t *root_is_dir,
@@ -2058,7 +2058,7 @@ diff_repos_repos(const char **root_relpa
If REVERSE is TRUE, the diff will be reported in reverse.
- All other options are the same as those passed to svn_client_diff6(). */
+ All other options are the same as those passed to svn_client_diff7(). */
static svn_error_t *
diff_repos_wc(const char **root_relpath,
svn_boolean_t *root_is_dir,
Modified: subversion/trunk/subversion/svn/log-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/log-cmd.c?rev=1822020&r1=1822019&r2=1822020&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/log-cmd.c (original)
+++ subversion/trunk/subversion/svn/log-cmd.c Tue Jan 23 15:43:47 2018
@@ -88,7 +88,7 @@ display_diff(const svn_log_entry_t *log_
end_revision.value.number = log_entry->revision;
SVN_ERR(svn_stream_puts(outstream, "\n"));
- SVN_ERR(svn_client_diff_peg6(diff_options,
+ SVN_ERR(svn_client_diff_peg7(diff_options,
target_path_or_url,
target_peg_revision,
&start_revision, &end_revision,
@@ -102,6 +102,7 @@ display_diff(const svn_log_entry_t *log_
FALSE /* ignore prop diff */,
FALSE /* properties only */,
FALSE /* use git diff format */,
+ TRUE /* pretty_print_mergeinfo */,
svn_cmdline_output_encoding(pool),
outstream,
errstream,
