← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Aaron Bentley
  • Date: 2005-10-01 06:48:01 UTC
  • mto: (1185.12.13)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051001064801-7400c2ed0fe26080
Made iter_conflicts a WorkingTree method

Show diffs side-by-side

added added

removed removed

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