On Wednesday 22 December 2010 11:32 AM, Noorul Islam K M wrote:
vijay<vi...@collab.net> writes:
Hi,
I have attached a patch that fixes few deprecation warnings while
compiling libsvn_client/log.c.
Attached log message also.
I could see this usage at one more place,
subversion/svn/commit-cmd.c. Do you think this can also be included as
part of this patch?
Thanks Noorul.
Attached the updated patch that fixes deprecation warning in
subversion/svn/commit-cmd.c also.
Regards,
Vijayaguru
Thanks and Regards
Noorul
Index: subversion/svn/commit-cmd.c
===================================================================
--- subversion/svn/commit-cmd.c (revision 1051468)
+++ subversion/svn/commit-cmd.c (working copy)
@@ -34,6 +34,7 @@
#include "svn_wc.h"
#include "svn_client.h"
#include "svn_path.h"
+#include "svn_dirent_uri.h"
#include "svn_error.h"
#include "svn_config.h"
#include "cl.h"
@@ -78,11 +79,8 @@
SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, pool));
/* Condense the targets (like commit does)... */
- SVN_ERR(svn_path_condense_targets(&base_dir,
- &condensed_targets,
- targets,
- TRUE,
- pool));
+ SVN_ERR(svn_dirent_condense_targets(&base_dir, &condensed_targets, targets,
+ TRUE, pool, pool));
if ((! condensed_targets) || (! condensed_targets->nelts))
{
Index: subversion/libsvn_client/log.c
===================================================================
--- subversion/libsvn_client/log.c (revision 1051468)
+++ subversion/libsvn_client/log.c (working copy)
@@ -459,8 +459,8 @@
return SVN_NO_ERROR;
/* Find the base URL and condensed targets relative to it. */
- SVN_ERR(svn_path_condense_targets(&url_or_path, &condensed_targets,
- target_urls, TRUE, pool));
+ SVN_ERR(svn_uri_condense_targets(&url_or_path, &condensed_targets,
+ target_urls, TRUE, pool, pool));
if (condensed_targets->nelts == 0)
APR_ARRAY_PUSH(condensed_targets, const char *) = "";
@@ -476,7 +476,8 @@
* we use our initial target path to figure out where to root the RA
* session, otherwise we use our URL. */
if (SVN_CLIENT__REVKIND_NEEDS_WC(peg_rev.kind))
- SVN_ERR(svn_path_condense_targets(&ra_target, NULL, targets, TRUE,
pool));
+ SVN_ERR(svn_dirent_condense_targets(&ra_target, NULL, targets,
+ TRUE, pool, pool));
else
ra_target = url_or_path;
[[[
Reslove some deprecation warnings using uri/dirent functions in its respective
places.
* subversion/libsvn_client/log.c
(svn_client_log5): Use 'svn_uri_condense_targets()' and
'svn_dirent_condense_targets()'
* subversion/svn/commit-cmd.c
(svn_cl__commit): Use 'svn_dirent_condense_targets()'
Patch by: Vijayaguru G <vi...@collab.net>
Suggested by: kameshj
Noorul Islam K M
]]]
