Rev 4175: (mbp) Use KB not kB for 1024 bytes in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4175
revision-id: pqm at pqm.ubuntu.com-20090320074349-siii554u411pxpyz
parent: pqm at pqm.ubuntu.com-20090320055549-rrh9zg82xpqdpbwz
parent: mbp at sourcefrog.net-20090320070111-frgxpetoaoun8cy8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-03-20 07:43:49 +0000
message:
  (mbp) Use KB not kB for 1024 bytes
modified:
  bzrlib/transport/log.py        log.py-20080902041816-vh8x5yt5nvdzvew3-5
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
  bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
    ------------------------------------------------------------
    revno: 4170.2.1
    revision-id: mbp at sourcefrog.net-20090320070111-frgxpetoaoun8cy8
    parent: pqm at pqm.ubuntu.com-20090319192139-7y3mlqumxy7aqtdh
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: integration
    timestamp: Fri 2009-03-20 18:01:11 +1100
    message:
      Use KB not kB for 1024 bytes
    modified:
      bzrlib/transport/log.py        log.py-20080902041816-vh8x5yt5nvdzvew3-5
      bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
      bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
=== modified file 'bzrlib/transport/log.py'
--- a/bzrlib/transport/log.py	2008-09-02 07:44:13 +0000
+++ b/bzrlib/transport/log.py	2009-03-20 07:01:11 +0000
@@ -128,7 +128,7 @@
         elapsed = time.time() - before
         if result_len and elapsed > 0:
             # this is the rate of higher-level data, not the raw network speed
-            mutter("      %9.03fs %8dkB/s" % (elapsed, result_len/elapsed/1024))
+            mutter("      %9.03fs %8dKB/s" % (elapsed, result_len/elapsed/1024))
         else:
             mutter("      %9.03fs" % (elapsed))
         return result

=== modified file 'bzrlib/ui/text.py'
--- a/bzrlib/ui/text.py	2009-03-12 07:26:03 +0000
+++ b/bzrlib/ui/text.py	2009-03-20 07:01:11 +0000
@@ -247,7 +247,7 @@
                 dir_char = '<'
             else:
                 dir_char = '?'
-            msg = ("%.7s %s %6dkB %5dkB/s" %
+            msg = ("%.7s %s %6dKB %5dKB/s" %
                     (scheme, dir_char, self._total_byte_count>>10, int(rate)>>10,))
             self._transport_update_time = now
             self._last_repaint = now

=== modified file 'bzrlib/win32utils.py'
--- a/bzrlib/win32utils.py	2009-02-23 15:29:35 +0000
+++ b/bzrlib/win32utils.py	2009-03-20 07:01:11 +0000
@@ -144,13 +144,13 @@
         trace.note('Cannot debug memory on win32 without ctypes'
                    ' or win32process')
         return
-    trace.note('WorkingSize       %8d kB', info['WorkingSetSize'] / 1024)
-    trace.note('PeakWorking       %8d kB', info['PeakWorkingSetSize'] / 1024)
+    trace.note('WorkingSize       %8d KB', info['WorkingSetSize'] / 1024)
+    trace.note('PeakWorking       %8d KB', info['PeakWorkingSetSize'] / 1024)
     if short:
         return
-    trace.note('PagefileUsage     %8d kB', info.get('PagefileUsage', 0) / 1024)
-    trace.note('PeakPagefileUsage %8d kB', info.get('PeakPagefileUsage', 0) / 1024)
-    trace.note('PrivateUsage      %8d kB', info.get('PrivateUsage', 0) / 1024)
+    trace.note('PagefileUsage     %8d KB', info.get('PagefileUsage', 0) / 1024)
+    trace.note('PeakPagefileUsage %8d KB', info.get('PeakPagefileUsage', 0) / 1024)
+    trace.note('PrivateUsage      %8d KB', info.get('PrivateUsage', 0) / 1024)
     trace.note('PageFaultCount    %8d', info.get('PageFaultCount', 0))