Author: rhuijben
Date: Thu Jun 16 16:53:03 2011
New Revision: 1136542
URL: http://svn.apache.org/viewvc?rev=1136542&view=rev
Log:
Fix two small issues in the externals processing: forward all export arguments
and store the right url in the other directory external code path.
* subversion/libsvn_client/client.h
(svn_client__export_externals): Add ignore_keywords argument.
* subversion/libsvn_client/export.c
(svn_client_export5): Pass ignore_keywords.
* subversion/libsvn_client/externals.c
(switch_dir_external): Store declared url instead of actual url.
(svn_client__export_externals): Add ignore_keywords argument and pass it
to svn_client_export5.
Modified:
subversion/trunk/subversion/libsvn_client/client.h
subversion/trunk/subversion/libsvn_client/export.c
subversion/trunk/subversion/libsvn_client/externals.c
Modified: subversion/trunk/subversion/libsvn_client/client.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1136542&r1=1136541&r2=1136542&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/client.h (original)
+++ subversion/trunk/subversion/libsvn_client/client.h Thu Jun 16 16:53:03 2011
@@ -956,6 +956,7 @@ svn_client__export_externals(apr_hash_t
const char *repos_root_url,
svn_depth_t requested_depth,
const char *native_eol,
+ svn_boolean_t ignore_keywords,
svn_boolean_t *timestamp_sleep,
svn_client_ctx_t *ctx,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/libsvn_client/export.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/export.c?rev=1136542&r1=1136541&r2=1136542&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/export.c (original)
+++ subversion/trunk/subversion/libsvn_client/export.c Thu Jun 16 16:53:03 2011
@@ -1225,8 +1225,8 @@ svn_client_export5(svn_revnum_t *result_
SVN_ERR(svn_client__export_externals(eb->externals,
from_path_or_url,
to_abspath, repos_root_url,
- depth,
- native_eol, &use_sleep,
+ depth, native_eol,
+ ignore_keywords, &use_sleep,
ctx, pool));
}
}
Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1136542&r1=1136541&r2=1136542&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Thu Jun 16 16:53:03
2011
@@ -276,23 +276,18 @@ switch_dir_external(const char *local_ab
{
const char *repos_root_url;
const char *repos_uuid;
- const char *repos_relpath;
SVN_ERR(svn_wc__node_get_repos_info(&repos_root_url,
&repos_uuid,
ctx->wc_ctx, local_abspath,
pool, pool));
- SVN_ERR(svn_wc__node_get_repos_relpath(&repos_relpath,
- ctx->wc_ctx,
- local_abspath,
- pool, pool));
-
SVN_ERR(svn_wc__external_register(ctx->wc_ctx,
defining_abspath,
local_abspath, svn_node_dir,
repos_root_url, repos_uuid,
- repos_relpath,
+ svn_uri_skip_ancestor(repos_root_url,
+ url, pool),
SVN_INVALID_REVNUM,
SVN_INVALID_REVNUM,
pool));
@@ -1171,6 +1166,7 @@ svn_client__export_externals(apr_hash_t
const char *repos_root_url,
svn_depth_t requested_depth,
const char *native_eol,
+ svn_boolean_t ignore_keywords,
svn_boolean_t *timestamp_sleep,
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool)
@@ -1235,10 +1231,11 @@ svn_client__export_externals(apr_hash_t
SVN_ERR(wrap_external_error(
&eb, item_abspath,
- svn_client_export4(NULL, new_url, item_abspath,
+ svn_client_export5(NULL, new_url, item_abspath,
&item->peg_revision,
&item->revision,
- TRUE, FALSE, svn_depth_infinity,
+ TRUE, FALSE, ignore_keywords,
+ svn_depth_infinity,
native_eol,
ctx, sub_iterpool),
sub_iterpool));
