← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: John Arbash Meinel
  • Date: 2005-09-15 21:35:53 UTC
  • mfrom: (907.1.57)
  • mto: (1393.2.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050915213552-a6c83a5ef1e20897
(broken) Transport work is merged in. Tests do not pass yet.

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()
 
144
    
 
145
 
142
146
 
143
147
def show_diff(b, revision, specific_files, external_diff_options=None,
144
148
              revision2=None, output=None):
157
161
        import sys
158
162
        output = sys.stdout
159
163
 
160
 
    if revision is None:
 
164
    if revision == None:
161
165
        old_tree = b.basis_tree()
162
166
    else:
163
 
        old_tree = b.revision_tree(revision.in_history(b).rev_id)
 
167
        old_tree = b.revision_tree(b.lookup_revision(revision))
164
168
 
165
 
    if revision2 is None:
 
169
    if revision2 == None:
166
170
        new_tree = b.working_tree()
167
171
    else:
168
 
        new_tree = b.revision_tree(revision2.in_history(b).rev_id)
 
172
        new_tree = b.revision_tree(b.lookup_revision(revision2))
169
173
 
170
174
    show_diff_trees(old_tree, new_tree, output, specific_files,
171
175
                    external_diff_options)
209
213
 
210
214
    for path, file_id, kind in delta.removed:
211
215
        print >>to_file, '=== removed %s %r' % (kind, path)
212
 
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
213
 
                                         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
 
214
223
    for path, file_id, kind in delta.added:
215
224
        print >>to_file, '=== added %s %r' % (kind, path)
216
 
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
217
 
                                         DEVNULL, None, None, to_file, 
218
 
                                         reverse=True)
219
 
    for (old_path, new_path, file_id, kind,
220
 
         text_modified, meta_modified) in delta.renamed:
221
 
        prop_str = get_prop_change(meta_modified)
222
 
        print >>to_file, '=== renamed %s %r => %r%s' % (
223
 
                          kind, old_path, new_path, prop_str)
224
 
        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
225
 
                                    new_label, new_path, new_tree,
226
 
                                    text_modified, kind, to_file, diff_file)
227
 
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
228
 
        prop_str = get_prop_change(meta_modified)
229
 
        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)
230
234
        if text_modified:
231
 
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
232
 
                                        new_label, path, new_tree,
233
 
                                        True, kind, to_file, diff_file)
234
 
    
235
 
 
236
 
def get_prop_change(meta_modified):
237
 
    if meta_modified:
238
 
        return " (properties changed)"
239
 
    else:
240
 
        return  ""
241
 
 
242
 
 
243
 
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
244
 
                                new_label, new_path, new_tree, text_modified,
245
 
                                kind, to_file, diff_file):
246
 
    if text_modified:
247
 
        new_entry = new_tree.inventory[file_id]
248
 
        old_tree.inventory[file_id].diff(diff_file,
249
 
                                         old_label + old_path, old_tree,
250
 
                                         new_label + new_path, new_entry, 
251
 
                                         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