You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2014/06/30 13:04:44 UTC
svn commit: r1606681 - in /subversion/branches/remove-log-addressing: ./
subversion/libsvn_fs_fs/ subversion/svn/ subversion/tests/cmdline/
subversion/tests/cmdline/getopt_tests_data/
Author: ivan
Date: Mon Jun 30 11:04:44 2014
New Revision: 1606681
URL: http://svn.apache.org/r1606681
Log:
On remove-log-addressing branch: Merge changes from trunk.
Modified:
subversion/branches/remove-log-addressing/ (props changed)
subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/remove-log-addressing/subversion/svn/notify.c
subversion/branches/remove-log-addressing/subversion/svn/svn.c
subversion/branches/remove-log-addressing/subversion/svn/util.c
subversion/branches/remove-log-addressing/subversion/tests/cmdline/blame_tests.py
subversion/branches/remove-log-addressing/subversion/tests/cmdline/copy_tests.py
subversion/branches/remove-log-addressing/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tests.py
subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/remove-log-addressing/subversion/tests/cmdline/switch_tests.py
Propchange: subversion/branches/remove-log-addressing/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1606651-1606677
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs_fs.c?rev=1606681&r1=1606680&r2=1606681&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs_fs.c Mon Jun 30 11:04:44 2014
@@ -883,7 +883,8 @@ write_config(svn_fs_t *fs,
"### setup, each access will hit only one disk (minimizes I/O load) but" NL
"### uses all the data provided by the disk in a single access." NL
"### For SSD-based storage systems, slightly lower values around 16 kB" NL
-"### may improve latency while still maximizing throughput." NL
+"### may improve latency while still maximizing throughput. If block-read" NL
+"### has not been enabled, this will be capped to 4 kBytes." NL
"### Can be changed at any time but must be a power of 2." NL
"### block-size is 64 kBytes by default." NL
"# " CONFIG_OPTION_BLOCK_SIZE " = 64" NL
@@ -898,6 +899,12 @@ write_config(svn_fs_t *fs,
static svn_error_t *
read_global_config(svn_fs_t *fs)
{
+ fs_fs_data_t *ffd = fs->fsap_data;
+ /* Ignore the user-specified larger block size if we don't use block-read.
+ Defaulting to 4k gives us the same access granularity in format 7 as in
+ older formats. */
+ ffd->block_size = MIN(0x1000, ffd->block_size);
+
return SVN_NO_ERROR;
}
Modified: subversion/branches/remove-log-addressing/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/svn/notify.c?rev=1606681&r1=1606680&r2=1606681&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/svn/notify.c (original)
+++ subversion/branches/remove-log-addressing/subversion/svn/notify.c Mon Jun 30 11:04:44 2014
@@ -1061,7 +1061,7 @@ notify_body(struct notify_baton *nb,
{
SVN_ERR(svn_cmdline_printf(pool, _("done\n")));
}
- SVN_ERR(svn_cmdline_printf(pool, _("Committing transaction...")));
+ SVN_ERR(svn_cmdline_printf(pool, _("Committing transaction...\n")));
break;
default:
Modified: subversion/branches/remove-log-addressing/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/svn/svn.c?rev=1606681&r1=1606680&r2=1606681&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/svn/svn.c (original)
+++ subversion/branches/remove-log-addressing/subversion/svn/svn.c Mon Jun 30 11:04:44 2014
@@ -799,12 +799,14 @@ const svn_opt_subcommand_desc2_t svn_cl_
" Show the log message for the revision in which /branches/foo\n"
" was created:\n"
" svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n"),
- {'r', 'q', 'v', 'g', 'c', opt_targets, opt_stop_on_copy, opt_incremental,
+ {'r', 'c', 'q', 'v', 'g', opt_targets, opt_stop_on_copy, opt_incremental,
opt_xml, 'l', opt_with_all_revprops, opt_with_no_revprops,
opt_with_revprop, opt_depth, opt_diff, opt_diff_cmd,
opt_internal_diff, 'x', opt_search, opt_search_and },
{{opt_with_revprop, N_("retrieve revision property ARG")},
- {'c', N_("the change made in revision ARG")}} },
+ {'c', N_("the change made in revision ARG")},
+ {'v', N_("also print all affected paths")},
+ {'q', N_("do not print the log message")}} },
{ "merge", svn_cl__merge, {0}, N_
( /* For this large section, let's keep it unindented for easier
Modified: subversion/branches/remove-log-addressing/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/svn/util.c?rev=1606681&r1=1606680&r2=1606681&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/svn/util.c (original)
+++ subversion/branches/remove-log-addressing/subversion/svn/util.c Mon Jun 30 11:04:44 2014
@@ -76,7 +76,7 @@ svn_cl__print_commit_info(const svn_comm
apr_pool_t *pool)
{
if (SVN_IS_VALID_REVNUM(commit_info->revision))
- SVN_ERR(svn_cmdline_printf(pool, _("\nCommitted revision %ld%s.\n"),
+ SVN_ERR(svn_cmdline_printf(pool, _("Committed revision %ld%s.\n"),
commit_info->revision,
commit_info->revision == 42 &&
getenv("SVN_I_LOVE_PANGALACTIC_GARGLE_BLASTERS")
Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/blame_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/blame_tests.py?rev=1606681&r1=1606680&r2=1606681&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/blame_tests.py Mon Jun 30 11:04:44 2014
@@ -656,7 +656,7 @@ def blame_output_after_merge(sbox):
# r4: create branches/br from trunk
branches_br_url = sbox.repo_url + "/branches/br"
- svntest.actions.run_and_verify_svn(None, ["\n","Committed revision 4.\n"], [],
+ svntest.actions.run_and_verify_svn(None, ["Committed revision 4.\n"], [],
'cp', '--parents',
trunk_url, branches_br_url,
"-m", "create branch")
Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/copy_tests.py?rev=1606681&r1=1606680&r2=1606681&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/copy_tests.py Mon Jun 30 11:04:44 2014
@@ -1095,7 +1095,7 @@ def url_copy_parent_into_child(sbox):
# Issue 1367 parent/child URL-to-URL was rejected.
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 2.\n'], [],
+ ['Committed revision 2.\n'], [],
'cp',
'-m', 'a can of worms',
B_url, F_url)
Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=1606681&r1=1606680&r2=1606681&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout Mon Jun 30 11:04:44 2014
@@ -82,11 +82,11 @@ Valid options:
'BASE' base rev of item's working copy
'COMMITTED' last commit at or before BASE
'PREV' revision just before COMMITTED
- -q [--quiet] : print nothing, or only summary information
- -v [--verbose] : print extra information
+ -c [--change] ARG : the change made in revision ARG
+ -q [--quiet] : do not print the log message
+ -v [--verbose] : also print all affected paths
-g [--use-merge-history] : use/display additional information from merge
history
- -c [--change] ARG : the change made in revision ARG
--targets ARG : pass contents of file ARG as additional args
--stop-on-copy : do not cross copies while traversing history
--incremental : give output suitable for concatenation
Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tests.py?rev=1606681&r1=1606680&r2=1606681&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tests.py Mon Jun 30 11:04:44 2014
@@ -686,7 +686,7 @@ def simple_property_merges(sbox):
A_url = sbox.repo_url + '/A'
A2_url = sbox.repo_url + '/A2'
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 5.\n'], [],
+ ['Committed revision 5.\n'], [],
'copy', '-m', 'copy A to A2',
A_url, A2_url)
@@ -8137,7 +8137,7 @@ def merge_old_and_new_revs_from_renamed_
mu_MOVED_path = sbox.ospath('A/mu_MOVED')
# Copy mu to mu_COPY
- svntest.actions.run_and_verify_svn(None, ['\n', 'Committed revision 2.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committed revision 2.\n'],
[], 'cp', '-m', 'cp mu to mu_COPY',
mu_url, mu_COPY_url)
@@ -8229,7 +8229,7 @@ def merge_with_auto_rev_range_detection(
expected_status, None, wc_dir)
# Copy A to A_COPY
- svntest.actions.run_and_verify_svn(None, ['\n', 'Committed revision 3.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committed revision 3.\n'],
[], 'cp', '-m', 'cp A to A_COPY',
A_url, A_COPY_url)
@@ -9149,7 +9149,7 @@ def merge_source_normalization_and_subtr
wc_disk, wc_status = set_up_branch(sbox)
# r7 - Move A to A_MOVED
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...',
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
'Committed revision 7.\n'],
[], 'mv', '-m', 'mv A to A_MOVED',
sbox.repo_url + '/A',
@@ -10551,11 +10551,9 @@ def merge_added_subtree(sbox):
A_COPY_url = url + "/A_COPY"
A_path = sbox.ospath('A')
- svntest.actions.run_and_verify_svn("",["Committing transaction...\n",
- "Committed revision 2.\n"], [],
+ svntest.actions.run_and_verify_svn("",["Committed revision 2.\n"], [],
"cp", "-m", "", A_url, A_COPY_url)
- svntest.actions.run_and_verify_svn("",["Committing transaction...\n",
- "Committed revision 3.\n"], [],
+ svntest.actions.run_and_verify_svn("",["Committed revision 3.\n"], [],
"cp", "-m", "",
A_COPY_url + '/D',
A_COPY_url + '/D2')
@@ -10814,8 +10812,7 @@ def dont_merge_revs_into_subtree_that_pr
# Copy 'A/D/H' to 'H_COPY' in r6.
svntest.actions.run_and_verify_svn(None,
- ['Committing transaction...\n',
- 'Committed revision 6.\n'],
+ ['Committed revision 6.\n'],
[], 'copy',
sbox.repo_url + "/A/D/H",
sbox.repo_url + "/H_COPY",
@@ -10967,8 +10964,7 @@ def set_up_renamed_subtree(sbox):
# Copy 'A/D/H' to 'H_COPY' in r5.
svntest.actions.run_and_verify_svn(None,
- ['Committing transaction...\n',
- 'Committed revision 5.\n'],
+ ['Committed revision 5.\n'],
[], 'copy',
sbox.repo_url + "/A/D/H",
sbox.repo_url + "/H_COPY",
@@ -13569,7 +13565,7 @@ def no_self_referential_filtering_on_add
# r10: Move A/C to A/C_MOVED.
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committing transaction...\n',
+ ['Committing transaction...\n',
'Committed revision 10.\n'],
[], 'move',
sbox.repo_url + '/A/C',
@@ -13783,8 +13779,7 @@ def merge_range_prior_to_rename_source_e
wc_status, None, wc_dir)
# r12 - Move A/D/H/nu to A/D/H/nu_moved
- svntest.actions.run_and_verify_svn(None, ["\n",
- "Committing transaction...\n",
+ svntest.actions.run_and_verify_svn(None, ["Committing transaction...\n",
"Committed revision 12.\n"], [],
'move', sbox.repo_url + '/A/D/H/nu',
sbox.repo_url + '/A/D/H/nu_moved',
@@ -14034,18 +14029,19 @@ def set_up_natural_history_gap(sbox):
# r6: Delete 'A'
exit_code, out, err = svntest.actions.run_and_verify_svn(
- None, "(Committed revision 6.)|(\n)", [],
+ None, ["Committing transaction...\n",
+ "Committed revision 6.\n"], [],
'delete', sbox.repo_url + '/A', '-m', 'Delete A')
# r7: Resurrect 'A' by copying 'A@2' to 'A'.
exit_code, out, err = svntest.actions.run_and_verify_svn(
- None, "(Committed revision 7.)|(\n)", [],
+ None, ["Committed revision 7.\n"], [],
'copy', sbox.repo_url + '/A@2', sbox.repo_url + '/A',
'-m', 'Resurrect A from A@2')
# r8: Branch the resurrected 'A' to 'A_COPY'.
exit_code, out, err = svntest.actions.run_and_verify_svn(
- None, "(Committed revision 8.)|(\n)", [],
+ None, ["Committed revision 8.\n"], [],
'copy', sbox.repo_url + '/A', sbox.repo_url + '/A_COPY',
'-m', 'Copy A to A_COPY')
Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1606681&r1=1606680&r2=1606681&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tree_conflict_tests.py Mon Jun 30 11:04:44 2014
@@ -1457,7 +1457,6 @@ def merge_replace_setup(sbox):
# make a branch of A
# svn cp $URL/A $URL/branch
expected_stdout = verify.UnorderedOutput([
- '\n',
'Committed revision 2.\n',
])
Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/switch_tests.py?rev=1606681&r1=1606680&r2=1606681&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/switch_tests.py Mon Jun 30 11:04:44 2014
@@ -352,8 +352,7 @@ def delete_subdir(sbox):
A2_B_F_url = sbox.repo_url + '/A2/B/F'
svntest.actions.run_and_verify_svn(None,
- ['Committing transaction...\n',
- 'Committed revision 2.\n'], [],
+ ['Committed revision 2.\n'], [],
'cp', '-m', 'make copy', A_url, A2_url)
svntest.actions.run_and_verify_svn(None,
@@ -647,7 +646,6 @@ def obstructed_switch(sbox):
# svn cp -m msgcopy url/A/B/E url/A/B/Esave
expected_stdout = verify.UnorderedOutput([
- '\n',
'Committed revision 2.\n',
])
@@ -787,7 +785,7 @@ def refresh_read_only_attribute(sbox):
url = sbox.repo_url + '/A'
branch_url = sbox.repo_url + '/A-branch'
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 2.\n'], [],
+ ['Committed revision 2.\n'], [],
'cp', '-m', 'svn:needs-lock not set',
url, branch_url)
@@ -2043,7 +2041,7 @@ def tolerate_local_mods(sbox):
A2_url = sbox.repo_url + '/A2'
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 2.\n'], [],
+ ['Committed revision 2.\n'], [],
'cp', '-m', 'make copy', A_url, A2_url)
os.mkdir(L_path)