← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ui/text.py

  • Committer: Martin Pool
  • Date: 2010-07-21 09:58:42 UTC
  • mfrom: (4797.58.7 2.1)
  • mto: (5050.3.13 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: mbp@canonical.com-20100721095842-hz0obu8gl0x05nty
merge up 2.1 to 2.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ui/text.py
304
304
        # we need one extra space for terminals that wrap on last char
305
305
        w = osutils.terminal_width() 
306
306
        if w is None:
307
 
            return None
 
307
            return w
308
308
        else:
309
309
            return w - 1
310
310
 
311
311
    def _show_line(self, s):
312
 
        # sys.stderr.write("progress %r\n" % s)
313
 
        width = self._avail_width()
314
 
        if width is not None:
315
 
            s = '%-*.*s' % (width, width, s)
316
312
        self._term_file.write('\r' + s + '\r')
317
313
 
318
314
    def clear(self):