← Back to branch summary

~toddy/bzr/bzr.i18n

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Tobias Toedter
  • Date: 2008-02-10 08:01:48 UTC
  • mfrom: (2438.1.783 +trunk)
  • Revision ID: t.toedter@gmx.net-20080210080148-bg5rh61oq2zk2xw3
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
168
168
        ignore.add(merge)
169
169
        try:
170
170
            from bzrlib.osutils import terminal_width
171
 
            width = terminal_width()
 
171
            width = terminal_width() - 1    # we need one extra space to avoid
 
172
                                            # extra blank lines
172
173
            m_revision = branch.repository.get_revision(merge)
173
174
            if short:
174
 
                prefix = 'P  '
 
175
                prefix = 'P   '
175
176
            else:
176
 
                prefix = ' '
177
 
            to_file.write(prefix + ' ' + line_log(m_revision, width - 4))
 
177
                prefix = '  '
 
178
            to_file.write(prefix)
 
179
            to_file.write(line_log(m_revision, width - len(prefix)))
178
180
            to_file.write('\n')
179
181
            inner_merges = branch.repository.get_ancestry(merge)
180
182
            assert inner_merges[0] is None
185
187
                    continue
186
188
                mm_revision = branch.repository.get_revision(mmerge)
187
189
                if short:
188
 
                    prefix = 'P.  '
 
190
                    prefix = 'P.   '
189
191
                else:
190
 
                    prefix = '   '
191
 
                to_file.write(prefix + ' ' + line_log(mm_revision, width - 5))
 
192
                    prefix = '    '
 
193
                to_file.write(prefix)
 
194
                to_file.write(line_log(mm_revision, width - len(prefix)))
192
195
                to_file.write('\n')
193
196
                ignore.add(mmerge)
194
197
        except errors.NoSuchRevision: