You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2010/11/22 18:41:06 UTC
svn commit: r1037796 - in /subversion/trunk/subversion: svn/notify.c
tests/cmdline/merge_tests.py tests/cmdline/redirect_tests.py
tests/cmdline/svntest/actions.py tests/cmdline/update_tests.py
Author: cmpilato
Date: Mon Nov 22 17:41:06 2010
New Revision: 1037796
URL: http://svn.apache.org/viewvc?rev=1037796&view=rev
Log:
Minor output formatting tweak.
* subversion/svn/notify.c
(notify): Add a space between the path and the ellipses in
notifications of the "Updating 'some/path' ..." variety.
* subversion/tests/cmdline/merge_tests.py
(merge_range_prior_to_rename_source_existence): Tweak test expectations.
* subversion/tests/cmdline/redirect_tests.py
(redirected_update): Tweak test expectations.
* subversion/tests/cmdline/update_tests.py
(another_hudson_problem, update_accept_conflicts): Tweak test expectations.
* subversion/tests/cmdline/svntest/actions.py
(expected_noop_update_output): Tweak returned expected output.
Modified:
subversion/trunk/subversion/svn/notify.c
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/redirect_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/actions.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=1037796&r1=1037795&r2=1037796&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Mon Nov 22 17:41:06 2010
@@ -553,7 +553,7 @@ notify(void *baton, const svn_wc_notify_
nb->is_checkout ||
nb->is_export))
{
- if ((err = svn_cmdline_printf(pool, _("Updating '%s'...\n"),
+ if ((err = svn_cmdline_printf(pool, _("Updating '%s' ...\n"),
path_local)))
goto print_error;
}
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1037796&r1=1037795&r2=1037796&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Nov 22 17:41:06 2010
@@ -13996,7 +13996,7 @@ def merge_range_prior_to_rename_source_e
sbox.repo_url + '/A/D/H/nu_moved',
'-m', 'Move nu to nu_moved')
svntest.actions.run_and_verify_svn(None,
- ["Updating '%s'...\n" % (wc_dir),
+ ["Updating '%s' ...\n" % (wc_dir),
"D " + nu_path + "\n",
"A " + nu_moved_path + "\n",
"Updated to revision 12.\n"],
Modified: subversion/trunk/subversion/tests/cmdline/redirect_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/redirect_tests.py?rev=1037796&r1=1037795&r2=1037796&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/redirect_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/redirect_tests.py Mon Nov 22 17:41:06 2010
@@ -129,7 +129,7 @@ def redirected_update(sbox):
exit_code, out, err = svntest.main.run_svn(None, 'up', wc_dir)
if err:
raise svntest.Failure
- if not re.match("^Updating '.*'...", out[0]):
+ if not re.match("^Updating '.*' ...", out[0]):
raise svntest.Failure
if not redirect_regex.match(out[1]):
raise svntest.Failure
Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1037796&r1=1037795&r2=1037796&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Mon Nov 22 17:41:06 2010
@@ -360,7 +360,7 @@ def expected_noop_update_output(rev):
"""Return an ExpectedOutput object describing what we'd expect to
see from an update to revision REV that was effectively a no-op (no
server changes transmitted)."""
- return verify.createExpectedOutput("Updating '.*'...|At revision %d."
+ return verify.createExpectedOutput("Updating '.*' ...|At revision %d."
% (rev),
"no-op update")
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1037796&r1=1037795&r2=1037796&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Mon Nov 22 17:41:06 2010
@@ -1169,12 +1169,12 @@ def another_hudson_problem(sbox):
# as 'deleted' and should not alter gamma's entry.
if not svntest.main.wc_is_singledb(wc_dir):
- expected_output = ["Updating '%s'...\n" % (G_path),
+ expected_output = ["Updating '%s' ...\n" % (G_path),
'D '+G_path+'\n',
'Updated to revision 3.\n',
]
else:
- expected_output = ["Updating '%s'...\n" % (G_path),
+ expected_output = ["Updating '%s' ...\n" % (G_path),
'Restored \'' + G_path + '\'\n',
'Restored \'' + G_path + os.path.sep + 'pi\'\n',
'Restored \'' + G_path + os.path.sep + 'rho\'\n',
@@ -3795,7 +3795,7 @@ def update_accept_conflicts(sbox):
# Just leave the conflicts alone, since run_and_verify_svn already uses
# the --non-interactive option.
svntest.actions.run_and_verify_svn(None,
- ["Updating '%s'...\n" % (iota_path_backup),
+ ["Updating '%s' ...\n" % (iota_path_backup),
'C %s\n' % (iota_path_backup,),
'Updated to revision 2.\n',
'Summary of conflicts:\n',
@@ -3806,7 +3806,7 @@ def update_accept_conflicts(sbox):
# lambda: --accept=postpone
# Just leave the conflicts alone.
svntest.actions.run_and_verify_svn(None,
- ["Updating '%s'...\n" % (lambda_path_backup),
+ ["Updating '%s' ...\n" % (lambda_path_backup),
'C %s\n' % (lambda_path_backup,),
'Updated to revision 2.\n',
'Summary of conflicts:\n',
@@ -3818,7 +3818,7 @@ def update_accept_conflicts(sbox):
# mu: --accept=base
# Accept the pre-update base file.
svntest.actions.run_and_verify_svn(None,
- ["Updating '%s'...\n" % (mu_path_backup),
+ ["Updating '%s' ...\n" % (mu_path_backup),
'G %s\n' % (mu_path_backup,),
'Updated to revision 2.\n'],
[],
@@ -3828,7 +3828,7 @@ def update_accept_conflicts(sbox):
# alpha: --accept=mine
# Accept the user's working file.
svntest.actions.run_and_verify_svn(None,
- ["Updating '%s'...\n" % (alpha_path_backup),
+ ["Updating '%s' ...\n" % (alpha_path_backup),
'G %s\n' % (alpha_path_backup,),
'Updated to revision 2.\n'],
[],
@@ -3838,7 +3838,7 @@ def update_accept_conflicts(sbox):
# beta: --accept=theirs
# Accept their file.
svntest.actions.run_and_verify_svn(None,
- ["Updating '%s'...\n" % (beta_path_backup),
+ ["Updating '%s' ...\n" % (beta_path_backup),
'G %s\n' % (beta_path_backup,),
'Updated to revision 2.\n'],
[],
@@ -3850,7 +3850,7 @@ def update_accept_conflicts(sbox):
# conflicts in place, so expect a message on stderr, but expect
# svn to exit with an exit code of 0.
svntest.actions.run_and_verify_svn2(None,
- ["Updating '%s'...\n" % (pi_path_backup),
+ ["Updating '%s' ...\n" % (pi_path_backup),
'G %s\n' % (pi_path_backup,),
'Updated to revision 2.\n'],
"system(.*) returned.*", 0,
@@ -3860,7 +3860,7 @@ def update_accept_conflicts(sbox):
# rho: --accept=launch
# Run the external merge tool, it should leave conflict markers in place.
svntest.actions.run_and_verify_svn(None,
- ["Updating '%s'...\n" % (rho_path_backup),
+ ["Updating '%s' ...\n" % (rho_path_backup),
'C %s\n' % (rho_path_backup,),
'Updated to revision 2.\n',
'Summary of conflicts:\n',