Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 336150 Details for
Bug 453020
dev-vcs/subversion, please consider patch to fix paths reported for externals
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patches 1.7.7 to prevent absolute paths in svn status with externals
subversion-1.7.7-externals.patch (text/plain), 4.23 KB, created by
David Flogeras
on 2013-01-19 18:40:41 UTC
(
hide
)
Description:
patches 1.7.7 to prevent absolute paths in svn status with externals
Filename:
MIME Type:
Creator:
David Flogeras
Created:
2013-01-19 18:40:41 UTC
Size:
4.23 KB
patch
obsolete
>Index: subversion/libsvn_client/externals.c >=================================================================== >--- subversion/libsvn_client/externals.c (revision 1434749) >+++ subversion/libsvn_client/externals.c (revision 1434750) >@@ -1125,17 +1125,19 @@ > svn_boolean_t get_all, > svn_boolean_t update, > svn_boolean_t no_ignore, >+ const char *anchor_abspath, >+ const char *anchor_relpath, > svn_client_status_func_t status_func, > void *status_baton, >- apr_pool_t *pool) >+ apr_pool_t *scratch_pool) > { > apr_hash_index_t *hi; >- apr_pool_t *iterpool = svn_pool_create(pool); >+ apr_pool_t *iterpool = svn_pool_create(scratch_pool); > > /* Loop over the hash of new values (we don't care about the old > ones). This is a mapping of versioned directories to property > values. */ >- for (hi = apr_hash_first(pool, external_map); >+ for (hi = apr_hash_first(scratch_pool, external_map); > hi; > hi = apr_hash_next(hi)) > { >@@ -1144,6 +1146,7 @@ > const char *defining_abspath = svn__apr_hash_index_val(hi); > svn_node_kind_t kind; > svn_opt_revision_t opt_rev; >+ const char *status_path; > > svn_pool_clear(iterpool); > >@@ -1174,8 +1177,17 @@ > svn_wc_notify_status_external, > iterpool), iterpool); > >+ status_path = local_abspath; >+ if (anchor_abspath) >+ { >+ status_path = svn_dirent_join(anchor_relpath, >+ svn_dirent_skip_ancestor(anchor_abspath, >+ status_path), >+ iterpool); >+ } >+ > /* And then do the status. */ >- SVN_ERR(svn_client_status5(NULL, ctx, local_abspath, &opt_rev, depth, >+ SVN_ERR(svn_client_status5(NULL, ctx, status_path, &opt_rev, depth, > get_all, update, no_ignore, FALSE, FALSE, > NULL, status_func, status_baton, > iterpool)); >Index: subversion/libsvn_client/client.h >=================================================================== >--- subversion/libsvn_client/client.h (revision 1434749) >+++ subversion/libsvn_client/client.h (revision 1434750) >@@ -1090,7 +1090,11 @@ > > /* Perform status operations on each external in EXTERNAL_MAP, a const char * > local_abspath of all externals mapping to the const char* defining_abspath. >- All other options are the same as those passed to svn_client_status(). */ >+ All other options are the same as those passed to svn_client_status(). >+ >+ If ANCHOR_ABSPATH and ANCHOR-RELPATH are not null, use them to provide >+ properly formatted relative paths >+ */ > svn_error_t * > svn_client__do_external_status(svn_client_ctx_t *ctx, > apr_hash_t *external_map, >@@ -1098,9 +1102,11 @@ > svn_boolean_t get_all, > svn_boolean_t update, > svn_boolean_t no_ignore, >+ const char *anchor_abspath, >+ const char *anchor_relpath, > svn_client_status_func_t status_func, > void *status_baton, >- apr_pool_t *pool); >+ apr_pool_t *scratch_pool); > > > /* List external items defined on each external in EXTERNALS, a const char * >Index: subversion/libsvn_client/status.c >=================================================================== >--- subversion/libsvn_client/status.c (revision 1434749) >+++ subversion/libsvn_client/status.c (revision 1434750) >@@ -530,6 +530,7 @@ > SVN_ERR(svn_client__do_external_status(ctx, external_map, > depth, get_all, > update, no_ignore, >+ sb.anchor_abspath, sb.anchor_relpath, > status_func, status_baton, pool)); > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 453020
: 336150