← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/libsvn_client/relocate.c

  • Committer: Package Import Robot
  • Author(s): James McCoy, Peter Samuelson, James McCoy
  • Date: 2014-01-12 19:48:33 UTC
  • mfrom: (0.2.10)
  • Revision ID: package-import@ubuntu.com-20140112194833-w3axfwksn296jn5x
Tags: 1.8.5-1
http://bugs.debian.org/725787
http://bugs.debian.org/507430
http://bugs.debian.org/734163
http://bugs.debian.org/601544
http://bugs.debian.org/687291
http://bugs.debian.org/273874
http://bugs.debian.org/690815
http://bugs.debian.org/654172
http://bugs.debian.org/678224
http://bugs.debian.org/566148
http://bugs.debian.org/734918
http://bugs.debian.org/722393
[ Peter Samuelson ]
* New upstream release.  (Closes: #725787) Rediff patches:
  - Remove apr-abi1 (applied upstream), rename apr-abi2 to apr-abi
  - Remove loosen-sqlite-version-check (shouldn't be needed)
  - Remove java-osgi-metadata (applied upstream)
  - svnmucc prompts for a changelog if none is provided. (Closes: #507430)
  - Remove fix-bdb-version-detection, upstream uses "apu-config --dbm-libs"
  - Remove ruby-test-wc (applied upstream)
  - Fix “svn diff -r N file” when file has svn:mime-type set.
    (Closes: #734163)
  - Support specifying an encoding for mod_dav_svn's environment in which
    hooks are run.  (Closes: #601544)
  - Fix ordering of “svnadmin dump” paths with certain APR versions.
    (Closes: #687291)
  - Provide a better error message when authentication fails with an
    svn+ssh:// URL.  (Closes: #273874)
  - Updated Polish translations.  (Closes: #690815)

[ James McCoy ]
* Remove all traces of libneon, replaced by libserf.
* patches/sqlite_3.8.x_workaround: Upstream fix for wc-queries-test test
  failurse.
* Run configure with --with-apache-libexecdir, which allows removing part of
  patches/rpath.
* Re-enable auth-test as upstream has fixed the problem of picking up
  libraries from the environment rather than the build tree.
  (Closes: #654172)
* Point LD_LIBRARY_PATH at the built auth libraries when running the svn
  command during the build.  (Closes: #678224)
* Add a NEWS entry describing how to configure mod_dav_svn to understand
  UTF-8.  (Closes: #566148)
* Remove ancient transitional package, libsvn-ruby.
* Enable compatibility with Sqlite3 versions back to Wheezy.
* Enable hardening flags.  (Closes: #734918)
* patches/build-fixes: Enable verbose build logs.
* Build against the default ruby version.  (Closes: #722393)

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_client/relocate.c
100
100
  if (! url_uuid)
101
101
    {
102
102
      apr_pool_t *sesspool = svn_pool_create(pool);
103
 
      svn_ra_session_t *ra_session;
104
 
      SVN_ERR(svn_client__open_ra_session_internal(&ra_session, NULL, url, NULL,
105
 
                                                   NULL, FALSE, TRUE,
106
 
                                                   b->ctx, sesspool));
 
103
 
107
104
      url_uuid = &APR_ARRAY_PUSH(uuids, struct url_uuid_t);
108
 
      SVN_ERR(svn_ra_get_uuid2(ra_session, &(url_uuid->uuid), pool));
109
 
      SVN_ERR(svn_ra_get_repos_root2(ra_session, &(url_uuid->root), pool));
 
105
      SVN_ERR(svn_client_get_repos_root(&url_uuid->root,
 
106
                                        &url_uuid->uuid,
 
107
                                        url, b->ctx,
 
108
                                        pool, sesspool));
 
109
 
110
110
      svn_pool_destroy(sesspool);
111
111
    }
112
112
 
139
139
                   apr_array_header_t *ext_desc,
140
140
                   const char *old_parent_repos_root_url,
141
141
                   const char *new_parent_repos_root_url,
142
 
                   svn_boolean_t ignore_externals,
143
142
                   svn_client_ctx_t *ctx,
144
143
                   apr_pool_t *scratch_pool)
145
144
{
146
 
  const char *url;
147
145
  apr_pool_t *iterpool;
148
146
  int i;
149
147
 
150
 
  SVN_ERR(svn_client_url_from_path2(&url, local_abspath, ctx,
151
 
                                    scratch_pool, scratch_pool));
152
 
 
153
148
  /* Parse an externals definition into an array of external items. */
154
149
 
155
150
  iterpool = svn_pool_create(scratch_pool);
185
180
                                                      ext_item->target_dir,
186
181
                                                      iterpool),
187
182
                                      iterpool));
188
 
      err = svn_client_root_url_from_path(&target_repos_root_url,
189
 
                                          target_abspath, ctx, iterpool);
 
183
      err = svn_client_get_repos_root(&target_repos_root_url, NULL /* uuid */,
 
184
                                      target_abspath, ctx, iterpool, iterpool);
190
185
 
191
186
      /* Ignore externals that aren't present in the working copy.
192
187
       * This can happen if an external is deleted from disk accidentally,
203
198
        SVN_ERR(svn_client_relocate2(target_abspath,
204
199
                                     old_parent_repos_root_url,
205
200
                                     new_parent_repos_root_url,
206
 
                                     ignore_externals, ctx, iterpool));
 
201
                                     FALSE, ctx, iterpool));
207
202
    }
208
203
 
209
204
  svn_pool_destroy(iterpool);
248
243
    }
249
244
 
250
245
  /* Fetch our current root URL. */
251
 
  SVN_ERR(svn_client_root_url_from_path(&old_repos_root_url, local_abspath,
252
 
                                        ctx, pool));
 
246
  SVN_ERR(svn_client_get_repos_root(&old_repos_root_url, NULL /* uuid */,
 
247
                                    local_abspath, ctx, pool, pool));
253
248
 
254
249
  /* Perform the relocation. */
255
250
  SVN_ERR(svn_wc_relocate4(ctx->wc_ctx, local_abspath, from_prefix, to_prefix,
256
251
                           validator_func, &vb, pool));
257
252
 
258
253
  /* Now fetch new current root URL. */
259
 
  SVN_ERR(svn_client_root_url_from_path(&new_repos_root_url, local_abspath,
260
 
                                        ctx, pool));
 
254
  SVN_ERR(svn_client_get_repos_root(&new_repos_root_url, NULL /* uuid */,
 
255
                                    local_abspath, ctx, pool, pool));
261
256
 
262
257
 
263
258
  /* Relocate externals, too (if any). */
285
280
                                                  iterpool));
286
281
      if (ext_desc->nelts)
287
282
        SVN_ERR(relocate_externals(this_abspath, ext_desc, old_repos_root_url,
288
 
                                   new_repos_root_url, ignore_externals, ctx,
289
 
                                   iterpool));
 
283
                                   new_repos_root_url, ctx, iterpool));
290
284
    }
291
285
 
292
286
  svn_pool_destroy(iterpool);