Author: svn-role
Date: Sat Apr 27 04:01:07 2013
New Revision: 1476485
URL: http://svn.apache.org/r1476485
Log:
Merge r1471028 from trunk:
* r1471028
Fix issue 4359, incorrect/missing pack notification.
Justification:
Regression from 1.6.
Notes:
We already incorrectly merged r1471029 which is not a ^/subversion commit.
Votes:
+1: philip, rhuijben, julianfoad
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_repos/fs-wrap.c
subversion/branches/1.8.x/subversion/svnadmin/svnadmin.c
subversion/branches/1.8.x/subversion/tests/cmdline/svnadmin_tests.py
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1471028
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1476485&r1=1476484&r2=1476485&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sat Apr 27 04:01:07 2013
@@ -135,15 +135,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1471028
- Fix issue 4359, incorrect/missing pack notification.
- Justification:
- Regression from 1.6.
- Notes:
- We already incorrectly merged r1471029 which is not a ^/subversion commit.
- Votes:
- +1: philip, rhuijben, julianfoad
-
* r1475724
Fix changelist filtering when --changelist values aren't UTF8.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_repos/fs-wrap.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_repos/fs-wrap.c?rev=1476485&r1=1476484&r2=1476485&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_repos/fs-wrap.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_repos/fs-wrap.c Sat Apr 27
04:01:07 2013
@@ -740,7 +740,14 @@ pack_notify_func(void *baton,
struct pack_notify_baton *pnb = baton;
svn_repos_notify_t *notify;
- notify = svn_repos_notify_create(pack_action + 3, pool);
+ /* Simple conversion works for these values. */
+ SVN_ERR_ASSERT(pack_action >= svn_fs_pack_notify_start
+ && pack_action <= svn_fs_pack_notify_end_revprop);
+
+ notify = svn_repos_notify_create(pack_action
+ + svn_repos_notify_pack_shard_start
+ - svn_fs_pack_notify_start,
+ pool);
notify->shard = shard;
pnb->notify_func(pnb->notify_baton, notify, pool);
Modified: subversion/branches/1.8.x/subversion/svnadmin/svnadmin.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svnadmin/svnadmin.c?rev=1476485&r1=1476484&r2=1476485&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svnadmin/svnadmin.c (original)
+++ subversion/branches/1.8.x/subversion/svnadmin/svnadmin.c Sat Apr 27
04:01:07 2013
@@ -1537,7 +1537,7 @@ subcommand_pack(apr_getopt_t *os, void *
/* Progress feedback goes to STDOUT, unless they asked to suppress it. */
if (! opt_state->quiet)
- progress_stream = recode_stream_create(stderr, pool);
+ progress_stream = recode_stream_create(stdout, pool);
return svn_error_trace(
svn_repos_fs_pack2(repos, !opt_state->quiet ? repos_notify_handler : NULL,
Modified: subversion/branches/1.8.x/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/svnadmin_tests.py?rev=1476485&r1=1476484&r2=1476485&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/svnadmin_tests.py
(original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/svnadmin_tests.py Sat
Apr 27 04:01:07 2013
@@ -1621,7 +1621,8 @@ def hotcopy_incremental_packed(sbox):
# Pack revisions 0 and 1.
svntest.actions.run_and_verify_svnadmin(
- None, None, [], "pack", os.path.join(cwd, sbox.repo_dir))
+ None, ['Packing revisions in shard 0...done.\n'], [], "pack",
+ os.path.join(cwd, sbox.repo_dir))
# Commit 5 more revs, hotcopy and pack after each commit.
for i in [1, 2, 3, 4, 5]:
@@ -1637,8 +1638,12 @@ def hotcopy_incremental_packed(sbox):
if i < 5:
sbox.simple_mkdir("newdir-%i" % i)
sbox.simple_commit()
+ if not i % 2:
+ expected_output = ['Packing revisions in shard %d...done.\n' % (i/2)]
+ else:
+ expected_output = []
svntest.actions.run_and_verify_svnadmin(
- None, None, [], "pack", os.path.join(cwd, sbox.repo_dir))
+ None, expected_output, [], "pack", os.path.join(cwd, sbox.repo_dir))
def locking(sbox):
