svn commit: r1095743 - in /subversion/trunk/subversion: svn/notify.c tests/cmdline/externals_tests.py tests/cmdline/svntest/actions.py

[da...@apache.org]

Author: danielsh
Date: Thu Apr 21 15:07:57 2011
New Revision: 1095743

URL: http://svn.apache.org/viewvc?rev=1095743&view=rev
Log:
Add some colons to the cmdline output.  Also, in one case, change
the tense of a verb (which may or may not be a compatible change).

* subversion/svn/notify.c
  (notify): As above.

* subversion/tests/cmdline/externals_tests.py
  (update_lose_file_external): Track tense change.

* subversion/tests/cmdline/svntest/actions.py
  (process_output_for_commit): Ditto.

Modified:
    subversion/trunk/subversion/svn/notify.c
    subversion/trunk/subversion/tests/cmdline/externals_tests.py
    subversion/trunk/subversion/tests/cmdline/svntest/actions.py

Modified: subversion/trunk/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1095743&r1=1095742&r2=1095743&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Thu Apr 21 15:07:57 2011
@@ -173,13 +173,13 @@ notify(void *baton, const svn_wc_notify_
       nb->received_some_change = TRUE;
       if (n->err && n->err->message)
         {
-          if ((err = svn_cmdline_printf(pool, "Removing external '%s' -- %s\n",
+          if ((err = svn_cmdline_printf(pool, "Removed external '%s': %s\n",
               path_local, n->err->message)))
             goto print_error;
         }
       else
         {
-          if ((err = svn_cmdline_printf(pool, "Removing external '%s'\n",
+          if ((err = svn_cmdline_printf(pool, "Removed external '%s'\n",
                                         path_local)))
             goto print_error;
         }
@@ -534,7 +534,7 @@ notify(void *baton, const svn_wc_notify_
       /* Currently this is used for checkouts and switches too.  If we
          want different output, we'll have to add new actions. */
       if ((err = svn_cmdline_printf(pool,
-                                    _("\nFetching external item into '%s'\n"),
+                                    _("\nFetching external item into '%s':\n"),
                                     path_local)))
         goto print_error;
       break;
@@ -667,7 +667,7 @@ notify(void *baton, const svn_wc_notify_
 
     case svn_wc_notify_status_external:
       if ((err = svn_cmdline_printf
-           (pool, _("\nPerforming status on external item at '%s'\n"),
+           (pool, _("\nPerforming status on external item at '%s':\n"),
             path_local)))
         goto print_error;
       break;
@@ -945,7 +945,7 @@ notify(void *baton, const svn_wc_notify_
       break;
 
     case svn_wc_notify_url_redirect:
-      err = svn_cmdline_printf(pool, _("Redirecting to URL '%s'\n"),
+      err = svn_cmdline_printf(pool, _("Redirecting to URL '%s':\n"),
                                n->url);
       if (err)
         goto print_error;

Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1095743&r1=1095742&r2=1095743&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Thu Apr 21 15:07:57 2011
@@ -1213,7 +1213,7 @@ def update_lose_file_external(sbox):
   # commit the property change
   expected_output = svntest.wc.State(wc_dir, {
     'A/C' : Item(verb='Sending'),
-    'A/C/external' : Item(verb='Removing external'),
+    'A/C/external' : Item(verb='Removed external'),
     })
 
   # (re-use above expected_status)

Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1095743&r1=1095742&r2=1095743&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Thu Apr 21 15:07:57 2011
@@ -1303,10 +1303,14 @@ def process_output_for_commit(output):
   lastline = ""
   rest = []
 
+  def external_removal(line):
+    return line.startswith('Removing external') \
+           or line.startswith('Removed external')
+
   if len(output):
     lastline = output.pop().strip()
 
-    while len(output) and lastline.startswith('Removing external'):
+    while len(output) and external_removal(lastline):
       rest.append(lastline)
       lastline = output.pop().strip()