On Wed, 23 Mar 2005 cmpilato@tigris.org wrote:
> Author: cmpilato
> Date: Wed Mar 23 20:10:17 2005
> New Revision: 13631
>
> Log:
> Merge the functionalities of svn_fs_attach_lock() and svn_fs_lock()
> into a single function (svn_fs_lock).
>
> * subversion/include/svn_fs.h
> (svn_fs_lock): Add (optional) 'token' parameter, and move the
> 'force' parameter closer to the end. Finally, make 'timeout' an
> apr_time_t.
...
> ==============================================================================
> --- trunk/subversion/include/svn_fs.h (original)
> +++ trunk/subversion/include/svn_fs.h Wed Mar 23 20:10:17 2005
> @@ -1494,19 +1494,27 @@
> * 'owner' field in the new lock to the fs username.
> *
> * @a comment is optional: it's either an xml-escapable UTF8 string
> - * which describes the lock, or it is NULL.
> + * which describes the lock, or it is @c NULL.
> *
> * If path is already locked, then return @c SVN_ERR_FS_PATH_LOCKED.
> * If @a force is true, then "steal" the existing lock anyway, even if
> * the FS access-context's username does not match the current lock's
> * owner: delete the existing lock on @a path, and create a new one.
> *
> + * @a token is a lock token such as can be generated using @c
> + * svn_fs_generate_lock_token (indicating that the caller wants to
> + * dictate the lock token used), or it is @c NULL (indicating that the
> + * caller wishes to have a new token generated by this function). If
> + * @a token is not @c NULL, and represents an existing lock, then @a
> + * path must match the path associated with that existing lock.
> + *
> * If @a timeout is zero, then create a non-expiring lock. Else, the
> * lock will expire in @a timeout seconds after creation.
> *
> * If @a current_rev is a valid revnum, then do an out-of-dateness
> * check. If the revnum is less than the last-changed-revision of @a
> - * path (or if @a path doesn't exist in HEAD), return SVN_ERR_FS_OUT_OF_DATE.
> + * path (or if @a path doesn't exist in HEAD), return @c
> + * SVN_ERR_FS_OUT_OF_DATE.
> *
> * If @a path is non-existent, that's fine. The path is reserved, and
> * a lock-token is returned.
This got turned off later.
> @@ -1516,48 +1524,12 @@
> svn_error_t *svn_fs_lock (svn_lock_t **lock,
> svn_fs_t *fs,
> const char *path,
> + const char *token,
> const char *comment,
> - svn_boolean_t force,
> long int timeout,
That's not an apr_time_t as the log says. (I'd support that change,
though.)
Have a nice easter,
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 24 13:19:53 2005