← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
165
165
    for merge in new.pending_merges():
166
166
        ignore.add(merge)
167
167
        try:
 
168
            from bzrlib.osutils import terminal_width
 
169
            width = terminal_width()
168
170
            m_revision = branch.repository.get_revision(merge)
169
 
            print >> to_file, ' ', line_log(m_revision, 77)
 
171
            print >> to_file, ' ', line_log(m_revision, width - 3)
170
172
            inner_merges = branch.repository.get_ancestry(merge)
171
173
            assert inner_merges[0] == None
172
174
            inner_merges.pop(0)
175
177
                if mmerge in ignore:
176
178
                    continue
177
179
                mm_revision = branch.repository.get_revision(mmerge)
178
 
                print >> to_file, '   ', line_log(mm_revision, 75)
 
180
                print >> to_file, '   ', line_log(mm_revision, width - 5)
179
181
                ignore.add(mmerge)
180
182
        except errors.NoSuchRevision:
181
183
            print >> to_file, ' ', merge