/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: Robert Collins
  • Date: 2009-02-20 08:40:02 UTC
  • mfrom: (4025 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4026.
  • Revision ID: robertc@robertcollins.net-20090220084002-e49vh0sxlkxhzt2m
Resolve NEWS conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ui/text.py
162
162
    def _format_task(self, task):
163
163
        if not task.show_count:
164
164
            s = ''
165
 
        elif task.total_cnt is not None:
 
165
        elif task.current_cnt is not None and task.total_cnt is not None:
166
166
            s = ' %d/%d' % (task.current_cnt, task.total_cnt)
167
167
        elif task.current_cnt is not None:
168
168
            s = ' %d' % (task.current_cnt)