/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/status.py

  • Committer: Martin Pool
  • Date: 2010-04-28 07:03:38 UTC
  • mfrom: (5188 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5189.
  • Revision ID: mbp@sourcefrog.net-20100428070338-2af8y3takgfkrkyp
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
166
166
                           short=short, want_unchanged=show_unchanged, 
167
167
                           want_unversioned=want_unversioned, show_ids=show_ids)
168
168
 
 
169
            # show the ignored files among specific files (i.e. show the files
 
170
            # identified from input that we choose to ignore). 
 
171
            if specific_files is not None:
 
172
                # Ignored files is sorted because specific_files is already sorted
 
173
                ignored_files = [specific for specific in
 
174
                    specific_files if new.is_ignored(specific)]
 
175
                if len(ignored_files) > 0 and not short:
 
176
                    to_file.write("ignored:\n")
 
177
                    prefix = ' '
 
178
                else:
 
179
                    prefix = 'I  '
 
180
                for ignored_file in ignored_files:
 
181
                    to_file.write("%s %s\n" % (prefix, ignored_file))
 
182
 
169
183
            # show the new conflicts only for now. XXX: get them from the
170
184
            # delta.
171
185
            conflicts = new.conflicts()