← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

merge dirstate

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
148
148
                reporter = _mod_delta.ChangeReporter(old.inventory,
149
149
                    output_file=to_file)
150
150
                _mod_delta.report_changes(changes, reporter)
 
151
                short_status_letter = '? '
 
152
                list_paths('unknown', new.unknowns(), specific_files, to_file,
 
153
                           short_status_letter)
151
154
            else:
152
155
                delta = new.changes_from(old, want_unchanged=show_unchanged,
153
 
                                      specific_files=specific_files)
 
156
                                      specific_files=specific_files,
 
157
                                      want_unversioned=True)
 
158
                # filter out unknown files. We may want a tree method for
 
159
                # this
 
160
                delta.unversioned = [unversioned for unversioned in
 
161
                    delta.unversioned if not new.is_ignored(unversioned[0])]
154
162
                delta.show(to_file,
155
163
                           show_ids=show_ids,
156
164
                           show_unchanged=show_unchanged,
157
 
                           short_status=short)
158
 
            short_status_letter = '? '
159
 
            if not short:
160
 
                short_status_letter = ''
161
 
            list_paths('unknown', new.unknowns(), specific_files, to_file,
162
 
                       short_status_letter)
 
165
                           short_status=False)
163
166
            conflict_title = False
164
167
            # show the new conflicts only for now. XXX: get them from the delta.
165
168
            for conflict in new.conflicts():