commit 2b4f9b881d937ce0d2b32d64b40e6554b0fee4fb
author Daniel Shahaf <danielsh@apache.org> Mon Aug 19 10:26:22 2013 +0000
committer Daniel Shahaf <danielsh@apache.org> Mon Aug 19 10:26:22 2013 +0000
tree 5e847f2a49bb3c46f034fcc2bdb0c604a9d110fb
parent d5e1e72d3566e825d759c64191f639d72b951d0c

Spell revision numbers as "r%ld" in error messages.

Only error messages are touched; test suite and stdout progress output are
unaffected.

* subversion/bindings/ctypes-python/csvn/txn.py (Txn.delete),
* subversion/svnsync/svnsync.c (replay_rev_finished),
* tools/examples/blame.py (blame),
* tools/server-side/fsfs-stats.c (parse_dir): 
    As above.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1515343 13f79535-47bb-0310-9956-ffa450edef68

subversion/bindings/ctypes-python/csvn/txn.py

diff --git a/subversion/bindings/ctypes-python/csvn/txn.py b/subversion/bindings/ctypes-python/csvn/txn.py
index 9f5151b..ecad4fb 100644
--- a/subversion/bindings/ctypes-python/csvn/txn.py
+++ b/subversion/bindings/ctypes-python/csvn/txn.py
@@ -90,7 +90,7 @@
 
         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)

subversion/svnsync/svnsync.c

diff --git a/subversion/svnsync/svnsync.c b/subversion/svnsync/svnsync.c
index f6d54ca..2c648e3 100644
--- a/subversion/svnsync/svnsync.c
+++ b/subversion/svnsync/svnsync.c
@@ -1296,7 +1296,7 @@
   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 %ld"),
               rb->sb->committed_rev, revision);
 
   SVN_ERR(svn_ra_rev_proplist(rb->to_session, revision, &existing_props,

tools/examples/blame.py

diff --git a/tools/examples/blame.py b/tools/examples/blame.py
index 87d33b3..14368e5 100755
--- a/tools/examples/blame.py
+++ b/tools/examples/blame.py
@@ -91,9 +91,9 @@
 #    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")

tools/server-side/fsfs-stats.c

diff --git a/tools/server-side/fsfs-stats.c b/tools/server-side/fsfs-stats.c
index d9c6640..513038f 100644
--- a/tools/server-side/fsfs-stats.c
+++ b/tools/server-side/fsfs-stats.c
@@ -1241,7 +1241,7 @@
       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);