subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1516018 - in /subversion/branches/1.8.x: ./ STATUS subversion/bindings/ctypes-python/csvn/txn.py subversion/libsvn_fs_fs/fs_fs.c subversion/svnsync/svnsync.c tools/examples/blame.py tools/server-side/fsfs-stats.c
Date Tue, 20 Aug 2013 23:01:05 GMT
Author: breser
Date: Tue Aug 20 23:01:04 2013
New Revision: 1516018

URL: http://svn.apache.org/r1516018
Log:
Merge the r1499044 group from trunk:

 * r1499044, r1515343, r1515721
   Spell revision numbers as "r%ld" in error messages.
   Justification:
     We should be using 'r%ld' or 'revision %ld' consistently in user output.
   Votes:
     +1: breser, ivan, stefan2
     +1 (without r1515721): danielsh

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/bindings/ctypes-python/csvn/txn.py
    subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/1.8.x/subversion/svnsync/svnsync.c
    subversion/branches/1.8.x/tools/examples/blame.py
    subversion/branches/1.8.x/tools/server-side/fsfs-stats.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1499044,1515343,1515721

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1516018&r1=1516017&r2=1516018&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Aug 20 23:01:04 2013
@@ -120,14 +120,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1499044, r1515343, r1515721
-   Spell revision numbers as "r%ld" in error messages.
-   Justification:
-     We should be using 'r%ld' or 'revision %ld' consistently in user output.
-   Votes:
-     +1: breser, ivan, stefan2
-     +1 (without r1515721): danielsh
-
  * r1507889, r1507891
    davautocheck: use the correct apxs binary by default.
    Justification:

Modified: subversion/branches/1.8.x/subversion/bindings/ctypes-python/csvn/txn.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/bindings/ctypes-python/csvn/txn.py?rev=1516018&r1=1516017&r2=1516018&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/bindings/ctypes-python/csvn/txn.py (original)
+++ subversion/branches/1.8.x/subversion/bindings/ctypes-python/csvn/txn.py Tue Aug 20 23:01:04
2013
@@ -90,7 +90,7 @@ class Txn(object):
 
         if kind == svn_node_none:
             if base_rev:
-                message = "'%s' not found in rev %d" % (path, base_rev)
+                message = "'%s' not found in r%d" % (path, base_rev)
             else:
                 message = "'%s' not found" % (path)
             raise SubversionException(SVN_ERR_BAD_URL, message)

Modified: subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c?rev=1516018&r1=1516017&r2=1516018&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c Tue Aug 20 23:01:04 2013
@@ -3676,7 +3676,7 @@ get_revprop_packname(svn_fs_t *fs,
 
   if (revprops->manifest->nelts <= idx)
     return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
-                             _("Packed revprop manifest for rev %ld too "
+                             _("Packed revprop manifest for r%ld too "
                                "small"), revprops->revision);
 
   /* Now get the file name */
@@ -3849,14 +3849,14 @@ read_pack_revprop(packed_revprops_t **re
   /* the file content should be available now */
   if (!result->packed_revprops)
     return svn_error_createf(SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE, NULL,
-                  _("Failed to read revprop pack file for rev %ld"), rev);
+                  _("Failed to read revprop pack file for r%ld"), rev);
 
   /* parse it. RESULT will be complete afterwards. */
   err = parse_packed_revprops(fs, result, pool, iterpool);
   svn_pool_destroy(iterpool);
   if (err)
     return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
-                  _("Revprop pack file for rev %ld is corrupt"), rev);
+                  _("Revprop pack file for r%ld is corrupt"), rev);
 
   *revprops = result;
 

Modified: subversion/branches/1.8.x/subversion/svnsync/svnsync.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svnsync/svnsync.c?rev=1516018&r1=1516017&r2=1516018&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svnsync/svnsync.c (original)
+++ subversion/branches/1.8.x/subversion/svnsync/svnsync.c Tue Aug 20 23:01:04 2013
@@ -1298,7 +1298,7 @@ replay_rev_finished(svn_revnum_t revisio
   if (rb->sb->committed_rev != revision)
     return svn_error_createf
              (APR_EINVAL, NULL,
-              _("Commit created rev %ld but should have created %ld"),
+              _("Commit created r%ld but should have created r%ld"),
               rb->sb->committed_rev, revision);
 
   SVN_ERR(svn_ra_rev_proplist(rb->to_session, revision, &existing_props,

Modified: subversion/branches/1.8.x/tools/examples/blame.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/tools/examples/blame.py?rev=1516018&r1=1516017&r2=1516018&view=diff
==============================================================================
--- subversion/branches/1.8.x/tools/examples/blame.py (original)
+++ subversion/branches/1.8.x/tools/examples/blame.py Tue Aug 20 23:01:04 2013
@@ -91,9 +91,9 @@ def blame(path, filename, rev=None):
 #    print ''.join(diffresult)
 #  print annotresult
   for x in range(len(annotresult.keys())):
-     sys.stdout.write("Line %d (rev %d):%s" % (x,
-                                               annotresult[x][0],
-                                               annotresult[x][1]))
+     sys.stdout.write("Line %d (r%d):%s" % (x,
+                                            annotresult[x][0],
+                                            annotresult[x][1]))
 
 def usage():
   print("USAGE: blame.py [-r REV] repos-path file")

Modified: subversion/branches/1.8.x/tools/server-side/fsfs-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/tools/server-side/fsfs-stats.c?rev=1516018&r1=1516017&r2=1516018&view=diff
==============================================================================
--- subversion/branches/1.8.x/tools/server-side/fsfs-stats.c (original)
+++ subversion/branches/1.8.x/tools/server-side/fsfs-stats.c Tue Aug 20 23:01:04 2013
@@ -1240,7 +1240,7 @@ parse_dir(fs_fs_t *fs,
       next = current ? strchr(++current, '\n') : NULL;
       if (next == NULL)
         return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
-           _("Corrupt directory representation in rev %ld at offset %ld"),
+           _("Corrupt directory representation in r%ld at offset %ld"),
                                  representation->revision,
                                  (long)representation->offset);
 



Mime
View raw message