You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/09/28 19:35:26 UTC
svn commit: r1002283 [6/10] - in /subversion/branches/javahl-ra: ./ build/
notes/ notes/http-and-webdav/ notes/wc-ng/ subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/javahl/src/org/tig...
Modified: subversion/branches/javahl-ra/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/mod_dav_svn/repos.c?rev=1002283&r1=1002282&r2=1002283&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/mod_dav_svn/repos.c (original)
+++ subversion/branches/javahl-ra/subversion/mod_dav_svn/repos.c Tue Sep 28 17:35:22 2010
@@ -1140,7 +1140,7 @@ dav_svn_split_uri(request_rec *r,
const char *root_path,
const char **cleaned_uri,
int *trailing_slash,
- const char **repos_name,
+ const char **repos_basename,
const char **relative_path,
const char **repos_path)
{
@@ -1216,14 +1216,14 @@ dav_svn_split_uri(request_rec *r,
### slash. something about SVN-private-path */
/* Depending on whether SVNPath or SVNParentPath was used, we need
- to compute 'relative' and 'repos_name' differently. */
+ to compute 'relative' and 'repos_basename' differently. */
/* Normal case: the SVNPath command was used to specify a
particular repository. */
if (fs_path != NULL)
{
- /* the repos_name is the last component of root_path. */
- *repos_name = svn_dirent_basename(root_path, r->pool);
+ /* the repos_basename is the last component of root_path. */
+ *repos_basename = svn_dirent_basename(root_path, r->pool);
/* 'relative' is already correct for SVNPath; the root_path
already contains the name of the repository, so relative is
@@ -1264,7 +1264,7 @@ dav_svn_split_uri(request_rec *r,
}
/* return answer */
- *repos_name = magic_component;
+ *repos_basename = magic_component;
}
/* We can return 'relative' at this point too. */
@@ -1882,7 +1882,7 @@ get_resource(request_rec *r,
dav_resource_combined *comb;
dav_svn_repos *repos;
const char *cleaned_uri;
- const char *repos_name;
+ const char *repo_basename;
const char *relative;
const char *repos_path;
const char *repos_key;
@@ -1925,7 +1925,7 @@ get_resource(request_rec *r,
/* This does all the work of interpreting/splitting the request uri. */
err = dav_svn_split_uri(r, r->uri, root_path,
&cleaned_uri, &had_slash,
- &repos_name, &relative, &repos_path);
+ &repo_basename, &relative, &repos_path);
if (err)
return err;
@@ -1938,9 +1938,9 @@ get_resource(request_rec *r,
{
/* ...then the URL to the repository is actually one implicit
component longer... */
- root_path = svn_uri_join(root_path, repos_name, r->pool);
+ root_path = svn_uri_join(root_path, repo_basename, r->pool);
/* ...and we need to specify exactly what repository to open. */
- fs_path = svn_dirent_join(fs_parent_path, repos_name, r->pool);
+ fs_path = svn_dirent_join(fs_parent_path, repo_basename, r->pool);
}
/* Start building and filling a 'combination' object. */
@@ -2011,7 +2011,7 @@ get_resource(request_rec *r,
repos->repo_name = repo_name;
/* The repository filesystem basename */
- repos->repo_basename = repos_name;
+ repos->repo_basename = repo_basename;
/* An XSL transformation */
repos->xslt_uri = xslt_uri;
Modified: subversion/branches/javahl-ra/subversion/mod_dav_svn/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/mod_dav_svn/util.c?rev=1002283&r1=1002282&r2=1002283&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/mod_dav_svn/util.c (original)
+++ subversion/branches/javahl-ra/subversion/mod_dav_svn/util.c Tue Sep 28 17:35:22 2010
@@ -107,6 +107,9 @@ dav_svn__convert_err(svn_error_t *serr,
case SVN_ERR_FS_PATH_ALREADY_LOCKED:
status = HTTP_LOCKED;
break;
+ case SVN_ERR_FS_PROP_BASEVALUE_MISMATCH:
+ status = HTTP_PRECONDITION_FAILED;
+ break;
/* add other mappings here */
}
Modified: subversion/branches/javahl-ra/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/mod_dav_svn/version.c?rev=1002283&r1=1002282&r2=1002283&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/mod_dav_svn/version.c (original)
+++ subversion/branches/javahl-ra/subversion/mod_dav_svn/version.c Tue Sep 28 17:35:22 2010
@@ -41,7 +41,6 @@
#include "private/svn_log.h"
#include "dav_svn.h"
-#include "mod_dav_svn.h"
svn_error_t *
@@ -143,6 +142,7 @@ get_vsn_options(apr_pool_t *p, apr_text_
/* Send SVN_RA_CAPABILITY_* capabilities. */
apr_text_append(p, phdr, SVN_DAV_NS_DAV_SVN_DEPTH);
apr_text_append(p, phdr, SVN_DAV_NS_DAV_SVN_LOG_REVPROPS);
+ apr_text_append(p, phdr, SVN_DAV_NS_DAV_SVN_ATOMIC_REVPROPS);
apr_text_append(p, phdr, SVN_DAV_NS_DAV_SVN_PARTIAL_REPLAY);
/* Mergeinfo is a special case: here we merely say that the server
* knows how to handle mergeinfo -- whether the repository does too
@@ -1015,22 +1015,6 @@ deliver_report(request_rec *r,
if (doc->root->ns == ns)
{
- const char *cleaned_uri, *relative_path, *repos_path;
- int trailing_slash;
- /* During SVNPathAuthz short_circuit
- * resource->info->repos->repo_name becomes NULL.*/
- if (resource->info->repos->repo_name == NULL)
- {
- dav_error *err;
- err = dav_svn_split_uri(r, r->uri, dav_svn__get_root_dir(r),
- &cleaned_uri, &trailing_slash,
- &(resource->info->repos->repo_name),
- &relative_path, &repos_path);
- if (err)
- {
- return err;
- }
- }
/* ### note that these report names should have symbols... */
if (strcmp(doc->root->name, "update-report") == 0)