/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: Robert Collins
  • Date: 2007-03-05 03:10:21 UTC
  • mto: (2255.11.4 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070305031021-ypbakvagbivyw5mu
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
144
144
            _raise_if_nonexistent(specific_files, old, new)
145
145
            if short:
146
146
                changes = new._iter_changes(old, show_unchanged, specific_files,
147
 
                    require_versioned=False)
148
 
                reporter = _mod_delta.ChangeReporter(output_file=to_file)
 
147
                    require_versioned=False, want_unversioned=True)
 
148
                reporter = _mod_delta.ChangeReporter(output_file=to_file,
 
149
                    unversioned_filter=new.is_ignored)
149
150
                _mod_delta.report_changes(changes, reporter)
150
 
                short_status_letter = '? '
151
 
                list_paths('unknown', new.unknowns(), specific_files, to_file,
152
 
                           short_status_letter)
153
151
            else:
154
152
                delta = new.changes_from(old, want_unchanged=show_unchanged,
155
153
                                      specific_files=specific_files,
233
231
            else:
234
232
                prefix = ' '
235
233
            print >> to_file, prefix, merge
236
 
        
237
 
def list_paths(header, paths, specific_files, to_file, short_status_letter=''):
238
 
    done_header = False
239
 
    for path in paths:
240
 
        if specific_files and not is_inside_any(specific_files, path):
241
 
            continue
242
 
        if not short_status_letter and not done_header:
243
 
            print >>to_file, '%s:' % header
244
 
            done_header = True
245
 
        print >>to_file, '%s  %s' % (short_status_letter, path)