You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/01/19 18:38:06 UTC
svn commit: r1060883 - in /subversion/trunk/subversion:
include/private/svn_repos_private.h include/svn_repos.h
libsvn_repos/hooks.c libsvn_repos/repos.c
Author: julianfoad
Date: Wed Jan 19 17:38:05 2011
New Revision: 1060883
URL: http://svn.apache.org/viewvc?rev=1060883&view=rev
Log:
Move 'obliterate' functions out of the public API, since the feature is only
at an investigative stage, to clean up the public API ready for 1.7. (This
is merely the minimal necessary change. We may want to go further and
entirely remove the existing 'obliterate' source code from the code base.)
* subversion/include/svn_repos.h
(svn_repos_pre_obliterate_hook, svn_repos_post_obliterate_hook): Move
and rename to ...
* subversion/include/private/svn_repos_private.h
(svn_repos__pre_obliterate_hook, svn_repos__post_obliterate_hook): ... here.
* subversion/libsvn_repos/repos.c
(svn_repos_pre_obliterate_hook, svn_repos_post_obliterate_hook): Rename as
above.
(create_hooks): Track the above change.
* subversion/libsvn_repos/hooks.c
(svn_repos__hooks_pre_obliterate): Track the above change.
Modified:
subversion/trunk/subversion/include/private/svn_repos_private.h
subversion/trunk/subversion/include/svn_repos.h
subversion/trunk/subversion/libsvn_repos/hooks.c
subversion/trunk/subversion/libsvn_repos/repos.c
Modified: subversion/trunk/subversion/include/private/svn_repos_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_repos_private.h?rev=1060883&r1=1060882&r2=1060883&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_repos_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_repos_private.h Wed Jan 19 17:38:05 2011
@@ -69,6 +69,24 @@ svn_repos__obliterate_path_rev(svn_repos
const char *path,
apr_pool_t *pool);
+/** Return the path to @a repos's pre-obliterate hook, allocated in
+ * @a pool.
+ *
+ * @since New in 1.7.
+ */
+const char *
+svn_repos__pre_obliterate_hook(svn_repos_t *repos,
+ apr_pool_t *pool);
+
+/** Return the path to @a repos's post-obliterate hook, allocated in
+ * @a pool.
+ *
+ * @since New in 1.7.
+ */
+const char *
+svn_repos__post_obliterate_hook(svn_repos_t *repos,
+ apr_pool_t *pool);
+
/** Validate that property @a name is valid for use in a Subversion
* repository; return @c SVN_ERR_REPOS_BAD_ARGS if it isn't. For some
Modified: subversion/trunk/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1060883&r1=1060882&r2=1060883&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Wed Jan 19 17:38:05 2011
@@ -671,24 +671,6 @@ const char *
svn_repos_post_revprop_change_hook(svn_repos_t *repos,
apr_pool_t *pool);
-/** Return the path to @a repos's pre-obliterate hook, allocated in
- * @a pool.
- *
- * @since New in 1.7.
- */
-const char *
-svn_repos_pre_obliterate_hook(svn_repos_t *repos,
- apr_pool_t *pool);
-
-/** Return the path to @a repos's post-obliterate hook, allocated in
- * @a pool.
- *
- * @since New in 1.7.
- */
-const char *
-svn_repos_post_obliterate_hook(svn_repos_t *repos,
- apr_pool_t *pool);
-
/** @defgroup svn_repos_lock_hooks Paths to lock hooks
* @{
Modified: subversion/trunk/subversion/libsvn_repos/hooks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/hooks.c?rev=1060883&r1=1060882&r2=1060883&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/hooks.c (original)
+++ subversion/trunk/subversion/libsvn_repos/hooks.c Wed Jan 19 17:38:05 2011
@@ -35,6 +35,7 @@
#include "repos.h"
#include "svn_private_config.h"
#include "private/svn_fs_private.h"
+#include "private/svn_repos_private.h"
@@ -592,7 +593,7 @@ svn_repos__hooks_pre_obliterate(svn_repo
const svn_string_t *obliteration_set,
apr_pool_t *pool)
{
- const char *hook = svn_repos_pre_obliterate_hook(repos, pool);
+ const char *hook = svn_repos__pre_obliterate_hook(repos, pool);
svn_boolean_t broken_link;
if ((hook = check_hook_cmd(hook, &broken_link, pool)) && broken_link)
Modified: subversion/trunk/subversion/libsvn_repos/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/repos.c?rev=1060883&r1=1060882&r2=1060883&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/repos.c (original)
+++ subversion/trunk/subversion/libsvn_repos/repos.c Wed Jan 19 17:38:05 2011
@@ -32,6 +32,7 @@
#include "svn_fs.h"
#include "svn_ra.h" /* for SVN_RA_CAPABILITY_* */
#include "svn_repos.h"
+#include "private/svn_repos_private.h"
#include "svn_private_config.h" /* for SVN_TEMPLATE_ROOT_DIR */
#include "repos.h"
@@ -163,7 +164,7 @@ svn_repos_post_revprop_change_hook(svn_r
const char *
-svn_repos_pre_obliterate_hook(svn_repos_t *repos, apr_pool_t *pool)
+svn_repos__pre_obliterate_hook(svn_repos_t *repos, apr_pool_t *pool)
{
return svn_dirent_join(repos->hook_path, SVN_REPOS__HOOK_PRE_OBLITERATE,
pool);
@@ -171,7 +172,7 @@ svn_repos_pre_obliterate_hook(svn_repos_
const char *
-svn_repos_post_obliterate_hook(svn_repos_t *repos, apr_pool_t *pool)
+svn_repos__post_obliterate_hook(svn_repos_t *repos, apr_pool_t *pool)
{
return svn_dirent_join(repos->hook_path, SVN_REPOS__HOOK_POST_OBLITERATE,
pool);
@@ -549,7 +550,7 @@ PREWRITTEN_HOOKS_TEXT
/* Pre-obliterate hook. */
{
this_path = apr_psprintf(pool, "%s%s",
- svn_repos_pre_obliterate_hook(repos, pool),
+ svn_repos__pre_obliterate_hook(repos, pool),
SVN_REPOS__HOOK_DESC_EXT);
#define SCRIPT_NAME SVN_REPOS__HOOK_PRE_OBLITERATE
@@ -1042,7 +1043,7 @@ PREWRITTEN_HOOKS_TEXT
/* Post-obliterate hook. */
{
this_path = apr_psprintf(pool, "%s%s",
- svn_repos_post_obliterate_hook(repos, pool),
+ svn_repos__post_obliterate_hook(repos, pool),
SVN_REPOS__HOOK_DESC_EXT);
#define SCRIPT_NAME SVN_REPOS__HOOK_POST_OBLITERATE