danielsh_at_tigris.org writes:
> Log:
> Following up to r33461, fix the other uses of svn_path_join() in 'merge.c'.
>
> Not done by: kfogel
> (He blames Emacs.)
Thanks, Daniel.
I figured out what the problem was: I'd narrowed the buffer (C-x n d) to
just the function definition to facilitate some editing. Then I failed
to widen (C-x n w) the buffer before searching for other instances of
"svn_path_join". The buffer was still narrowed when I went back there
later.
Emacs: even the Boeing 747 of editors can suffer from pilot error.
(I propedited your log msg to refer back to "r33641", by the way.)
-Karl
> * subversion/libsvn_client/merge.c
> (filter_self_referential_mergeinfo, populate_remaining_ranges,
> combine_range_with_segments, svn_client_merge3):
> Use svn_path_url_add_component() instead of svn_path_join(). Remove
> inline calls to svn_path_uri_encode().
>
> Modified:
> trunk/subversion/libsvn_client/merge.c
>
> Modified: trunk/subversion/libsvn_client/merge.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/merge.c?pathrev=33644&r1=33643&r2=33644
> ==============================================================================
> --- trunk/subversion/libsvn_client/merge.c Tue Oct 14 13:40:25 2008 (r33643)
> +++ trunk/subversion/libsvn_client/merge.c Tue Oct 14 15:02:24 2008 (r33644)
> @@ -646,7 +646,8 @@ filter_self_referential_mergeinfo(apr_ar
> apr_hash_this(hi, &key, NULL, &value);
> source_path = key;
> rangelist = value;
> - merge_source_url = svn_path_join(merge_source_root_url,
> + merge_source_url =
> + svn_path_url_add_component(merge_source_root_url,
> source_path + 1, pool);
>
> for (j = 0; j < rangelist->nelts; j++)
> @@ -2974,8 +2975,8 @@ populate_remaining_ranges(apr_array_head
> else
> child_repos_path = child->path +
> (merge_target_len ? merge_target_len + 1 : 0);
> - child_url1 = svn_path_join(url1, child_repos_path, iterpool);
> - child_url2 = svn_path_join(url2, child_repos_path, iterpool);
> + child_url1 = svn_path_url_add_component(url1, child_repos_path, iterpool);
> + child_url2 = svn_path_url_add_component(url2, child_repos_path, iterpool);
>
> SVN_ERR(svn_wc__entry_versioned(&child_entry, child->path, adm_access,
> FALSE, iterpool));
> @@ -4703,12 +4704,12 @@ combine_range_with_segments(apr_array_he
>
> /* Build our merge source structure. */
> merge_source = apr_pcalloc(pool, sizeof(*merge_source));
> - merge_source->url1 = svn_path_join(source_root_url,
> - svn_path_uri_encode(path1,
> - pool), pool);
> - merge_source->url2 = svn_path_join(source_root_url,
> - svn_path_uri_encode(segment->path,
> - pool), pool);
> + merge_source->url1 = svn_path_url_add_component(source_root_url,
> + path1,
> + pool);
> + merge_source->url2 = svn_path_url_add_component(source_root_url,
> + segment->path,
> + pool);
> merge_source->rev1 = rev1;
> merge_source->rev2 = MIN(segment->range_end, maxrev);
>
> @@ -6583,8 +6584,7 @@ svn_client_merge3(const char *source1,
> related = TRUE;
>
> /* Make YC_PATH into a full URL. */
> - yc_path = svn_path_join(source_repos_root,
> - svn_path_uri_encode(yc_path, pool), pool);
> + yc_path = svn_path_url_add_component(source_repos_root, yc_path, pool);
>
> /* If the common ancestor matches the right side of our merge,
> then we only need to reverse-merge the left side. */
>
> ---------------------------------------------------------------------
> 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-10-15 18:53:54 CEST