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/20 16:44:15 UTC
svn commit: r1604179 - in /subversion/trunk/subversion: svn/notify.c
tests/cmdline/commit_tests.py tests/cmdline/depth_tests.py
tests/cmdline/svntest/wc.py tests/cmdline/trans_tests.py
Author: ivan
Date: Fri Jun 20 14:44:14 2014
New Revision: 1604179
URL: http://svn.apache.org/r1604179
Log:
Print progress notification between client finished transmitting text deltas
and asked server to commit transaction in command line client.
* subversion/svn/notify.c
(notify_body): Handle svn_wc_notify_commit_finalizing() notification and
print message if we got transmit text deltas notification before.
* subversion/tests/cmdline/commit_tests.py
* subversion/tests/cmdline/depth_tests.py
* subversion/tests/cmdline/trans_tests.py
(post_commit_hook_test, commit_depth_immediates,
eol_change_is_text_mod): Update expected output.
* subversion/tests/cmdline/svntest/wc.py
(State.from_commit): Ignore "Committing transaction" lines from
'svn commit' output when collecting modified path.
Modified:
subversion/trunk/subversion/svn/notify.c
subversion/trunk/subversion/tests/cmdline/commit_tests.py
subversion/trunk/subversion/tests/cmdline/depth_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/wc.py
subversion/trunk/subversion/tests/cmdline/trans_tests.py
Modified: subversion/trunk/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1604179&r1=1604178&r2=1604179&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Fri Jun 20 14:44:14 2014
@@ -1056,6 +1056,14 @@ notify_body(struct notify_baton *nb,
path_local));
break;
+ case svn_wc_notify_commit_finalizing:
+ if (nb->sent_first_txdelta)
+ {
+ SVN_ERR(svn_cmdline_printf(pool, _("done\n")));
+ SVN_ERR(svn_cmdline_printf(pool, _("Committing transaction...")));
+ }
+ break;
+
default:
break;
}
Modified: subversion/trunk/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/commit_tests.py?rev=1604179&r1=1604178&r2=1604179&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/commit_tests.py Fri Jun 20 14:44:14 2014
@@ -2141,7 +2141,8 @@ def post_commit_hook_test(sbox):
# filesystem will report an absolute path because that's the way the
# filesystem is created by this test suite.
expected_output = [ "Sending "+ iota_path + "\n",
- "Transmitting file data .\n",
+ "Transmitting file data .done\n",
+ "Committing transaction...\n",
"Committed revision 2.\n",
"\n",
"Warning: " +
Modified: subversion/trunk/subversion/tests/cmdline/depth_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/depth_tests.py?rev=1604179&r1=1604178&r2=1604179&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/depth_tests.py Fri Jun 20 14:44:14 2014
@@ -1135,6 +1135,7 @@ def commit_depth_immediates(sbox):
# Sending A/D/G/rho
# Sending iota
# Transmitting file data ..
+ # Committing transaction...
# Committed revision 2.
iota_path = sbox.ospath('iota')
Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=1604179&r1=1604178&r2=1604179&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Fri Jun 20 14:44:14 2014
@@ -590,6 +590,9 @@ class State:
if line.startswith('DBG:') or line.startswith('Transmitting'):
continue
+ if line.startswith('Committing transaction'):
+ continue
+
match = _re_parse_commit_ext.search(line)
if match:
desc[to_relpath(match.group(4))] = StateItem(verb=match.group(1))
Modified: subversion/trunk/subversion/tests/cmdline/trans_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/trans_tests.py?rev=1604179&r1=1604178&r2=1604179&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/trans_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/trans_tests.py Fri Jun 20 14:44:14 2014
@@ -584,7 +584,8 @@ def eol_change_is_text_mod(sbox):
# check 1: did new contents get transmitted?
expected_output = ["Sending " + foo_path + "\n",
- "Transmitting file data .\n",
+ "Transmitting file data .done\n",
+ "Committing transaction...\n",
"Committed revision 3.\n"]
svntest.actions.run_and_verify_svn(None, expected_output, [],
'ci', '-m', 'log msg', foo_path)