← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/win32utils.py

(jr) Add gettext() to uses of note() (Jonathan Riddell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/win32utils.py
25
25
import sys
26
26
 
27
27
from bzrlib import cmdline
 
28
from bzrlib.i18n import gettext
28
29
 
29
30
# Windows version
30
31
if sys.platform == 'win32':
128
129
            ctypes.byref(mem_struct),
129
130
            ctypes.sizeof(mem_struct))
130
131
        if not ret:
131
 
            trace.note('Failed to GetProcessMemoryInfo()')
 
132
            trace.note(gettext('Failed to GetProcessMemoryInfo()'))
132
133
            return
133
134
        info = {'PageFaultCount': mem_struct.PageFaultCount,
134
135
                'PeakWorkingSetSize': mem_struct.PeakWorkingSetSize,
149
150
        proc = win32process.GetCurrentProcess()
150
151
        info = win32process.GetProcessMemoryInfo(proc)
151
152
    else:
152
 
        trace.note('Cannot debug memory on win32 without ctypes'
153
 
                   ' or win32process')
 
153
        trace.note(gettext('Cannot debug memory on win32 without ctypes'
 
154
                   ' or win32process'))
154
155
        return
155
156
    if short:
156
157
        # using base-2 units (see HACKING.txt).
157
 
        trace.note('WorkingSize %7dKiB'
158
 
                   '\tPeakWorking %7dKiB\t%s',
 
158
        trace.note(gettext('WorkingSize %7dKiB'
 
159
                   '\tPeakWorking %7dKiB\t%s'),
159
160
                   info['WorkingSetSize'] / 1024,
160
161
                   info['PeakWorkingSetSize'] / 1024,
161
162
                   message)
162
163
        return
163
164
    if message:
164
165
        trace.note('%s', message)
165
 
    trace.note('WorkingSize       %8d KiB', info['WorkingSetSize'] / 1024)
166
 
    trace.note('PeakWorking       %8d KiB', info['PeakWorkingSetSize'] / 1024)
167
 
    trace.note('PagefileUsage     %8d KiB', info.get('PagefileUsage', 0) / 1024)
168
 
    trace.note('PeakPagefileUsage %8d KiB',
 
166
    trace.note(gettext('WorkingSize       %8d KiB'), info['WorkingSetSize'] / 1024)
 
167
    trace.note(gettext('PeakWorking       %8d KiB'), info['PeakWorkingSetSize'] / 1024)
 
168
    trace.note(gettext('PagefileUsage     %8d KiB'), info.get('PagefileUsage', 0) / 1024)
 
169
    trace.note(gettext('PeakPagefileUsage %8d KiB'),
169
170
               info.get('PeakPagefileUsage', 0) / 1024)
170
 
    trace.note('PrivateUsage      %8d KiB', info.get('PrivateUsage', 0) / 1024)
171
 
    trace.note('PageFaultCount    %8d', info.get('PageFaultCount', 0))
 
171
    trace.note(gettext('PrivateUsage      %8d KiB'), info.get('PrivateUsage', 0) / 1024)
 
172
    trace.note(gettext('PageFaultCount    %8d'), info.get('PageFaultCount', 0))
172
173
 
173
174
 
174
175
def get_console_size(defaultx=80, defaulty=25):