You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/04/14 21:30:04 UTC
svn commit: r1092446 - in /subversion/trunk/subversion: svn/notify.c
tests/cmdline/merge_tests.py tests/cmdline/svntest/actions.py
tests/cmdline/update_tests.py
Author: hwright
Date: Thu Apr 14 19:30:04 2011
New Revision: 1092446
URL: http://svn.apache.org/viewvc?rev=1092446&view=rev
Log:
UI tweak: Use ':' in place of '...' in the update start notification.
This is a bit of a bikeshed, but the denizens of IRC seemed to be in agreement
that it was a useful tweak.
* subversion/svn/notify.c
(notify): Use ':' instead of '...' as above.
* subversion/tests/cmdline/update_tests.py
(another_hudson_problem, update_accept_conflicts): Update expectations.
* subversion/tests/cmdline/svntest/actions.py
(expected_noop_update_output): Same.
* subversion/tests/cmdline/merge_tests.py
(merge_range_prior_to_rename_source_existence): Same.
Modified:
subversion/trunk/subversion/svn/notify.c
subversion/trunk/subversion/tests/cmdline/merge_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=1092446&r1=1092445&r2=1092446&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Thu Apr 14 19:30:04 2011
@@ -559,7 +559,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=1092446&r1=1092445&r2=1092446&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Thu Apr 14 19:30:04 2011
@@ -14122,7 +14122,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/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1092446&r1=1092445&r2=1092446&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Thu Apr 14 19:30:04 2011
@@ -373,7 +373,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=1092446&r1=1092445&r2=1092446&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Thu Apr 14 19:30:04 2011
@@ -1178,7 +1178,7 @@ def another_hudson_problem(sbox):
'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',
@@ -3803,7 +3803,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',
@@ -3814,7 +3814,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',
@@ -3826,7 +3826,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'],
[],
@@ -3836,7 +3836,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'],
[],
@@ -3846,7 +3846,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'],
[],
@@ -3858,7 +3858,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,
@@ -3868,7 +3868,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',
Re: svn commit: r1092446 - in /subversion/trunk/subversion: svn/notify.c
tests/cmdline/merge_tests.py tests/cmdline/svntest/actions.py tests/cmdline/update_tests.py
Posted by "C. Michael Pilato" <cm...@collab.net>.
On 04/14/2011 03:30 PM, hwright@apache.org wrote:
> Author: hwright
> Date: Thu Apr 14 19:30:04 2011
> New Revision: 1092446
>
> URL: http://svn.apache.org/viewvc?rev=1092446&view=rev
> Log:
> UI tweak: Use ':' in place of '...' in the update start notification.
>
> This is a bit of a bikeshed, but the denizens of IRC seemed to be in agreement
> that it was a useful tweak.
Oh, +1.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand