You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/06/30 13:33:04 UTC
svn commit: r1606691 - in /subversion/trunk/subversion: svn/copy-cmd.c
tests/cmdline/blame_tests.py tests/cmdline/copy_tests.py
tests/cmdline/merge_tests.py tests/cmdline/merge_tree_conflict_tests.py
tests/cmdline/switch_tests.py
Author: rhuijben
Date: Mon Jun 30 11:33:03 2014
New Revision: 1606691
URL: http://svn.apache.org/r1606691
Log:
Make the 'Committing revision...' notification visible for URL URL copies,
where it was explicitly hidden before... which was the standard behavior
before we added url support for notifications a few years ago.
The behavior was made explicit when the notification setup was generalized
for all svn commands.
* subversion/svn/copy-cmd.c
(svn_cl__copy): Use standard behavior for url-url copies.
* subversion/tests/cmdline/blame_tests.py
(blame_output_after_merge): Expect notification.
* subversion/tests/cmdline/copy_tests.py
(url_copy_parent_into_child): Expect notification.
* subversion/tests/cmdline/merge_tests.py
(simple_property_merges,
merge_old_and_new_revs_from_renamed_file,
merge_with_auto_rev_range_detection,
merge_added_subtree,
dont_merge_revs_into_subtree_that_predate_it,
set_up_renamed_subtree,
set_up_natural_history_gap): Expect notification.
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(merge_replace_setup): Expect notification.
* subversion/tests/cmdline/switch_tests.py
(delete_subdir,
obstructed_switch,
refresh_read_only_attribute,
tolerate_local_mods): Expect notification.
Modified:
subversion/trunk/subversion/svn/copy-cmd.c
subversion/trunk/subversion/tests/cmdline/blame_tests.py
subversion/trunk/subversion/tests/cmdline/copy_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/trunk/subversion/tests/cmdline/switch_tests.py
Modified: subversion/trunk/subversion/svn/copy-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/copy-cmd.c?rev=1606691&r1=1606690&r2=1606691&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/copy-cmd.c (original)
+++ subversion/trunk/subversion/svn/copy-cmd.c Mon Jun 30 11:33:03 2014
@@ -150,8 +150,7 @@ svn_cl__copy(apr_getopt_t *os,
}
else
{
- /* URL -> URL, meaning that no notification is needed. */
- ctx->notify_func2 = NULL;
+ /* URL -> URL */
}
if (! dst_is_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=1606691&r1=1606690&r2=1606691&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/blame_tests.py Mon Jun 30 11:33:03 2014
@@ -656,7 +656,8 @@ 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, ["Committed revision 4.\n"], [],
+ svntest.actions.run_and_verify_svn(None, ["Committing transaction...\n",
+ "Committed revision 4.\n"], [],
'cp', '--parents',
trunk_url, branches_br_url,
"-m", "create branch")
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1606691&r1=1606690&r2=1606691&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Mon Jun 30 11:33:03 2014
@@ -1095,7 +1095,8 @@ def url_copy_parent_into_child(sbox):
# Issue 1367 parent/child URL-to-URL was rejected.
svntest.actions.run_and_verify_svn(None,
- ['Committed revision 2.\n'], [],
+ ['Committing transaction...\n',
+ 'Committed revision 2.\n'], [],
'cp',
'-m', 'a can of worms',
B_url, F_url)
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1606691&r1=1606690&r2=1606691&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Jun 30 11:33:03 2014
@@ -686,7 +686,8 @@ def simple_property_merges(sbox):
A_url = sbox.repo_url + '/A'
A2_url = sbox.repo_url + '/A2'
svntest.actions.run_and_verify_svn(None,
- ['Committed revision 5.\n'], [],
+ ['Committing transaction...\n',
+ 'Committed revision 5.\n'], [],
'copy', '-m', 'copy A to A2',
A_url, A2_url)
@@ -8137,7 +8138,8 @@ 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, ['Committed revision 2.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ 'Committed revision 2.\n'],
[], 'cp', '-m', 'cp mu to mu_COPY',
mu_url, mu_COPY_url)
@@ -8229,7 +8231,8 @@ def merge_with_auto_rev_range_detection(
expected_status, None, wc_dir)
# Copy A to A_COPY
- svntest.actions.run_and_verify_svn(None, ['Committed revision 3.\n'],
+ svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ 'Committed revision 3.\n'],
[], 'cp', '-m', 'cp A to A_COPY',
A_url, A_COPY_url)
@@ -10551,9 +10554,11 @@ def merge_added_subtree(sbox):
A_COPY_url = url + "/A_COPY"
A_path = sbox.ospath('A')
- svntest.actions.run_and_verify_svn("",["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("",["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')
@@ -10812,7 +10817,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,
- ['Committed revision 6.\n'],
+ ['Committing transaction...\n',
+ 'Committed revision 6.\n'],
[], 'copy',
sbox.repo_url + "/A/D/H",
sbox.repo_url + "/H_COPY",
@@ -10964,7 +10970,8 @@ def set_up_renamed_subtree(sbox):
# Copy 'A/D/H' to 'H_COPY' in r5.
svntest.actions.run_and_verify_svn(None,
- ['Committed revision 5.\n'],
+ ['Committing transaction...\n',
+ 'Committed revision 5.\n'],
[], 'copy',
sbox.repo_url + "/A/D/H",
sbox.repo_url + "/H_COPY",
@@ -14035,13 +14042,15 @@ def set_up_natural_history_gap(sbox):
# 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, ["Committing transaction...\n",
+ "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, ["Committing transaction...\n",
+ "Committed revision 8.\n"], [],
'copy', sbox.repo_url + '/A', sbox.repo_url + '/A_COPY',
'-m', 'Copy A to A_COPY')
Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1606691&r1=1606690&r2=1606691&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Mon Jun 30 11:33:03 2014
@@ -1456,9 +1456,10 @@ def merge_replace_setup(sbox):
# make a branch of A
# svn cp $URL/A $URL/branch
- expected_stdout = verify.UnorderedOutput([
+ expected_stdout = [
+ 'Committing transaction...\n',
'Committed revision 2.\n',
- ])
+ ]
actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'cp', url_A,
url_branch, '-m', 'copy log')
Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1606691&r1=1606690&r2=1606691&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Mon Jun 30 11:33:03 2014
@@ -352,7 +352,8 @@ def delete_subdir(sbox):
A2_B_F_url = sbox.repo_url + '/A2/B/F'
svntest.actions.run_and_verify_svn(None,
- ['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,
@@ -645,9 +646,10 @@ def obstructed_switch(sbox):
url_A_B_Esave = url + '/A/B/Esave'
# svn cp -m msgcopy url/A/B/E url/A/B/Esave
- expected_stdout = verify.UnorderedOutput([
+ expected_stdout = [
+ 'Committing transaction...\n',
'Committed revision 2.\n',
- ])
+ ]
actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'cp', '-m',
'msgcopy', url_A_B_E, url_A_B_Esave)
@@ -785,7 +787,8 @@ 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,
- ['Committed revision 2.\n'], [],
+ ['Committing transaction...\n',
+ 'Committed revision 2.\n'], [],
'cp', '-m', 'svn:needs-lock not set',
url, branch_url)
@@ -2041,7 +2044,8 @@ def tolerate_local_mods(sbox):
A2_url = sbox.repo_url + '/A2'
svntest.actions.run_and_verify_svn(None,
- ['Committed revision 2.\n'], [],
+ ['Committing transaction...\n',
+ 'Committed revision 2.\n'], [],
'cp', '-m', 'make copy', A_url, A2_url)
os.mkdir(L_path)