← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
138
138
                    raise errors.BzrCommandError(str(e))
139
139
            else:
140
140
                new = wt
141
 
        _raise_if_nonexistent(specific_files, old, new)
142
 
        if short:
143
 
            specific_file_ids = tree.find_ids_across_trees(specific_files,
144
 
                (old, new), require_versioned=False)
145
 
            changes = new._iter_changes(old, show_unchanged,
146
 
                                        specific_file_ids)
147
 
            reporter = _mod_delta.ChangeReporter(old.inventory,
148
 
                output_file=to_file)
149
 
            _mod_delta.report_changes(changes, reporter)
150
 
        else:
151
 
            delta = new.changes_from(old, want_unchanged=show_unchanged,
152
 
                                  specific_files=specific_files)
153
 
            delta.show(to_file,
154
 
                       show_ids=show_ids,
155
 
                       show_unchanged=show_unchanged,
156
 
                       short_status=short)
157
 
        short_status_letter = '? '
158
 
        if not short:
159
 
            short_status_letter = ''
160
 
        list_paths('unknown', new.unknowns(), specific_files, to_file,
161
 
                   short_status_letter)
162
 
        conflict_title = False
163
 
        # show the new conflicts only for now. XXX: get them from the delta.
164
 
        for conflict in new.conflicts():
165
 
            if not short and conflict_title is False:
166
 
                print >> to_file, "conflicts:"
167
 
                conflict_title = True
 
141
        old.lock_read()
 
142
        new.lock_read()
 
143
        try:
 
144
            _raise_if_nonexistent(specific_files, old, new)
168
145
            if short:
169
 
                prefix = 'C  '
 
146
                changes = new._iter_changes(old, show_unchanged, specific_files,
 
147
                    require_versioned=False, want_unversioned=True)
 
148
                reporter = _mod_delta.ChangeReporter(output_file=to_file,
 
149
                    unversioned_filter=new.is_ignored)
 
150
                _mod_delta.report_changes(changes, reporter)
170
151
            else:
171
 
                prefix = ' '
172
 
            print >> to_file, "%s %s" % (prefix, conflict)
173
 
        if new_is_working_tree and show_pending:
174
 
            show_pending_merges(new, to_file, short)
 
152
                delta = new.changes_from(old, want_unchanged=show_unchanged,
 
153
                                      specific_files=specific_files,
 
154
                                      want_unversioned=True)
 
155
                # filter out unknown files. We may want a tree method for
 
156
                # this
 
157
                delta.unversioned = [unversioned for unversioned in
 
158
                    delta.unversioned if not new.is_ignored(unversioned[0])]
 
159
                delta.show(to_file,
 
160
                           show_ids=show_ids,
 
161
                           show_unchanged=show_unchanged,
 
162
                           short_status=False)
 
163
            conflict_title = False
 
164
            # show the new conflicts only for now. XXX: get them from the delta.
 
165
            for conflict in new.conflicts():
 
166
                if not short and conflict_title is False:
 
167
                    print >> to_file, "conflicts:"
 
168
                    conflict_title = True
 
169
                if short:
 
170
                    prefix = 'C  '
 
171
                else:
 
172
                    prefix = ' '
 
173
                print >> to_file, "%s %s" % (prefix, conflict)
 
174
            if new_is_working_tree and show_pending:
 
175
                show_pending_merges(new, to_file, short)
 
176
        finally:
 
177
            old.unlock()
 
178
            new.unlock()
175
179
    finally:
176
180
        wt.unlock()
177
181
 
227
231
            else:
228
232
                prefix = ' '
229
233
            print >> to_file, prefix, merge
230
 
        
231
 
def list_paths(header, paths, specific_files, to_file, short_status_letter=''):
232
 
    done_header = False
233
 
    for path in paths:
234
 
        if specific_files and not is_inside_any(specific_files, path):
235
 
            continue
236
 
        if not short_status_letter and not done_header:
237
 
            print >>to_file, '%s:' % header
238
 
            done_header = True
239
 
        print >>to_file, '%s  %s' % (short_status_letter, path)