Seriously... are we going to have to install a pre-commit hook to fail
if people keep inserting diffs into the log message?
On Wed, Nov 5, 2008 at 12:08 PM, <gstein_at_tigris.org> wrote:
> Author: gstein
> Revision: 34067
> Property Name: svn:log
> Action: modified
>
> Property diff:
> --- old property value
> +++ new property value
> @@ -38,243 +38,3 @@ Make the tree conflicts WC API more cons
> * subversion/libsvn_wc/update_editor.c
> (check_tree_conflict): Adjust calls accordingly.
> (add_file): Adjust commented-out code accordingly.
> -
> -Index: subversion/include/svn_wc.h
> -===================================================================
> ---- subversion/include/svn_wc.h (revision 34061)
> -+++ subversion/include/svn_wc.h (working copy)
> -@@ -5278,17 +5278,16 @@ svn_wc_get_tree_conflict(svn_wc_conflict
> - svn_wc_adm_access_t *adm_access,
> - apr_pool_t *pool);
> -
> --/**
> -- * Add the tree conflict described by @a conflict to the directory entry
> -- * belonging to @a adm_access.
> -- * Do all allocations in @a pool.
> -+/** Record the tree conflict described by @a conflict in the WC.
> -+ * @a adm_access must be a write-access baton for the parent directory of
> -+ * @a victim->path. Use @a pool for all allocations.
> - *
> - * @since New in 1.6.
> - */
> - svn_error_t *
> --svn_wc_add_tree_conflict_data(const svn_wc_conflict_description_t *conflict,
> -- svn_wc_adm_access_t *adm_access,
> -- apr_pool_t *pool);
> -+svn_wc_add_tree_conflict(const svn_wc_conflict_description_t *conflict,
> -+ svn_wc_adm_access_t *adm_access,
> -+ apr_pool_t *pool);
> -
> - #ifdef __cplusplus
> - }
> -Index: subversion/libsvn_client/merge.c
> -===================================================================
> ---- subversion/libsvn_client/merge.c (revision 34061)
> -+++ subversion/libsvn_client/merge.c (working copy)
> -@@ -350,7 +350,7 @@ tree_conflict(merge_cmd_baton_t *merge_b
> - victim_path, adm_access, node_kind, svn_wc_operation_merge, merge_b->pool);
> - conflict->action = action;
> - conflict->reason = reason;
> -- SVN_ERR(svn_wc_add_tree_conflict_data(conflict, adm_access, merge_b->pool));
> -+ SVN_ERR(svn_wc_add_tree_conflict(conflict, adm_access, merge_b->pool));
> - return SVN_NO_ERROR;
> - }
> -
> -Index: subversion/libsvn_wc/adm_ops.c
> -===================================================================
> ---- subversion/libsvn_wc/adm_ops.c (revision 34061)
> -+++ subversion/libsvn_wc/adm_ops.c (working copy)
> -@@ -2218,7 +2218,7 @@ revert_internal(const char *path,
> - SVN_ERR(svn_wc_get_tree_conflict(&conflict, path, parent_access, pool));
> - if (conflict)
> - {
> -- SVN_ERR(svn_wc__del_tree_conflict_data(path, parent_access, pool));
> -+ SVN_ERR(svn_wc__del_tree_conflict(path, parent_access, pool));
> - reverted = TRUE;
> - }
> -
> -Index: subversion/libsvn_wc/tree_conflicts.c
> -===================================================================
> ---- subversion/libsvn_wc/tree_conflicts.c (revision 34061)
> -+++ subversion/libsvn_wc/tree_conflicts.c (working copy)
> -@@ -469,16 +469,14 @@ svn_wc__tree_conflict_exists(apr_array_h
> - }
> -
> - svn_error_t *
> --svn_wc__del_tree_conflict_data(const char *victim_path,
> -- svn_wc_adm_access_t *adm_access,
> -- apr_pool_t *pool)
> --{
> -- svn_stringbuf_t *log_accum = svn_stringbuf_create("", pool);
> --
> -- SVN_ERR(svn_wc__loggy_del_tree_conflict_data(log_accum,
> -- victim_path,
> -- adm_access,
> -- pool));
> -+svn_wc__del_tree_conflict(const char *victim_path,
> -+ svn_wc_adm_access_t *adm_access,
> -+ apr_pool_t *pool)
> -+{
> -+ svn_stringbuf_t *log_accum = NULL;
> -+
> -+ SVN_ERR(svn_wc__loggy_del_tree_conflict(&log_accum, victim_path, adm_access,
> -+ pool));
> -
> - SVN_ERR(svn_wc__write_log(adm_access, 0, log_accum, pool));
> - SVN_ERR(svn_wc__run_log(adm_access, NULL, pool));
> -@@ -487,16 +485,14 @@ svn_wc__del_tree_conflict_data(const cha
> - }
> -
> - svn_error_t *
> --svn_wc_add_tree_conflict_data(const svn_wc_conflict_description_t *conflict,
> -- svn_wc_adm_access_t *adm_access,
> -- apr_pool_t *pool)
> --{
> -- svn_stringbuf_t *log_accum = svn_stringbuf_create("", pool);
> --
> -- SVN_ERR(svn_wc__loggy_add_tree_conflict_data(log_accum,
> -- conflict,
> -- adm_access,
> -- pool));
> -+svn_wc_add_tree_conflict(const svn_wc_conflict_description_t *conflict,
> -+ svn_wc_adm_access_t *adm_access,
> -+ apr_pool_t *pool)
> -+{
> -+ svn_stringbuf_t *log_accum = NULL;
> -+
> -+ SVN_ERR(svn_wc__loggy_add_tree_conflict(&log_accum, conflict, adm_access,
> -+ pool));
> -
> - SVN_ERR(svn_wc__write_log(adm_access, 0, log_accum, pool));
> - SVN_ERR(svn_wc__run_log(adm_access, NULL, pool));
> -@@ -518,10 +514,10 @@ array_remove_unordered(apr_array_header_
> - }
> -
> - svn_error_t *
> --svn_wc__loggy_del_tree_conflict_data(svn_stringbuf_t *log_accum,
> -- const char *victim_path,
> -- svn_wc_adm_access_t *adm_access,
> -- apr_pool_t *pool)
> -+svn_wc__loggy_del_tree_conflict(svn_stringbuf_t **log_accum,
> -+ const char *victim_path,
> -+ svn_wc_adm_access_t *adm_access,
> -+ apr_pool_t *pool)
> - {
> - const char *dir_path;
> - const svn_wc_entry_t *entry;
> -@@ -564,7 +560,7 @@ svn_wc__loggy_del_tree_conflict_data(svn
> - /* Rewrite the entry. */
> - SVN_ERR(svn_wc__write_tree_conflicts_to_entry(conflicts, &tmp_entry,
> - pool));
> -- SVN_ERR(svn_wc__loggy_entry_modify(&log_accum,
> -+ SVN_ERR(svn_wc__loggy_entry_modify(log_accum,
> - adm_access,
> - dir_path,
> - &tmp_entry,
> -@@ -576,11 +572,10 @@ svn_wc__loggy_del_tree_conflict_data(svn
> - }
> -
> - svn_error_t *
> --svn_wc__loggy_add_tree_conflict_data(
> -- svn_stringbuf_t *log_accum,
> -- const svn_wc_conflict_description_t *conflict,
> -- svn_wc_adm_access_t *adm_access,
> -- apr_pool_t *pool)
> -+svn_wc__loggy_add_tree_conflict(svn_stringbuf_t **log_accum,
> -+ const svn_wc_conflict_description_t *conflict,
> -+ svn_wc_adm_access_t *adm_access,
> -+ apr_pool_t *pool)
> - {
> - const char *dir_path;
> - const svn_wc_entry_t *entry;
> -@@ -609,7 +604,7 @@ svn_wc__loggy_add_tree_conflict_data(
> - APR_ARRAY_PUSH(conflicts, const svn_wc_conflict_description_t *) = conflict;
> -
> - SVN_ERR(svn_wc__write_tree_conflicts_to_entry(conflicts, &tmp_entry, pool));
> -- SVN_ERR(svn_wc__loggy_entry_modify(&log_accum,
> -+ SVN_ERR(svn_wc__loggy_entry_modify(log_accum,
> - adm_access,
> - dir_path,
> - &tmp_entry,
> -Index: subversion/libsvn_wc/tree_conflicts.h
> -===================================================================
> ---- subversion/libsvn_wc/tree_conflicts.h (revision 34061)
> -+++ subversion/libsvn_wc/tree_conflicts.h (working copy)
> -@@ -145,33 +145,38 @@
> - * LOG_ACCUM a command to rewrite the entry field, and do not flush the log.
> - * This function is meant to be used in the working copy library where
> - * log accumulators are usually readily available.
> -+ *
> -+ * If *LOG_ACCUM is NULL then set *LOG_ACCUM to a new stringbug allocated in
> -+ * POOL, else append to the existing stringbuf there.
> - */
> - svn_error_t *
> --svn_wc__loggy_add_tree_conflict_data(
> -- svn_stringbuf_t *log_accum,
> -- const svn_wc_conflict_description_t *conflict,
> -- svn_wc_adm_access_t *adm_access,
> -- apr_pool_t *pool);
> -+svn_wc__loggy_add_tree_conflict(svn_stringbuf_t **log_accum,
> -+ const svn_wc_conflict_description_t *conflict,
> -+ svn_wc_adm_access_t *adm_access,
> -+ apr_pool_t *pool);
> -
> --/* Like svn_wc__del_tree_conflict_data(), but append to the log accumulator
> -+/* Like svn_wc__del_tree_conflict(), but append to the log accumulator
> - * LOG_ACCUM a command to rewrite the entry field, and do not flush the log.
> - * This function is meant to be used in the working copy library where
> - * log accumulators are usually readily available.
> -+ *
> -+ * If *LOG_ACCUM is NULL then set *LOG_ACCUM to a new stringbug allocated in
> -+ * POOL, else append to the existing stringbuf there.
> - */
> - svn_error_t *
> --svn_wc__loggy_del_tree_conflict_data(svn_stringbuf_t *log_accum,
> -- const char *victim_path,
> -- svn_wc_adm_access_t *adm_access,
> -- apr_pool_t *pool);
> -+svn_wc__loggy_del_tree_conflict(svn_stringbuf_t **log_accum,
> -+ const char *victim_path,
> -+ svn_wc_adm_access_t *adm_access,
> -+ apr_pool_t *pool);
> -
> - /* Remove any tree conflict on victim VICTIM_PATH from the directory entry
> - * belonging to ADM_ACCESS. (If there is no such conflict recorded. do
> - * nothing.)
> - * Do all allocations in POOL. */
> - svn_error_t *
> --svn_wc__del_tree_conflict_data(const char *victim_path,
> -- svn_wc_adm_access_t *adm_access,
> -- apr_pool_t *pool);
> -+svn_wc__del_tree_conflict(const char *victim_path,
> -+ svn_wc_adm_access_t *adm_access,
> -+ apr_pool_t *pool);
> -
> - /**
> - * Read tree conflict descriptions from @a dir_entry.
> -Index: subversion/libsvn_wc/update_editor.c
> -===================================================================
> ---- subversion/libsvn_wc/update_editor.c (revision 34061)
> -+++ subversion/libsvn_wc/update_editor.c (working copy)
> -@@ -1437,8 +1437,8 @@ check_tree_conflict(svn_wc_conflict_desc
> - conflict->action = action;
> - conflict->reason = reason;
> -
> -- SVN_ERR(svn_wc__loggy_add_tree_conflict_data(log_accum, conflict,
> -- parent_adm_access, pool));
> -+ SVN_ERR(svn_wc__loggy_add_tree_conflict(&log_accum, conflict,
> -+ parent_adm_access, pool));
> -
> - if (pconflict)
> - *pconflict = conflict;
> -@@ -2714,8 +2714,8 @@ add_file(const char *path,
> - conflict->action = svn_wc_conflict_action_add;
> - conflict->reason = svn_wc_conflict_reason_obstructed;
> -
> -- SVN_ERR(svn_wc__loggy_add_tree_conflict_data(pb->log_accum, conflict,
> -- adm_access, pool));
> -+ SVN_ERR(svn_wc__loggy_add_tree_conflict(&pb->log_accum, conflict,
> -+ adm_access, pool));
> -
> - if (eb->notify_func)
> - {
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-05 21:10:56 CET