← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Martin Pool
  • Date: 2010-04-01 04:41:18 UTC
  • mto: This revision was merged to the branch mainline in revision 5128.
  • Revision ID: mbp@sourcefrog.net-20100401044118-shyctqc02ob08ngz
ignore .testrepository

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
20
20
    delta as _mod_delta,
21
21
    log,
22
22
    osutils,
 
23
    tree,
23
24
    tsort,
24
25
    revision as _mod_revision,
25
26
    )
26
27
import bzrlib.errors as errors
 
28
from bzrlib.osutils import is_inside_any
 
29
from bzrlib.symbol_versioning import (deprecated_function,
 
30
        )
27
31
from bzrlib.trace import mutter, warning
28
32
 
29
33
# TODO: when showing single-line logs, truncate to the width of the terminal
162
166
                           short=short, want_unchanged=show_unchanged, 
163
167
                           want_unversioned=want_unversioned, show_ids=show_ids)
164
168
 
165
 
            # show the ignored files among specific files (i.e. show the files
166
 
            # identified from input that we choose to ignore). 
167
 
            if specific_files is not None:
168
 
                # Ignored files is sorted because specific_files is already sorted
169
 
                ignored_files = [specific for specific in
170
 
                    specific_files if new.is_ignored(specific)]
171
 
                if len(ignored_files) > 0 and not short:
172
 
                    to_file.write("ignored:\n")
173
 
                    prefix = ' '
174
 
                else:
175
 
                    prefix = 'I  '
176
 
                for ignored_file in ignored_files:
177
 
                    to_file.write("%s %s\n" % (prefix, ignored_file))
178
 
 
179
169
            # show the new conflicts only for now. XXX: get them from the
180
170
            # delta.
181
171
            conflicts = new.conflicts()