Author: breser
Date: Thu Dec 5 19:21:00 2013
New Revision: 1548250
URL: http://svn.apache.org/r1548250
Log:
Fix mergeinfo --log to be consistent with log in printing a trailing separator.
* subversion/svn/cl-log.h
(SVN_CL__LOG_SEP_STRING): New constant, moved from...
* subversion/svn/log-cmd.c
(SEP_STRING): Removed
(svn_cl__log_entry_receiver, svn_cl__log): Change to new constant.
* subversion/svn/mergeinfo-cmd.c
(mergeinfo_log): Print a trailing separator when printing log details.
Modified:
subversion/trunk/subversion/svn/cl-log.h
subversion/trunk/subversion/svn/log-cmd.c
subversion/trunk/subversion/svn/mergeinfo-cmd.c
Modified: subversion/trunk/subversion/svn/cl-log.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl-log.h?rev=1548250&r1=1548249&r2=1548250&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl-log.h (original)
+++ subversion/trunk/subversion/svn/cl-log.h Thu Dec 5 19:21:00 2013
@@ -37,6 +37,10 @@ extern "C" {
+/* The separator between log messages. */
+#define SVN_CL__LOG_SEP_STRING \
+ "------------------------------------------------------------------------\n"
+
/* Baton for log_entry_receiver() and log_entry_receiver_xml(). */
typedef struct svn_cl__log_receiver_baton
{
Modified: subversion/trunk/subversion/svn/log-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/log-cmd.c?rev=1548250&r1=1548249&r2=1548250&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/log-cmd.c (original)
+++ subversion/trunk/subversion/svn/log-cmd.c Thu Dec 5 19:21:00 2013
@@ -46,9 +46,6 @@
/*** Code. ***/
-/* The separator between log messages. */
-#define SEP_STRING \
- "------------------------------------------------------------------------\n"
/* Display a diff of the subtree TARGET_PATH_OR_URL@TARGET_PEG_REVISION as
@@ -340,7 +337,7 @@ svn_cl__log_entry_receiver(void *baton,
}
SVN_ERR(svn_cmdline_printf(pool,
- SEP_STRING "r%ld | %s | %s",
+ SVN_CL__LOG_SEP_STRING "r%ld | %s | %s",
log_entry->revision, author, date));
if (message != NULL)
@@ -840,7 +837,7 @@ svn_cl__log(apr_getopt_t *os,
pool));
if (! opt_state->incremental)
- SVN_ERR(svn_cmdline_printf(pool, SEP_STRING));
+ SVN_ERR(svn_cmdline_printf(pool, SVN_CL__LOG_SEP_STRING));
}
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/svn/mergeinfo-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/mergeinfo-cmd.c?rev=1548250&r1=1548249&r2=1548250&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/trunk/subversion/svn/mergeinfo-cmd.c Thu Dec 5 19:21:00 2013
@@ -319,6 +319,9 @@ mergeinfo_log(svn_boolean_t finding_merg
TRUE, depth, revprops, ctx,
pool));
+ if (include_log_details)
+ SVN_ERR(svn_cmdline_printf(pool, SVN_CL__LOG_SEP_STRING));
+
return SVN_NO_ERROR;
}
