Author: rinrab
Date: Sun Oct 20 10:44:45 2024
New Revision: 1921434
URL: http://svn.apache.org/viewvc?rev=1921434&view=rev
Log:
Rename the merge_source_t structure to svn_client__merge_source_t (to begin
with svn_client prefix), since it might be used from any client source file.
* subversion/libsvn_client/client.h
(merge_source_t): Rename the structure to svn_client__merge_source_t.
* subversion/libsvn_client/client.h,
subversion/libsvn_client/merge.c
(): Adjust references, format code.
Modified:
subversion/trunk/subversion/libsvn_client/client.h
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1921434&r1=1921433&r2=1921434&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/client.h (original)
+++ subversion/trunk/subversion/libsvn_client/client.h Sun Oct 20 10:44:45 2024
@@ -1173,7 +1173,7 @@ svn_client__remote_propget(apr_hash_t *p
apr_pool_t *scratch_pool);
/* */
-typedef struct merge_source_t
+typedef struct svn_client__merge_source_t
{
/* "left" side URL and revision (inclusive iff youngest) */
const svn_client__pathrev_t *loc1;
@@ -1183,19 +1183,19 @@ typedef struct merge_source_t
/* True iff LOC1 is an ancestor of LOC2 or vice-versa (history-wise). */
svn_boolean_t ancestral;
-} merge_source_t;
+} svn_client__merge_source_t;
/* Return a new merge_source_t structure, allocated in RESULT_POOL,
* initialized with deep copies of LOC1 and LOC2 and ANCESTRAL. */
-merge_source_t *
+svn_client__merge_source_t *
svn_client__merge_source_create(const svn_client__pathrev_t *loc1,
const svn_client__pathrev_t *loc2,
svn_boolean_t ancestral,
apr_pool_t *result_pool);
/* Return a deep copy of SOURCE, allocated in RESULT_POOL. */
-merge_source_t *
-svn_client__merge_source_dup(const merge_source_t *source,
+svn_client__merge_source_t *
+svn_client__merge_source_dup(const svn_client__merge_source_t *source,
apr_pool_t *result_pool);
/* Description of the merge target root node (a WC working node) */
@@ -1220,7 +1220,7 @@ typedef struct svn_client__conflict_repo
{
const char *target_abspath;
/* The revision range during which conflicts were raised */
- const merge_source_t *conflicted_range;
+ const svn_client__merge_source_t *conflicted_range;
/* Was the conflicted range the last range in the whole requested merge? */
svn_boolean_t was_last_range;
} svn_client__conflict_report_t;
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1921434&r1=1921433&r2=1921434&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Sun Oct 20 10:44:45 2024
@@ -254,7 +254,7 @@ typedef struct merge_cmd_baton_t {
/* The left and right URLs and revs. The value of this field changes to
reflect the merge_source_t *currently* being merged by do_merge(). */
- merge_source_t merge_source;
+ svn_client__merge_source_t merge_source;
/* Rangelist containing single range which describes the gap, if any,
in the natural history of the merge source currently being processed.
@@ -395,13 +395,13 @@ session_url_is(svn_ra_session_t *ra_sess
/* Return a new merge_source_t structure, allocated in RESULT_POOL,
* initialized with deep copies of LOC1 and LOC2 and ANCESTRAL. */
-merge_source_t *
+svn_client__merge_source_t *
svn_client__merge_source_create(const svn_client__pathrev_t *loc1,
const svn_client__pathrev_t *loc2,
svn_boolean_t ancestral,
apr_pool_t *result_pool)
{
- merge_source_t *s
+ svn_client__merge_source_t *s
= apr_palloc(result_pool, sizeof(*s));
s->loc1 = svn_client__pathrev_dup(loc1, result_pool);
@@ -411,11 +411,11 @@ svn_client__merge_source_create(const sv
}
/* Return a deep copy of SOURCE, allocated in RESULT_POOL. */
-merge_source_t *
-svn_client__merge_source_dup(const merge_source_t *source,
+svn_client__merge_source_t *
+svn_client__merge_source_dup(const svn_client__merge_source_t *source,
apr_pool_t *result_pool)
{
- merge_source_t *s = apr_palloc(result_pool, sizeof(*s));
+ svn_client__merge_source_t *s = apr_palloc(result_pool, sizeof(*s));
s->loc1 = svn_client__pathrev_dup(source->loc1, result_pool);
s->loc2 = svn_client__pathrev_dup(source->loc2, result_pool);
@@ -637,7 +637,7 @@ make_conflict_versions(const svn_wc_conf
const char *victim_abspath,
svn_node_kind_t merge_left_node_kind,
svn_node_kind_t merge_right_node_kind,
- const merge_source_t *merge_source,
+ const svn_client__merge_source_t *merge_source,
const merge_target_t *target,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -1426,7 +1426,7 @@ record_tree_conflict(merge_cmd_baton_t *
if (HONOR_MERGEINFO(merge_b) && merge_b->merge_source.ancestral)
{
- struct merge_source_t *source;
+ struct svn_client__merge_source_t *source;
svn_client__pathrev_t *loc1;
svn_client__pathrev_t *loc2;
svn_merge_range_t range =
@@ -4200,7 +4200,7 @@ adjust_deleted_subtree_ranges(svn_client
CHILDREN_WITH_MERGEINFO are allocated in RESULT_POOL.
*/
static svn_error_t *
-fix_deleted_subtree_ranges(const merge_source_t *source,
+fix_deleted_subtree_ranges(const svn_client__merge_source_t *source,
const merge_target_t *target,
svn_ra_session_t *ra_session,
apr_array_header_t *children_with_mergeinfo,
@@ -4819,7 +4819,7 @@ filter_merged_revisions(svn_client__merg
static svn_error_t *
calculate_remaining_ranges(svn_client__merge_path_t *parent,
svn_client__merge_path_t *child,
- const merge_source_t *source,
+ const svn_client__merge_source_t *source,
svn_mergeinfo_t target_mergeinfo,
const apr_array_header_t *implicit_src_gap,
svn_boolean_t child_inherits_implicit,
@@ -4980,7 +4980,7 @@ calculate_remaining_ranges(svn_client__m
static svn_error_t *
find_gaps_in_merge_source_history(svn_revnum_t *gap_start,
svn_revnum_t *gap_end,
- const merge_source_t *source,
+ const svn_client__merge_source_t *source,
svn_ra_session_t *ra_session,
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool)
@@ -5119,7 +5119,7 @@ find_gaps_in_merge_source_history(svn_re
*/
static svn_error_t *
populate_remaining_ranges(apr_array_header_t *children_with_mergeinfo,
- const merge_source_t *source,
+ const svn_client__merge_source_t *source,
svn_ra_session_t *ra_session,
merge_cmd_baton_t *merge_b,
apr_pool_t *result_pool,
@@ -5221,7 +5221,7 @@ populate_remaining_ranges(apr_array_head
APR_ARRAY_IDX(children_with_mergeinfo, i, svn_client__merge_path_t *);
const char *child_repos_path
= svn_dirent_skip_ancestor(merge_b->target->abspath, child->abspath);
- merge_source_t child_source;
+ svn_client__merge_source_t child_source;
svn_client__merge_path_t *parent = NULL;
svn_boolean_t child_inherits_implicit;
@@ -5594,18 +5594,18 @@ typedef struct single_range_conflict_rep
{
/* What sub-range of the requested source raised conflicts?
* The 'inheritable' flag is ignored. */
- merge_source_t *conflicted_range;
+ svn_client__merge_source_t *conflicted_range;
/* What sub-range of the requested source remains to be merged?
* NULL if no more. The 'inheritable' flag is ignored. */
- merge_source_t *remaining_source;
+ svn_client__merge_source_t *remaining_source;
} single_range_conflict_report_t;
/* Create a single_range_conflict_report_t, containing deep copies of
* CONFLICTED_RANGE and REMAINING_SOURCE, allocated in RESULT_POOL. */
static single_range_conflict_report_t *
-single_range_conflict_report_create(const merge_source_t *conflicted_range,
- const merge_source_t *remaining_source,
+single_range_conflict_report_create(const svn_client__merge_source_t *conflicted_range,
+ const svn_client__merge_source_t *remaining_source,
apr_pool_t *result_pool)
{
single_range_conflict_report_t *report
@@ -5626,7 +5626,7 @@ single_range_conflict_report_create(cons
* parameters, allocated in RESULT_POOL. */
static svn_client__conflict_report_t *
conflict_report_create(const char *target_abspath,
- const merge_source_t *conflicted_range,
+ const svn_client__merge_source_t *conflicted_range,
svn_boolean_t was_last_range,
apr_pool_t *result_pool)
{
@@ -5809,7 +5809,7 @@ remove_children_with_deleted_mergeinfo(m
*/
static svn_error_t *
drive_merge_report_editor(const char *target_abspath,
- const merge_source_t *source,
+ const svn_client__merge_source_t *source,
const apr_array_header_t *children_with_mergeinfo,
const svn_diff_tree_processor_t *processor,
svn_depth_t depth,
@@ -7115,8 +7115,8 @@ static int
compare_merge_source_ts(const void *a,
const void *b)
{
- svn_revnum_t a_rev = (*(const merge_source_t *const *)a)->loc1->rev;
- svn_revnum_t b_rev = (*(const merge_source_t *const *)b)->loc1->rev;
+ svn_revnum_t a_rev = (*(const svn_client__merge_source_t *const *)a)->loc1->rev;
+ svn_revnum_t b_rev = (*(const svn_client__merge_source_t *const *)b)->loc1->rev;
if (a_rev == b_rev)
return 0;
return a_rev < b_rev ? 1 : -1;
@@ -7136,7 +7136,7 @@ combine_range_with_segments(apr_array_he
apr_pool_t *pool)
{
apr_array_header_t *merge_source_ts =
- apr_array_make(pool, 1, sizeof(merge_source_t *));
+ apr_array_make(pool, 1, sizeof(svn_client__merge_source_t *));
svn_revnum_t minrev = MIN(range->start, range->end) + 1;
svn_revnum_t maxrev = MAX(range->start, range->end);
svn_boolean_t subtractive = (range->start > range->end);
@@ -7147,7 +7147,7 @@ combine_range_with_segments(apr_array_he
svn_location_segment_t *segment =
APR_ARRAY_IDX(segments, i, svn_location_segment_t *);
svn_client__pathrev_t *loc1, *loc2;
- merge_source_t *merge_source;
+ svn_client__merge_source_t *merge_source;
const char *path1 = NULL;
svn_revnum_t rev1;
@@ -7210,7 +7210,8 @@ combine_range_with_segments(apr_array_he
TRUE /* ancestral */,
pool);
- APR_ARRAY_PUSH(merge_source_ts, merge_source_t *) = merge_source;
+ APR_ARRAY_PUSH(merge_source_ts, svn_client__merge_source_t *)
+ = merge_source;
}
/* If this was a subtractive merge, and we created more than one
@@ -7241,7 +7242,8 @@ normalize_merge_sources_internal(apr_arr
int i;
/* Initialize our return variable. */
- *merge_sources_p = apr_array_make(result_pool, 1, sizeof(merge_source_t *));
+ *merge_sources_p = apr_array_make(result_pool, 1,
+ sizeof(svn_client__merge_source_t *));
/* No ranges to merge? No problem. */
if (merge_range_ts->nelts == 0)
@@ -7534,8 +7536,8 @@ filter_natural_history_from_mergeinfo(sv
Allocate the result structure in POOL but leave the URLs in it as shallow
copies of the URLs in SOURCE.
*/
-static merge_source_t *
-subrange_source(const merge_source_t *source,
+static svn_client__merge_source_t *
+subrange_source(const svn_client__merge_source_t *source,
svn_revnum_t start_rev,
svn_revnum_t end_rev,
apr_pool_t *pool)
@@ -7589,7 +7591,7 @@ subrange_source(const merge_source_t *so
static svn_error_t *
do_file_merge(svn_mergeinfo_catalog_t result_catalog,
single_range_conflict_report_t **conflict_report,
- const merge_source_t *source,
+ const svn_client__merge_source_t *source,
const char *target_abspath,
const svn_diff_tree_processor_t *processor,
svn_boolean_t sources_related,
@@ -7749,7 +7751,7 @@ do_file_merge(svn_mergeinfo_catalog_t re
{
svn_merge_range_t *r = APR_ARRAY_IDX(ranges_to_merge, 0,
svn_merge_range_t *);
- const merge_source_t *real_source;
+ const svn_client__merge_source_t *real_source;
const char *left_file, *right_file;
apr_hash_t *left_props, *right_props;
const svn_diff_source_t *left_source;
@@ -7866,7 +7868,7 @@ do_file_merge(svn_mergeinfo_catalog_t re
if (is_path_conflicted_by_merge(merge_b))
{
- merge_source_t *remaining_range = NULL;
+ svn_client__merge_source_t *remaining_range = NULL;
if (real_source->loc2->rev != source->loc2->rev)
remaining_range = subrange_source(source,
@@ -8146,7 +8148,7 @@ subtree_touched_by_merge(const char *loc
*/
static svn_error_t *
do_mergeinfo_unaware_dir_merge(single_range_conflict_report_t **conflict_report,
- const merge_source_t *source,
+ const svn_client__merge_source_t *source,
const char *target_dir_wcpath,
apr_array_header_t *children_with_mergeinfo,
const svn_diff_tree_processor_t *processor,
@@ -9212,7 +9214,7 @@ log_noop_revs(void *baton,
forward merges (i.e. SOURCE->rev1 < SOURCE->rev2).
*/
static svn_error_t *
-remove_noop_subtree_ranges(const merge_source_t *source,
+remove_noop_subtree_ranges(const svn_client__merge_source_t *source,
const merge_target_t *target,
svn_ra_session_t *ra_session,
apr_array_header_t *children_with_mergeinfo,
@@ -9432,7 +9434,7 @@ remove_noop_subtree_ranges(const merge_s
static svn_error_t *
do_mergeinfo_aware_dir_merge(svn_mergeinfo_catalog_t result_catalog,
single_range_conflict_report_t **conflict_report,
- const merge_source_t *source,
+ const svn_client__merge_source_t *source,
const char *target_abspath,
apr_array_header_t *children_with_mergeinfo,
const svn_diff_tree_processor_t *processor,
@@ -9578,7 +9580,7 @@ do_mergeinfo_aware_dir_merge(svn_mergein
while (end_rev != SVN_INVALID_REVNUM)
{
- merge_source_t *real_source;
+ svn_client__merge_source_t *real_source;
svn_merge_range_t *first_target_range
= (target_merge_path->remaining_ranges->nelts == 0 ? NULL
: APR_ARRAY_IDX(target_merge_path->remaining_ranges, 0,
@@ -9653,7 +9655,7 @@ do_mergeinfo_aware_dir_merge(svn_mergein
we have merged. */
if (is_path_conflicted_by_merge(merge_b))
{
- merge_source_t *remaining_range = NULL;
+ svn_client__merge_source_t *remaining_range = NULL;
if (real_source->loc2->rev != source->loc2->rev)
remaining_range = subrange_source(source,
@@ -9752,7 +9754,7 @@ do_mergeinfo_aware_dir_merge(svn_mergein
static svn_error_t *
do_directory_merge(svn_mergeinfo_catalog_t result_catalog,
single_range_conflict_report_t **conflict_report,
- const merge_source_t *source,
+ const svn_client__merge_source_t *source,
const char *target_abspath,
const svn_diff_tree_processor_t *processor,
svn_depth_t depth,
@@ -9946,7 +9948,8 @@ do_merge(apr_hash_t **modified_subtrees,
/* Find out whether all of the sources are 'ancestral'. */
for (j = 0; j < merge_sources->nelts; j++)
- if (! APR_ARRAY_IDX(merge_sources, j, merge_source_t *)->ancestral)
+ if (! APR_ARRAY_IDX(merge_sources, j,
+ svn_client__merge_source_t *)->ancestral)
{
sources_ancestral = FALSE;
break;
@@ -10042,8 +10045,8 @@ do_merge(apr_hash_t **modified_subtrees,
for (i = 0; i < merge_sources->nelts; i++)
{
svn_node_kind_t src1_kind;
- merge_source_t *source =
- APR_ARRAY_IDX(merge_sources, i, merge_source_t *);
+ svn_client__merge_source_t *source =
+ APR_ARRAY_IDX(merge_sources, i, svn_client__merge_source_t *);
single_range_conflict_report_t *conflicted_range_report;
svn_pool_clear(iterpool);
@@ -10215,7 +10218,7 @@ merge_cousins_and_supplement_mergeinfo(
const merge_target_t *target,
svn_ra_session_t *URL1_ra_session,
svn_ra_session_t *URL2_ra_session,
- const merge_source_t *source,
+ const svn_client__merge_source_t *source,
const svn_client__pathrev_t *yca,
svn_boolean_t same_repos,
svn_depth_t depth,
@@ -10262,10 +10265,10 @@ merge_cousins_and_supplement_mergeinfo(
if (! record_only)
{
apr_array_header_t *faux_sources =
- apr_array_make(scratch_pool, 1, sizeof(merge_source_t *));
+ apr_array_make(scratch_pool, 1, sizeof(svn_client__merge_source_t *));
modified_subtrees = apr_hash_make(scratch_pool);
- APR_ARRAY_PUSH(faux_sources, const merge_source_t *) = source;
+ APR_ARRAY_PUSH(faux_sources, const svn_client__merge_source_t *) = source;
SVN_ERR(do_merge(&modified_subtrees, NULL, conflict_report, use_sleep,
faux_sources, target,
URL1_ra_session, TRUE, same_repos,
@@ -10683,7 +10686,7 @@ svn_client__merge_locked(svn_client__con
side, and merge the right. */
else
{
- merge_source_t source;
+ svn_client__merge_source_t source;
source.loc1 = source1_loc;
source.loc2 = source2_loc;
@@ -10720,8 +10723,9 @@ svn_client__merge_locked(svn_client__con
else
{
/* Build a single-item merge_source_t array. */
- merge_sources = apr_array_make(scratch_pool, 1, sizeof(merge_source_t *));
- APR_ARRAY_PUSH(merge_sources, merge_source_t *)
+ merge_sources = apr_array_make(scratch_pool, 1,
+ sizeof(svn_client__merge_source_t *));
+ APR_ARRAY_PUSH(merge_sources, svn_client__merge_source_t *)
= svn_client__merge_source_create(source1_loc, source2_loc,
FALSE, scratch_pool);
}
@@ -11644,7 +11648,7 @@ calculate_left_hand_side(svn_client__pat
* See svn_client_find_reintegrate_merge() for other details.
*/
static svn_error_t *
-find_reintegrate_merge(merge_source_t **source_p,
+find_reintegrate_merge(svn_client__merge_source_t **source_p,
svn_client__pathrev_t **yc_ancestor_p,
svn_ra_session_t *source_ra_session,
const svn_client__pathrev_t *source_loc,
@@ -11656,7 +11660,7 @@ find_reintegrate_merge(merge_source_t **
{
svn_client__pathrev_t *yc_ancestor;
svn_client__pathrev_t *loc1;
- merge_source_t source;
+ svn_client__merge_source_t source;
svn_mergeinfo_catalog_t unmerged_to_source_mergeinfo_catalog;
svn_mergeinfo_catalog_t merged_to_source_mergeinfo_catalog;
svn_error_t *err;
@@ -11862,7 +11866,7 @@ merge_reintegrate_locked(svn_client__con
svn_ra_session_t *target_ra_session, *source_ra_session;
merge_target_t *target;
svn_client__pathrev_t *source_loc;
- merge_source_t *source;
+ svn_client__merge_source_t *source;
svn_client__pathrev_t *yc_ancestor;
svn_boolean_t use_sleep = FALSE;
svn_error_t *err;
@@ -12869,7 +12873,7 @@ do_automatic_merge_locked(svn_client__co
if (reintegrate_like)
{
- merge_source_t source;
+ svn_client__merge_source_t source;
svn_ra_session_t *base_ra_session = NULL;
svn_ra_session_t *right_ra_session = NULL;
svn_ra_session_t *target_ra_session = NULL;
@@ -12903,7 +12907,7 @@ do_automatic_merge_locked(svn_client__co
* have not yet been merged in the opposite direction -- that a
* 'reintegrate' merge would have rejected. */
{
- merge_source_t *source2;
+ svn_client__merge_source_t *source2;
SVN_ERR(find_reintegrate_merge(&source2, NULL,
right_ra_session, merge->right,
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.