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/27 20:44:52 UTC
svn commit: r1606182 - in /subversion/trunk/subversion: svn/ tests/cmdline/
Author: ivan
Date: Fri Jun 27 18:44:51 2014
New Revision: 1606182
URL: http://svn.apache.org/r1606182
Log:
Follow-up to r1604179: Print "Committing transaction" progress notification
for tree changes only commits.
Found by: julianfoad
* subversion/svn/notify.c
(notify_body): Unconditionally print "Committing transaction" progress
notification.
* subversion/tests/cmdline/basic_tests.py
* subversion/tests/cmdline/blame_tests.py
* subversion/tests/cmdline/copy_tests.py
* subversion/tests/cmdline/merge_reintegrate_tests.py
* subversion/tests/cmdline/merge_tests.py
* subversion/tests/cmdline/stat_tests.py
* subversion/tests/cmdline/svnadmin_tests.py
* subversion/tests/cmdline/svnrdump_tests.py
* subversion/tests/cmdline/switch_tests.py
* subversion/tests/cmdline/update_tests.py
(basic_mkdir_url, basic_delete, blame_output_after_merge,
wc_copy_parent_into_child, basic_reintegrate,
obey_reporter_api_semantics_while_doing_subtree_merges,
update_loses_mergeinfo, merge_loses_mergeinfo,
merge_old_and_new_revs_from_renamed_dir,
merge_source_normalization_and_subtree_merges,
dont_add_mergeinfo_from_own_history,
merge_added_subtree, dont_merge_revs_into_subtree_that_predate_it,
set_up_renamed_subtree, no_self_referential_filtering_on_added_path,
merge_range_prior_to_rename_source_existence,
committed_case_only_move_and_revert, status_ignored_dir,
load_with_parent_dir, reflect_dropped_renumbered_revs,
reflect_dropped_renumbered_revs, svnrdump_load_partial_incremental_dump,
delete_subdir, failed_anchor_is_target, bad_intermediate_urls,
forced_switch_failures, another_hudson_problem, new_dir_with_spaces,
update_copy_of_old_rev): Update expected output.
)
Modified:
subversion/trunk/subversion/svn/notify.c
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/blame_tests.py
subversion/trunk/subversion/tests/cmdline/copy_tests.py
subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/stat_tests.py
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
subversion/trunk/subversion/tests/cmdline/switch_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1606182&r1=1606181&r2=1606182&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Fri Jun 27 18:44:51 2014
@@ -1060,8 +1060,8 @@ notify_body(struct notify_baton *nb,
if (nb->sent_first_txdelta)
{
SVN_ERR(svn_cmdline_printf(pool, _("done\n")));
- SVN_ERR(svn_cmdline_printf(pool, _("Committing transaction...")));
}
+ SVN_ERR(svn_cmdline_printf(pool, _("Committing transaction...")));
break;
default:
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1606182&r1=1606181&r2=1606182&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Fri Jun 27 18:44:51 2014
@@ -241,7 +241,8 @@ def basic_mkdir_url(sbox):
Y_Z_url = sbox.repo_url + '/Y/Z'
svntest.actions.run_and_verify_svn("mkdir URL URL/subdir",
- ["\n", "Committed revision 2.\n"], [],
+ ["Committing transaction...\n",
+ "Committed revision 2.\n"], [],
'mkdir', '-m', 'log_msg', Y_url, Y_Z_url)
expected_output = wc.State(sbox.wc_dir, {
@@ -285,12 +286,14 @@ def basic_mkdir_url_with_parents(sbox):
X_Y_Z_url, X_Y_Z2_url, X_T_C_url, U_V_W_url)
svntest.actions.run_and_verify_svn("mkdir",
- ["\n", "Committed revision 2.\n"], [],
+ ["Committing transaction...\n",
+ "Committed revision 2.\n"], [],
'mkdir', '-m', 'log_msg',
X_url, U_url)
svntest.actions.run_and_verify_svn("mkdir --parents",
- ["\n", "Committed revision 3.\n"], [],
+ ["Committing transaction...\n",
+ "Committed revision 3.\n"], [],
'mkdir', '-m', 'log_msg', '--parents',
X_Y_Z_url, X_Y_Z2_url, X_T_C_url, U_V_W_url)
@@ -1263,7 +1266,8 @@ def basic_delete(sbox):
iota_URL = sbox.repo_url + '/iota'
svntest.actions.run_and_verify_svn(None,
- ["\n", "Committed revision 2.\n"], [],
+ ["Committing transaction...\n",
+ "Committed revision 2.\n"], [],
'rm', '-m', 'delete iota URL',
iota_URL)
Modified: subversion/trunk/subversion/tests/cmdline/blame_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/blame_tests.py?rev=1606182&r1=1606181&r2=1606182&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/blame_tests.py Fri Jun 27 18:44:51 2014
@@ -631,7 +631,8 @@ def blame_output_after_merge(sbox):
A_url = sbox.repo_url + '/A'
# r2: mv greek tree in trunk.
- svntest.actions.run_and_verify_svn(None, ["\n","Committed revision 2.\n"], [],
+ svntest.actions.run_and_verify_svn(None, ["Committing transaction...\n",
+ "Committed revision 2.\n"], [],
'mv', "--parents", A_url, trunk_A_url,
"-m", "move greek tree to trunk")
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1606182&r1=1606181&r2=1606182&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Jun 27 18:44:51 2014
@@ -1157,7 +1157,8 @@ def wc_copy_parent_into_child(sbox):
svntest.actions.run_and_verify_svn(None,
['Adding copy of .\n',
- '\n', 'Committed revision 2.\n'], [],
+ 'Committing transaction...\n',
+ 'Committed revision 2.\n'], [],
'cp',
'-m', 'a larger can',
'.', F_B_url)
Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1606182&r1=1606181&r2=1606182&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Fri Jun 27 18:44:51 2014
@@ -278,7 +278,8 @@ def basic_reintegrate(sbox):
# mergeinfo and the A-->A_MOVED path difference.
svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 9.\n'],
+ ['Committing transaction...\n',
+ 'Committed revision 9.\n'],
[], 'move',
sbox.repo_url + '/A',
sbox.repo_url + '/A_MOVED',
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1606182&r1=1606181&r2=1606182&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Jun 27 18:44:51 2014
@@ -4227,7 +4227,7 @@ def obey_reporter_api_semantics_while_do
copy_of_A_D_wc_rev = cur_rev
svntest.actions.run_and_verify_svn(None,
- ['\n',
+ ['Committing transaction...\n',
'Committed revision ' + str(cur_rev+1) +
'.\n'],
[],
@@ -6460,10 +6460,12 @@ def update_loses_mergeinfo(sbox):
A_B_url = sbox.repo_url + '/A/B'
A_B_J_url = sbox.repo_url + '/A/B/J'
A_B_K_url = sbox.repo_url + '/A/B/K'
- svntest.actions.run_and_verify_svn(None, ['\n', 'Committed revision 2.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ 'Committed revision 2.\n'],
[],
'mkdir', '-m', 'rev 2', A_B_J_url)
- svntest.actions.run_and_verify_svn(None, ['\n', 'Committed revision 3.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ 'Committed revision 3.\n'],
[],
'mkdir', '-m', 'rev 3', A_B_K_url)
@@ -6580,10 +6582,12 @@ def merge_loses_mergeinfo(sbox):
A_B_url = sbox.repo_url + '/A/B'
A_B_J_url = sbox.repo_url + '/A/B/J'
A_B_K_url = sbox.repo_url + '/A/B/K'
- svntest.actions.run_and_verify_svn(None, ['\n', 'Committed revision 2.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ 'Committed revision 2.\n'],
[],
'mkdir', '-m', 'rev 2', A_B_J_url)
- svntest.actions.run_and_verify_svn(None, ['\n', 'Committed revision 3.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ 'Committed revision 3.\n'],
[],
'mkdir', '-m', 'rev 3', A_B_K_url)
@@ -7724,7 +7728,8 @@ def merge_old_and_new_revs_from_renamed_
wc_status, None, wc_dir)
# Move A to A_MOVED
- svntest.actions.run_and_verify_svn(None, ['\n', 'Committed revision 4.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ 'Committed revision 4.\n'],
[], 'mv', '-m', 'mv A to A_MOVED',
A_url, A_MOVED_url)
@@ -8145,7 +8150,8 @@ def merge_old_and_new_revs_from_renamed_
expected_status, None, wc_dir)
# Move mu to mu_MOVED
- svntest.actions.run_and_verify_svn(None, ['\n', 'Committed revision 4.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...',
+ 'Committed revision 4.\n'],
[], 'mv', '-m', 'mv mu to mu_MOVED',
mu_url, mu_MOVED_url)
@@ -9143,7 +9149,8 @@ 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, ['\n', 'Committed revision 7.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...',
+ 'Committed revision 7.\n'],
[], 'mv', '-m', 'mv A to A_MOVED',
sbox.repo_url + '/A',
sbox.repo_url + '/A_MOVED')
@@ -9889,7 +9896,8 @@ def dont_add_mergeinfo_from_own_history(
# out, leaving the only the mergeinfo created from the merge itself:
# '/A_COPY:7'.
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 8.\n'],
+ ['Committing transaction...\n',
+ 'Committed revision 8.\n'],
[], 'move',
sbox.repo_url + '/A',
sbox.repo_url + '/A_MOVED',
@@ -10543,9 +10551,11 @@ def merge_added_subtree(sbox):
A_COPY_url = url + "/A_COPY"
A_path = sbox.ospath('A')
- svntest.actions.run_and_verify_svn("",["\n", "Committed revision 2.\n"], [],
+ svntest.actions.run_and_verify_svn("",["Committing transaction...\n",
+ "Committed revision 2.\n"], [],
"cp", "-m", "", A_url, A_COPY_url)
- svntest.actions.run_and_verify_svn("",["\n", "Committed revision 3.\n"], [],
+ svntest.actions.run_and_verify_svn("",["Committing transaction...\n",
+ "Committed revision 3.\n"], [],
"cp", "-m", "",
A_COPY_url + '/D',
A_COPY_url + '/D2')
@@ -10804,7 +10814,8 @@ def dont_merge_revs_into_subtree_that_pr
# Copy 'A/D/H' to 'H_COPY' in r6.
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 6.\n'],
+ ['Committing transaction...\n',
+ 'Committed revision 6.\n'],
[], 'copy',
sbox.repo_url + "/A/D/H",
sbox.repo_url + "/H_COPY",
@@ -10956,7 +10967,8 @@ def set_up_renamed_subtree(sbox):
# Copy 'A/D/H' to 'H_COPY' in r5.
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 5.\n'],
+ ['Committing transaction...\n',
+ 'Committed revision 5.\n'],
[], 'copy',
sbox.repo_url + "/A/D/H",
sbox.repo_url + "/H_COPY",
@@ -13557,7 +13569,8 @@ def no_self_referential_filtering_on_add
# r10: Move A/C to A/C_MOVED.
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 10.\n'],
+ ['\n', 'Committing transaction...\n',
+ 'Committed revision 10.\n'],
[], 'move',
sbox.repo_url + '/A/C',
sbox.repo_url + '/A/C_MOVED',
@@ -13771,6 +13784,7 @@ def merge_range_prior_to_rename_source_e
# r12 - Move A/D/H/nu to A/D/H/nu_moved
svntest.actions.run_and_verify_svn(None, ["\n",
+ "Committing transaction...\n",
"Committed revision 12.\n"], [],
'move', sbox.repo_url + '/A/D/H/nu',
sbox.repo_url + '/A/D/H/nu_moved',
@@ -15093,7 +15107,8 @@ def committed_case_only_move_and_revert(
# r3: A case-only file rename on the server
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 3.\n'],
+ ['Committing transaction...\n',
+ 'Committed revision 3.\n'],
[], 'move',
sbox.repo_url + '/A/mu',
sbox.repo_url + '/A/MU',
@@ -15197,7 +15212,8 @@ def committed_case_only_move_and_revert(
# r5: A case-only directory rename on the server
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 5.\n'],
+ ['Committing transaction...\n',
+ 'Committed revision 5.\n'],
[], 'move',
sbox.repo_url + '/A/C',
sbox.repo_url + '/A/c',
@@ -17158,7 +17174,8 @@ def reverse_merge_with_rename(sbox):
# r7 - Rename ^/A to ^/trunk.
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 7.\n'],
+ ['Committing transaction...\n',
+ 'Committed revision 7.\n'],
[], 'move',
sbox.repo_url + '/A',
sbox.repo_url + '/trunk',
Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1606182&r1=1606181&r2=1606182&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Fri Jun 27 18:44:51 2014
@@ -951,7 +951,9 @@ def status_ignored_dir(sbox):
new_dir = sbox.ospath('dir.o')
new_dir_url = sbox.repo_url + "/dir.o"
- svntest.actions.run_and_verify_svn("Create dir", "\n|Committed revision 2.", [],
+ svntest.actions.run_and_verify_svn("Create dir",
+ ["Committing transaction...\n",
+ "Committed revision 2.\n"], [],
'mkdir', new_dir_url, '-m', 'msg')
# Make a dir that is ignored by the default ignore patterns.
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1606182&r1=1606181&r2=1606182&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Fri Jun 27 18:44:51 2014
@@ -982,7 +982,8 @@ def load_with_parent_dir(sbox):
# Create 'sample' dir in sbox.repo_url, and load the dump stream there.
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 1.\n'],
+ ['Committing transaction...\n',
+ 'Committed revision 1.\n'],
[], "mkdir", sbox.repo_url + "/sample",
"-m", "Create sample dir")
load_dumpstream(sbox, dumpfile, '--parent-dir', '/sample')
@@ -1004,7 +1005,8 @@ def load_with_parent_dir(sbox):
# This time, don't include a leading slash on the --parent-dir argument.
# See issue #3547.
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 11.\n'],
+ ['Committing transaction...\n',
+ 'Committed revision 11.\n'],
[], "mkdir", sbox.repo_url + "/sample-2",
"-m", "Create sample-2 dir")
load_dumpstream(sbox, dumpfile, '--parent-dir', 'sample-2')
@@ -1077,7 +1079,8 @@ def reflect_dropped_renumbered_revs(sbox
dumpfile = open(dumpfile_location).read()
# Create 'toplevel' dir in sbox.repo_url
- svntest.actions.run_and_verify_svn(None, ['\n', 'Committed revision 1.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ 'Committed revision 1.\n'],
[], "mkdir", sbox.repo_url + "/toplevel",
"-m", "Create toplevel dir")
Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=1606182&r1=1606181&r2=1606182&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Fri Jun 27 18:44:51 2014
@@ -431,7 +431,8 @@ def reflect_dropped_renumbered_revs(sbox
# Create the 'toplevel' directory in repository and then load the same
# dumpfile into that subtree.
- svntest.actions.run_and_verify_svn(None, ['\n', 'Committed revision 10.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ 'Committed revision 10.\n'],
[], "mkdir", sbox.repo_url + "/toplevel",
"-m", "Create toplevel dir to load into")
svntest.actions.run_and_verify_svnrdump(svnrdump_dumpfile,
@@ -727,7 +728,8 @@ def svnrdump_load_partial_incremental_du
# Create the 'A' directory in repository and then load the partial
# incremental dump into the root of the repository.
- svntest.actions.run_and_verify_svn(None, ['\n', 'Committed revision 1.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ 'Committed revision 1.\n'],
[], "mkdir", sbox.repo_url + "/A",
"-m", "Create toplevel dir to load into")
Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1606182&r1=1606181&r2=1606182&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Fri Jun 27 18:44:51 2014
@@ -352,11 +352,13 @@ def delete_subdir(sbox):
A2_B_F_url = sbox.repo_url + '/A2/B/F'
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 2.\n'], [],
+ ['Committing transaction...\n',
+ 'Committed revision 2.\n'], [],
'cp', '-m', 'make copy', A_url, A2_url)
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 3.\n'], [],
+ ['Committing transaction...\n',
+ 'Committed revision 3.\n'], [],
'rm', '-m', 'delete subdir', A2_B_F_url)
expected_output = svntest.wc.State(wc_dir, {
@@ -482,7 +484,8 @@ def failed_anchor_is_target(sbox):
G_url = sbox.repo_url + '/A/D/G'
G_psi_url = G_url + '/psi'
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 2.\n'], [],
+ ['Committing transaction...\n',
+ 'Committed revision 2.\n'], [],
'mkdir', '-m', 'log msg', G_psi_url)
# Modify the file 'H/psi' locally.
@@ -543,7 +546,8 @@ def bad_intermediate_urls(sbox):
# First, make an extra subdirectory in C to match one in the root, plus
# another one inside of that.
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 2.\n'], [],
+ ['Committing transaction...\n',
+ 'Committed revision 2.\n'], [],
'mkdir', '-m', 'log msg',
url_A_C_A, url_A_C_A_Z)
@@ -1106,7 +1110,7 @@ def forced_switch_failures(sbox):
# Make dir A/D/H/I in repos.
# svn mkdir -m "Log message" url/A/D/H/I
expected_stdout = verify.UnorderedOutput([
- '\n',
+ 'Committing transaction...\n',
'Committed revision 2.\n',
])
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1606182&r1=1606181&r2=1606182&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Fri Jun 27 18:44:51 2014
@@ -1238,7 +1238,8 @@ def another_hudson_problem(sbox):
# Delete directory G from the repository
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 3.\n'], [],
+ ['Committing transaction...\n',
+ 'Committed revision 3.\n'], [],
'rm', '-m', 'log msg',
sbox.repo_url + '/A/D/G')
@@ -1340,7 +1341,8 @@ def new_dir_with_spaces(sbox):
# Create a new directory ("spacey dir") directly in repository
svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 2.\n'], [],
+ ['Committing transaction...\n',
+ 'Committed revision 2.\n'], [],
'mkdir', '-m', 'log msg',
sbox.repo_url
+ '/A/spacey%20dir')
@@ -1983,7 +1985,7 @@ def update_copy_of_old_rev(sbox):
# Commit, and check that it says it's committing the right thing
exp_out = ['Adding ' + dir2 + '\n',
- '\n',
+ 'Committing transaction...\n',
'Committed revision 3.\n']
svntest.actions.run_and_verify_svn(None, exp_out, [],
'ci', '-m', '', wc_dir)
Re: svn commit: r1606182 - in /subversion/trunk/subversion: svn/ tests/cmdline/
Posted by Ivan Zhakov <iv...@apache.org>.
On 29 June 2014 22:56, Bert Huijben <be...@qqmail.nl> wrote:
>
>
>> -----Original Message-----
>> From: ivan@apache.org [mailto:ivan@apache.org]
>> Sent: vrijdag 27 juni 2014 20:45
>> To: commits@subversion.apache.org
>> Subject: svn commit: r1606182 - in /subversion/trunk/subversion: svn/
>> tests/cmdline/
>>
>> Author: ivan
>> Date: Fri Jun 27 18:44:51 2014
>> New Revision: 1606182
>>
>> URL: http://svn.apache.org/r1606182
>> Log:
>> Follow-up to r1604179: Print "Committing transaction" progress notification
>> for tree changes only commits.
>>
>> Found by: julianfoad
>
> I don't understand why (yet), but this patch breaks quite a few tests on most buildbots.
>
> The pattern I don't understand is:
> [[[
[...]
> FAIL: merge_tests.py 59: merge -rold(before rename):head renamed file
> ]]]
>
> The expected and actual output appear to be identical here.
>
Fixed in r1606648. Thanks!
> If we are going to fix these cases anyway I would prefer an additional patch like
> [[
> Index: subversion/svn/notify.c
> ===================================================================
> --- subversion/svn/notify.c (revision 1606560)
> +++ subversion/svn/notify.c (working copy)
> @@ -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:
> Index: subversion/svn/util.c
> ===================================================================
> --- subversion/svn/util.c (revision 1606560)
> +++ subversion/svn/util.c (working copy)
> @@ -76,7 +76,7 @@ svn_cl__print_commit_info(const svn_commit_info_t
> 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")
> ]]
> To remove the magic coupling of the EOL handling between these two functions.
> (This will need additional test fixups to remove several empty lines that we expect in older cases)
>
I considered such change, but found some other coupling between
different notifications and decided to look to this later.
--
Ivan Zhakov
RE: svn commit: r1606182 - in /subversion/trunk/subversion: svn/ tests/cmdline/
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: ivan@apache.org [mailto:ivan@apache.org]
> Sent: vrijdag 27 juni 2014 20:45
> To: commits@subversion.apache.org
> Subject: svn commit: r1606182 - in /subversion/trunk/subversion: svn/
> tests/cmdline/
>
> Author: ivan
> Date: Fri Jun 27 18:44:51 2014
> New Revision: 1606182
>
> URL: http://svn.apache.org/r1606182
> Log:
> Follow-up to r1604179: Print "Committing transaction" progress notification
> for tree changes only commits.
>
> Found by: julianfoad
I don't understand why (yet), but this patch breaks quite a few tests on most buildbots.
The pattern I don't understand is:
[[[
W: EXPECTED STDOUT:
W: | Committing transaction...
W: | Committed revision 4.
W: ACTUAL STDOUT:
W: | Committing transaction...
W: | Committed revision 4.
W: DIFF STDOUT:
W: | --- EXPECTED STDOUT
W: | +++ ACTUAL STDOUT
W: | @@ -1,2 +1,2 @@
W: | -Committing transaction...
W: | +Committing transaction...
W: | Committed revision 4.
W: CWD: E:\svn-local\tests\subversion\tests\cmdline
W: EXCEPTION: SVNLineUnequal
Traceback (most recent call last):
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\main.py", line 1621, in run
rc = self.pred.run(sandbox)
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\testcase.py", line 254, in run
return self._delegate.run(sandbox)
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\testcase.py", line 176, in run
return self.func(sandbox)
File "D:\local\svn-local\build\subversion\tests\cmdline\merge_tests.py", line 8156, in merge_old_and_new_revs_from_renamed_file
mu_url, mu_MOVED_url)
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\actions.py", line 284, in run_and_verify_svn
expected_exit, *varargs)
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\actions.py", line 323, in run_and_verify_svn2
verify.verify_outputs(message, out, err, expected_stdout, expected_stderr)
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\verify.py", line 452, in verify_outputs
compare_and_display_lines(message, label, expected, actual, raisable)
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\verify.py", line 425, in compare_and_display_lines
raise raisable
SVNLineUnequal
FAIL: merge_tests.py 59: merge -rold(before rename):head renamed file
]]]
The expected and actual output appear to be identical here.
If we are going to fix these cases anyway I would prefer an additional patch like
[[
Index: subversion/svn/notify.c
===================================================================
--- subversion/svn/notify.c (revision 1606560)
+++ subversion/svn/notify.c (working copy)
@@ -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:
Index: subversion/svn/util.c
===================================================================
--- subversion/svn/util.c (revision 1606560)
+++ subversion/svn/util.c (working copy)
@@ -76,7 +76,7 @@ svn_cl__print_commit_info(const svn_commit_info_t
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")
]]
To remove the magic coupling of the EOL handling between these two functions.
(This will need additional test fixups to remove several empty lines that we expect in older cases)
Bert