On Fri, 4 Mar 2005 sussman@tigris.org wrote:
> Modified: branches/locking/subversion/libsvn_client/info.c
> Url: http://svn.collab.net/viewcvs/svn/branches/locking/subversion/libsvn_client/info.c?view=diff&rev=13264&p1=branches/locking/subversion/libsvn_client/info.c&r1=13263&p2=branches/locking/subversion/libsvn_client/info.c&r2=13264
> ==============================================================================
> --- branches/locking/subversion/libsvn_client/info.c (original)
> +++ branches/locking/subversion/libsvn_client/info.c Fri Mar 4 13:22:17 2005
> @@ -86,6 +89,17 @@
> tmpinfo->conflict_wrk = entry->conflict_wrk;
> tmpinfo->prejfile = entry->prejfile;
>
> + /* lock stuff */
> + if (entry->lock_token) /* the token is the critical bit. */
> + {
> + tmpinfo->lock = apr_pcalloc (pool, sizeof(*(tmpinfo->lock)));
> +
> + tmpinfo->lock->token = entry->lock_token;
> + tmpinfo->lock->owner = entry->lock_owner;
> + tmpinfo->lock->comment = entry->lock_comment;
> + tmpinfo->lock->creation_date = entry->lock_crt_date;
So the path is allowed to be null in an svn_lock_t?
> @@ -150,7 +170,6 @@
>
>
>
> -
> /* Callback and baton for crawl_entries() walk over entries files. */
> struct found_entry_baton
> {
> @@ -251,6 +270,7 @@
> const char *url;
> svn_node_kind_t url_kind;
> const char *repos_root_URL, *repos_UUID;
> + svn_lock_t *lock;
> apr_hash_t *parent_ents;
> const char *parent_url, *base_name;
> svn_dirent_t *the_ent;
> @@ -335,20 +355,60 @@
> _("URL '%s' non-existent in revision '%ld'"),
> url, rev);
>
> - /* Push the URL's dirent at the callback.*/
> - SVN_ERR (build_info_from_dirent (&info, the_ent, url, rev,
> + /* Possibly discover a lock attached to the remote URL. */
> + lock = NULL;
> + if (peg_revision->kind == svn_opt_revision_head)
> + {
> + err = svn_ra_get_lock (ra_session, &lock, "", pool);
> +
> + /* An old mod_dav_svn will always work; there's nothing wrong with
> + doing a PROPFIND for a property named "DAV:supportedlock". But
> + an old svnserve will error. */
> + if (err && err->apr_err == SVN_ERR_RA_SVN_UNKNOWN_CMD)
Hmmm... If I read my own code correctly, this error is converted to
SVN_ERR_RA_NOT_IMPLEMENTED in libsvn_ra_svn/client.c. So you should check
for that instead.
Regards,
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Mar 5 23:26:02 2005