← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

and the tutorial patch came back, the very next day

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
 
1
#! /usr/bin/env python
1
2
# -*- coding: UTF-8 -*-
2
3
 
3
4
# This program is free software; you can redistribute it and/or modify
62
63
    print >>to_file
63
64
 
64
65
 
 
66
 
 
67
 
65
68
def external_diff(old_label, oldlines, new_label, newlines, to_file,
66
69
                  diff_opts):
67
70
    """Display a diff by calling out to the external diff program."""
139
142
    finally:
140
143
        oldtmpf.close()                 # and delete
141
144
        newtmpf.close()
142
 
 
143
 
def show_diff(b, from_spec, specific_files, external_diff_options=None,
 
145
    
 
146
 
 
147
 
 
148
def show_diff(b, revision, specific_files, external_diff_options=None,
144
149
              revision2=None, output=None):
145
150
    """Shortcut for showing the diff to the working tree.
146
151
 
148
153
        Branch.
149
154
 
150
155
    revision
151
 
        None for 'basis tree', or otherwise the old revision to compare against.
 
156
        None for each, or otherwise the old revision to compare against.
152
157
    
153
158
    The more general form is show_diff_trees(), where the caller
154
159
    supplies any two trees.
157
162
        import sys
158
163
        output = sys.stdout
159
164
 
160
 
    if from_spec is None:
 
165
    if revision == None:
161
166
        old_tree = b.basis_tree()
162
167
    else:
163
 
        old_tree = b.revision_tree(from_spec.in_history(b).rev_id)
 
168
        old_tree = b.revision_tree(b.lookup_revision(revision))
164
169
 
165
 
    if revision2 is None:
 
170
    if revision2 == None:
166
171
        new_tree = b.working_tree()
167
172
    else:
168
 
        new_tree = b.revision_tree(revision2.in_history(b).rev_id)
 
173
        new_tree = b.revision_tree(b.lookup_revision(revision2))
169
174
 
170
 
    return show_diff_trees(old_tree, new_tree, output, specific_files,
171
 
                           external_diff_options)
 
175
    show_diff_trees(old_tree, new_tree, output, specific_files,
 
176
                    external_diff_options)
172
177
 
173
178
 
174
179
 
207
212
    delta = compare_trees(old_tree, new_tree, want_unchanged=False,
208
213
                          specific_files=specific_files)
209
214
 
210
 
    has_changes = 0
211
215
    for path, file_id, kind in delta.removed:
212
 
        has_changes = 1
213
216
        print >>to_file, '=== removed %s %r' % (kind, path)
214
 
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
215
 
                                         DEVNULL, None, None, to_file)
 
217
        if kind == 'file':
 
218
            diff_file(old_label + path,
 
219
                      old_tree.get_file(file_id).readlines(),
 
220
                      DEVNULL, 
 
221
                      [],
 
222
                      to_file)
 
223
 
216
224
    for path, file_id, kind in delta.added:
217
 
        has_changes = 1
218
225
        print >>to_file, '=== added %s %r' % (kind, path)
219
 
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
220
 
                                         DEVNULL, None, None, to_file, 
221
 
                                         reverse=True)
222
 
    for (old_path, new_path, file_id, kind,
223
 
         text_modified, meta_modified) in delta.renamed:
224
 
        has_changes = 1
225
 
        prop_str = get_prop_change(meta_modified)
226
 
        print >>to_file, '=== renamed %s %r => %r%s' % (
227
 
                          kind, old_path, new_path, prop_str)
228
 
        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
229
 
                                    new_label, new_path, new_tree,
230
 
                                    text_modified, kind, to_file, diff_file)
231
 
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
232
 
        has_changes = 1
233
 
        prop_str = get_prop_change(meta_modified)
234
 
        print >>to_file, '=== modified %s %r%s' % (kind, path, prop_str)
 
226
        if kind == 'file':
 
227
            diff_file(DEVNULL,
 
228
                      [],
 
229
                      new_label + path,
 
230
                      new_tree.get_file(file_id).readlines(),
 
231
                      to_file)
 
232
 
 
233
    for old_path, new_path, file_id, kind, text_modified in delta.renamed:
 
234
        print >>to_file, '=== renamed %s %r => %r' % (kind, old_path, new_path)
235
235
        if text_modified:
236
 
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
237
 
                                        new_label, path, new_tree,
238
 
                                        True, kind, to_file, diff_file)
239
 
    return has_changes
240
 
    
241
 
 
242
 
def get_prop_change(meta_modified):
243
 
    if meta_modified:
244
 
        return " (properties changed)"
245
 
    else:
246
 
        return  ""
247
 
 
248
 
 
249
 
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
250
 
                                new_label, new_path, new_tree, text_modified,
251
 
                                kind, to_file, diff_file):
252
 
    if text_modified:
253
 
        new_entry = new_tree.inventory[file_id]
254
 
        old_tree.inventory[file_id].diff(diff_file,
255
 
                                         old_label + old_path, old_tree,
256
 
                                         new_label + new_path, new_entry, 
257
 
                                         new_tree, to_file)
 
236
            diff_file(old_label + old_path,
 
237
                      old_tree.get_file(file_id).readlines(),
 
238
                      new_label + new_path,
 
239
                      new_tree.get_file(file_id).readlines(),
 
240
                      to_file)
 
241
 
 
242
    for path, file_id, kind in delta.modified:
 
243
        print >>to_file, '=== modified %s %r' % (kind, path)
 
244
        if kind == 'file':
 
245
            diff_file(old_label + path,
 
246
                      old_tree.get_file(file_id).readlines(),
 
247
                      new_label + path,
 
248
                      new_tree.get_file(file_id).readlines(),
 
249
                      to_file)
 
250
 
 
251
 
 
252
 
 
253
 
 
254