subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1188183 - in /subversion/trunk/subversion: libsvn_client/merge.c libsvn_client/mergeinfo.c libsvn_subr/mergeinfo.c
Date Mon, 24 Oct 2011 15:56:40 GMT
Author: julianfoad
Date: Mon Oct 24 15:56:39 2011
New Revision: 1188183

URL: http://svn.apache.org/viewvc?rev=1188183&view=rev
Log:
Fix incorrect usage of svn_dirent_*() in merge code dealing with paths relative
to the repository root.

* subversion/libsvn_client/merge.c
  (update_wc_mergeinfo, record_mergeinfo_for_added_subtrees, log_noop_revs):
    Use svn_fspath__*() instead of svn_dirent_*() for in-repository paths.

* subversion/libsvn_client/mergeinfo.c
  (svn_client_mergeinfo_log): Same.

* subversion/libsvn_subr/mergeinfo.c
  (svn_mergeinfo__add_suffix_to_mergeinfo): Same.

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c
    subversion/trunk/subversion/libsvn_client/mergeinfo.c
    subversion/trunk/subversion/libsvn_subr/mergeinfo.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1188183&r1=1188182&r2=1188183&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Oct 24 15:56:39 2011
@@ -4603,9 +4603,9 @@ update_wc_mergeinfo(svn_mergeinfo_catalo
                                                         local_abspath,
                                                         iterpool);
       if (local_abspath_rel_to_target)
-        rel_path = svn_dirent_join(repos_rel_path,
-                                   local_abspath_rel_to_target,
-                                   iterpool);
+        rel_path = svn_fspath__join(repos_rel_path,
+                                    local_abspath_rel_to_target,
+                                    iterpool);
       else
         rel_path = repos_rel_path;
       rangelist = apr_hash_get(mergeinfo, rel_path, APR_HASH_KEY_STRING);
@@ -7906,9 +7906,9 @@ record_mergeinfo_for_added_subtrees(
           rel_added_path = svn_dirent_is_child(target_merge_path->abspath,
                                                added_abspath, iterpool);
           SVN_ERR_ASSERT(rel_added_path);
-          added_path_mergeinfo_path = svn_dirent_join(mergeinfo_path,
-                                                      rel_added_path,
-                                                      iterpool);
+          added_path_mergeinfo_path = svn_fspath__join(mergeinfo_path,
+                                                       rel_added_path,
+                                                       iterpool);
           apr_hash_set(merge_mergeinfo, added_path_mergeinfo_path,
                        APR_HASH_KEY_STRING, rangelist);
 
@@ -8110,7 +8110,7 @@ log_noop_revs(void *baton,
 
           /* Didn't find anything so crawl up to the parent. */
           cwmi_path = svn_dirent_dirname(cwmi_path, scratch_pool);
-          path = svn_dirent_dirname(path, scratch_pool);
+          path = svn_fspath__dirname(path, scratch_pool);
 
           /* At this point *if* we find mergeinfo it will be inherited. */
           mergeinfo_inherited = TRUE;

Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1188183&r1=1188182&r2=1188183&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Mon Oct 24 15:56:39 2011
@@ -2024,9 +2024,8 @@ svn_client_mergeinfo_log(svn_boolean_t f
                                        finding_merged,
                                        master_inheritable_rangelist,
                                        target_mergeinfo_cat,
-                                       svn_dirent_join("/",
-                                                       target_repos_rel,
-                                                       scratch_pool),
+                                       svn_fspath__join("/", target_repos_rel,
+                                                        scratch_pool),
                                        discover_changed_paths,
                                        revprops,
                                        log_receiver, log_receiver_baton,

Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=1188183&r1=1188182&r2=1188183&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Mon Oct 24 15:56:39 2011
@@ -2228,7 +2228,7 @@ svn_mergeinfo__add_suffix_to_mergeinfo(s
       apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
 
       apr_hash_set(*out_mergeinfo,
-                   svn_dirent_join(path, suffix_relpath, result_pool),
+                   svn_fspath__join(path, suffix_relpath, result_pool),
                    APR_HASH_KEY_STRING,
                    rangelist);
     }



Mime
View raw message