← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

[merge] robert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
167
167
    else:
168
168
        new_tree = b.revision_tree(revision2.in_history(b).rev_id)
169
169
 
170
 
    show_diff_trees(old_tree, new_tree, output, specific_files,
171
 
                    external_diff_options)
 
170
    return show_diff_trees(old_tree, new_tree, output, specific_files,
 
171
                           external_diff_options)
172
172
 
173
173
 
174
174
 
207
207
    delta = compare_trees(old_tree, new_tree, want_unchanged=False,
208
208
                          specific_files=specific_files)
209
209
 
 
210
    has_changes = 0
210
211
    for path, file_id, kind in delta.removed:
 
212
        has_changes = 1
211
213
        print >>to_file, '=== removed %s %r' % (kind, path)
212
214
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
213
215
                                         DEVNULL, None, None, to_file)
214
216
    for path, file_id, kind in delta.added:
 
217
        has_changes = 1
215
218
        print >>to_file, '=== added %s %r' % (kind, path)
216
219
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
217
220
                                         DEVNULL, None, None, to_file, 
218
221
                                         reverse=True)
219
222
    for (old_path, new_path, file_id, kind,
220
223
         text_modified, meta_modified) in delta.renamed:
 
224
        has_changes = 1
221
225
        prop_str = get_prop_change(meta_modified)
222
226
        print >>to_file, '=== renamed %s %r => %r%s' % (
223
227
                          kind, old_path, new_path, prop_str)
225
229
                                    new_label, new_path, new_tree,
226
230
                                    text_modified, kind, to_file, diff_file)
227
231
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
 
232
        has_changes = 1
228
233
        prop_str = get_prop_change(meta_modified)
229
234
        print >>to_file, '=== modified %s %r%s' % (kind, path, prop_str)
230
235
        if text_modified:
231
236
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
232
237
                                        new_label, path, new_tree,
233
238
                                        True, kind, to_file, diff_file)
 
239
    return has_changes
234
240
    
235
241
 
236
242
def get_prop_change(meta_modified):