← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Andrew Bennetts
  • Date: 2008-03-27 06:10:18 UTC
  • mfrom: (3309 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3320.
  • Revision ID: andrew.bennetts@canonical.com-20080327061018-dxztpxyv6yoeg3am
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
103
103
            _raise_if_nonexistent(specific_files, old, new)
104
104
            want_unversioned = not versioned
105
105
            if short:
106
 
                changes = new._iter_changes(old, show_unchanged, specific_files,
 
106
                changes = new.iter_changes(old, show_unchanged, specific_files,
107
107
                    require_versioned=False, want_unversioned=want_unversioned)
108
108
                reporter = _mod_delta._ChangeReporter(output_file=to_file,
109
109
                    unversioned_filter=new.is_ignored)
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: