/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/ui/text.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ui/text.py
242
242
            warnings.warn("%r updated but no tasks are active" %
243
243
                (task,))
244
244
        elif task != self._task_stack[-1]:
245
 
            # We used to check it was the top task, but it's hard to always
246
 
            # get this right and it's not necessarily useful: any actual
247
 
            # problems will be evident in use
248
 
            #warnings.warn("%r is not the top progress task %r" %
249
 
            #     (task, self._task_stack[-1]))
250
 
            pass
 
245
            warnings.warn("%r is not the top progress task %r" %
 
246
                (task, self._task_stack[-1]))
251
247
        self._progress_view.show_progress(task)
252
248
 
253
249
    def _progress_all_finished(self):
254
250
        self._progress_view.clear()
255
251
 
256
 
    def show_user_warning(self, warning_id, **message_args):
257
 
        """Show a text message to the user.
258
 
 
259
 
        Explicitly not for warnings about bzr apis, deprecations or internals.
260
 
        """
261
 
        # eventually trace.warning should migrate here, to avoid logging and
262
 
        # be easier to test; that has a lot of test fallout so for now just
263
 
        # new code can call this
264
 
        if warning_id not in self.suppressed_warnings:
265
 
            self.stderr.write(self.format_user_warning(warning_id, message_args) +
266
 
                '\n')
267
 
 
268
252
 
269
253
class TextProgressView(object):
270
254
    """Display of progress bar and other information on a tty.
437
421
        elif now >= (self._transport_update_time + 0.5):
438
422
            # guard against clock stepping backwards, and don't update too
439
423
            # often
440
 
            rate = (self._bytes_since_update
441
 
                    / (now - self._transport_update_time))
442
 
            # using base-10 units (see HACKING.txt).
443
 
            msg = ("%6dkB %5dkB/s" %
444
 
                    (self._total_byte_count / 1000, int(rate) / 1000,))
 
424
            rate = self._bytes_since_update / (now - self._transport_update_time)
 
425
            msg = ("%6dKB %5dKB/s" %
 
426
                    (self._total_byte_count>>10, int(rate)>>10,))
445
427
            self._transport_update_time = now
446
428
            self._last_repaint = now
447
429
            self._bytes_since_update = 0
457
439
                transfer_time = 0.001
458
440
            bps = self._total_byte_count / transfer_time
459
441
 
460
 
        # using base-10 units (see HACKING.txt).
461
 
        msg = ('Transferred: %.0fkB'
462
 
               ' (%.1fkB/s r:%.0fkB w:%.0fkB'
463
 
               % (self._total_byte_count / 1000.,
464
 
                  bps / 1000.,
465
 
                  self._bytes_by_direction['read'] / 1000.,
466
 
                  self._bytes_by_direction['write'] / 1000.,
 
442
        msg = ('Transferred: %.0fKiB'
 
443
               ' (%.1fK/s r:%.0fK w:%.0fK'
 
444
               % (self._total_byte_count / 1024.,
 
445
                  bps / 1024.,
 
446
                  self._bytes_by_direction['read'] / 1024.,
 
447
                  self._bytes_by_direction['write'] / 1024.,
467
448
                 ))
468
449
        if self._bytes_by_direction['unknown'] > 0:
469
 
            msg += ' u:%.0fkB)' % (
470
 
                self._bytes_by_direction['unknown'] / 1000.
 
450
            msg += ' u:%.0fK)' % (
 
451
                self._bytes_by_direction['unknown'] / 1024.
471
452
                )
472
453
        else:
473
454
            msg += ')'