You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/07/15 09:48:46 UTC
svn commit: r1146995 - in /subversion/branches/fs-progress/subversion:
include/svn_repos.h libsvn_repos/dump.c svnadmin/main.c
Author: danielsh
Date: Fri Jul 15 07:48:46 2011
New Revision: 1146995
URL: http://svn.apache.org/viewvc?rev=1146995&view=rev
Log:
On the fs-progress branch, paint the terminology bikeshed.
No functional change.
Suggested by: gstein
* subversion/include/svn_repos.h
(svn_repos_notify_action_t):
Rename:
svn_repos_notify_verify_global_start
svn_repos_notify_verify_global_progress
svn_repos_notify_verify_global_end
To:
svn_repos_notify_verify_aux_start
svn_repos_notify_verify_aux_progress
svn_repos_notify_verify_aux_end
* subversion/include/svn_repos.h
(svn_repos_notify_t):
* subversion/libsvn_repos/dump.c
(svn_repos_verify_fs2):
* subversion/svnadmin/main.c
(repos_notify_handler):
Track renames.
Modified:
subversion/branches/fs-progress/subversion/include/svn_repos.h
subversion/branches/fs-progress/subversion/libsvn_repos/dump.c
subversion/branches/fs-progress/subversion/svnadmin/main.c
Modified: subversion/branches/fs-progress/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/fs-progress/subversion/include/svn_repos.h?rev=1146995&r1=1146994&r2=1146995&view=diff
==============================================================================
--- subversion/branches/fs-progress/subversion/include/svn_repos.h (original)
+++ subversion/branches/fs-progress/subversion/include/svn_repos.h Fri Jul 15 07:48:46 2011
@@ -246,15 +246,15 @@ typedef enum svn_repos_notify_action_t
/** Verifying global data has commenced
* @since New in 1.8. */
- svn_repos_notify_verify_aux_start,
+ svn_repos_notify_verify_global_start,
/** Verifying global data is progressing
* @since New in 1.8. */
- svn_repos_notify_verify_aux_progress,
+ svn_repos_notify_verify_global_progress,
/** Verifying global data has finished
* @since New in 1.8. */
- svn_repos_notify_verify_aux_end
+ svn_repos_notify_verify_global_end
} svn_repos_notify_action_t;
@@ -327,7 +327,7 @@ typedef struct svn_repos_notify_t
/** For #svn_repos_notify_load_node_start, the path of the node. */
const char *path;
- /** For #svn_repos_notify_verify_aux_progress;
+ /** For #svn_repos_notify_verify_global_progress;
see svn_fs_progress_notify_func_t. */
apr_int64_t progress_progress;
apr_int64_t progress_total;
Modified: subversion/branches/fs-progress/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/branches/fs-progress/subversion/libsvn_repos/dump.c?rev=1146995&r1=1146994&r2=1146995&view=diff
==============================================================================
--- subversion/branches/fs-progress/subversion/libsvn_repos/dump.c (original)
+++ subversion/branches/fs-progress/subversion/libsvn_repos/dump.c Fri Jul 15 07:48:46 2011
@@ -1304,7 +1304,7 @@ svn_repos_verify_fs2(svn_repos_t *repos,
"(youngest revision is %ld)"),
end_rev, youngest);
- /* Verify global/auxiliary data before verifying revisions. */
+ /* Verify global data before verifying revisions. */
if (start_rev == 0)
{
struct progress_to_notify_baton ptnb;
@@ -1317,13 +1317,14 @@ svn_repos_verify_fs2(svn_repos_t *repos,
/* Create a notify object that we can reuse within the callback. */
ptnb.notify =
- svn_repos_notify_create(svn_repos_notify_verify_aux_progress,
+ svn_repos_notify_create(svn_repos_notify_verify_global_progress,
iterpool);
/* We're starting. */
notify_func(notify_baton,
- svn_repos_notify_create(svn_repos_notify_verify_aux_start,
- iterpool),
+ svn_repos_notify_create(
+ svn_repos_notify_verify_global_start,
+ iterpool),
iterpool);
}
@@ -1337,7 +1338,7 @@ svn_repos_verify_fs2(svn_repos_t *repos,
{
/* We're finished. */
notify_func(notify_baton,
- svn_repos_notify_create(svn_repos_notify_verify_aux_end,
+ svn_repos_notify_create(svn_repos_notify_verify_global_end,
iterpool),
iterpool);
}
Modified: subversion/branches/fs-progress/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/fs-progress/subversion/svnadmin/main.c?rev=1146995&r1=1146994&r2=1146995&view=diff
==============================================================================
--- subversion/branches/fs-progress/subversion/svnadmin/main.c (original)
+++ subversion/branches/fs-progress/subversion/svnadmin/main.c Fri Jul 15 07:48:46 2011
@@ -815,18 +815,18 @@ repos_notify_handler(void *baton,
" repository may take some time...\n")));
return;
- case svn_repos_notify_verify_aux_start:
+ case svn_repos_notify_verify_global_start:
/* ### Somehow use PROGRESS_TOTAL here? */
svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
_("* Verifying global structures")
));
return;
- case svn_repos_notify_verify_aux_progress:
+ case svn_repos_notify_verify_global_progress:
svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool, "."));
return;
- case svn_repos_notify_verify_aux_end:
+ case svn_repos_notify_verify_global_end:
svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool, "\n"));
return;