← 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
22
23
# invoke callbacks on an object.  That object can either accumulate a
23
24
# list, write them out directly, etc etc.
24
25
 
25
 
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file):
 
26
def internal_diff(old_label, oldlines, new_label, newlines, to_file):
26
27
    import difflib
27
28
    
28
29
    # FIXME: difflib is wrong if there is no trailing newline.
42
43
        return
43
44
 
44
45
    ud = difflib.unified_diff(oldlines, newlines,
45
 
                              fromfile=old_filename+'\t', 
46
 
                              tofile=new_filename+'\t')
 
46
                              fromfile=old_label, tofile=new_label)
47
47
 
48
48
    ud = list(ud)
49
49
    # work-around for difflib being too smart for its own good
63
63
    print >>to_file
64
64
 
65
65
 
66
 
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
 
66
 
 
67
 
 
68
def external_diff(old_label, oldlines, new_label, newlines, to_file,
67
69
                  diff_opts):
68
70
    """Display a diff by calling out to the external diff program."""
69
71
    import sys
98
100
        if not diff_opts:
99
101
            diff_opts = []
100
102
        diffcmd = ['diff',
101
 
                   '--label', old_filename+'\t',
 
103
                   '--label', old_label,
102
104
                   oldtmpf.name,
103
 
                   '--label', new_filename+'\t',
 
105
                   '--label', new_label,
104
106
                   newtmpf.name]
105
107
 
106
108
        # diff only allows one style to be specified; they don't override.
140
142
    finally:
141
143
        oldtmpf.close()                 # and delete
142
144
        newtmpf.close()
143
 
 
144
 
def show_diff(b, from_spec, specific_files, external_diff_options=None,
145
 
              revision2=None, output=None, b2=None):
 
145
    
 
146
 
 
147
 
 
148
def show_diff(b, revision, specific_files, external_diff_options=None,
 
149
              revision2=None, output=None):
146
150
    """Shortcut for showing the diff to the working tree.
147
151
 
148
152
    b
149
153
        Branch.
150
154
 
151
155
    revision
152
 
        None for 'basis tree', or otherwise the old revision to compare against.
 
156
        None for each, or otherwise the old revision to compare against.
153
157
    
154
158
    The more general form is show_diff_trees(), where the caller
155
159
    supplies any two trees.
158
162
        import sys
159
163
        output = sys.stdout
160
164
 
161
 
    if from_spec is None:
162
 
        if b2 is None:
163
 
            old_tree = b.basis_tree()
164
 
        else:
165
 
            old_tree = b.working_tree()
166
 
    else:
167
 
        old_tree = b.revision_tree(from_spec.in_history(b).rev_id)
168
 
 
169
 
    if revision2 is None:
170
 
        if b2 is None:
171
 
            new_tree = b.working_tree()
172
 
        else:
173
 
            new_tree = b2.working_tree()
174
 
    else:
175
 
        new_tree = b.revision_tree(revision2.in_history(b).rev_id)
176
 
 
177
 
    return show_diff_trees(old_tree, new_tree, output, specific_files,
178
 
                           external_diff_options)
 
165
    if revision == None:
 
166
        old_tree = b.basis_tree()
 
167
    else:
 
168
        old_tree = b.revision_tree(b.lookup_revision(revision))
 
169
 
 
170
    if revision2 == None:
 
171
        new_tree = b.working_tree()
 
172
    else:
 
173
        new_tree = b.revision_tree(b.lookup_revision(revision2))
 
174
 
 
175
    show_diff_trees(old_tree, new_tree, output, specific_files,
 
176
                    external_diff_options)
179
177
 
180
178
 
181
179
 
214
212
    delta = compare_trees(old_tree, new_tree, want_unchanged=False,
215
213
                          specific_files=specific_files)
216
214
 
217
 
    has_changes = 0
218
215
    for path, file_id, kind in delta.removed:
219
 
        has_changes = 1
220
216
        print >>to_file, '=== removed %s %r' % (kind, path)
221
 
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
222
 
                                         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
 
223
224
    for path, file_id, kind in delta.added:
224
 
        has_changes = 1
225
225
        print >>to_file, '=== added %s %r' % (kind, path)
226
 
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
227
 
                                         DEVNULL, None, None, to_file, 
228
 
                                         reverse=True)
229
 
    for (old_path, new_path, file_id, kind,
230
 
         text_modified, meta_modified) in delta.renamed:
231
 
        has_changes = 1
232
 
        prop_str = get_prop_change(meta_modified)
233
 
        print >>to_file, '=== renamed %s %r => %r%s' % (
234
 
                          kind, old_path, new_path, prop_str)
235
 
        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
236
 
                                    new_label, new_path, new_tree,
237
 
                                    text_modified, kind, to_file, diff_file)
238
 
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
239
 
        has_changes = 1
240
 
        prop_str = get_prop_change(meta_modified)
241
 
        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)
242
235
        if text_modified:
243
 
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
244
 
                                        new_label, path, new_tree,
245
 
                                        True, kind, to_file, diff_file)
246
 
    return has_changes
247
 
    
248
 
 
249
 
def get_prop_change(meta_modified):
250
 
    if meta_modified:
251
 
        return " (properties changed)"
252
 
    else:
253
 
        return  ""
254
 
 
255
 
 
256
 
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
257
 
                                new_label, new_path, new_tree, text_modified,
258
 
                                kind, to_file, diff_file):
259
 
    if text_modified:
260
 
        new_entry = new_tree.inventory[file_id]
261
 
        old_tree.inventory[file_id].diff(diff_file,
262
 
                                         old_label + old_path, old_tree,
263
 
                                         new_label + new_path, new_entry, 
264
 
                                         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