← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Robert Collins
  • Date: 2006-03-02 03:12:34 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060302031234-cf6b75961f27c5df
InterVersionedFile implemented.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
1
 
#! /usr/bin/env python
2
1
# -*- coding: UTF-8 -*-
3
2
 
4
3
# This program is free software; you can redistribute it and/or modify
15
14
# along with this program; if not, write to the Free Software
16
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
16
 
 
17
from bzrlib.delta import compare_trees
 
18
from bzrlib.errors import BzrError
 
19
from bzrlib.symbol_versioning import *
18
20
from bzrlib.trace import mutter
19
 
from bzrlib.errors import BzrError
20
 
from bzrlib.delta import compare_trees
21
21
 
22
22
# TODO: Rather than building a changeset object, we should probably
23
23
# invoke callbacks on an object.  That object can either accumulate a
24
24
# list, write them out directly, etc etc.
25
25
 
26
 
def internal_diff(old_label, oldlines, new_label, newlines, to_file):
 
26
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file):
27
27
    import difflib
28
28
    
29
29
    # FIXME: difflib is wrong if there is no trailing newline.
43
43
        return
44
44
 
45
45
    ud = difflib.unified_diff(oldlines, newlines,
46
 
                              fromfile=old_label, tofile=new_label)
 
46
                              fromfile=old_filename+'\t', 
 
47
                              tofile=new_filename+'\t')
47
48
 
 
49
    ud = list(ud)
48
50
    # work-around for difflib being too smart for its own good
49
51
    # if /dev/null is "1,0", patch won't recognize it as /dev/null
50
52
    if not oldlines:
51
 
        ud = list(ud)
52
53
        ud[2] = ud[2].replace('-1,0', '-0,0')
53
54
    elif not newlines:
54
 
        ud = list(ud)
55
55
        ud[2] = ud[2].replace('+1,0', '+0,0')
 
56
    # work around for difflib emitting random spaces after the label
 
57
    ud[0] = ud[0][:-2] + '\n'
 
58
    ud[1] = ud[1][:-2] + '\n'
56
59
 
57
60
    for line in ud:
58
61
        to_file.write(line)
61
64
    print >>to_file
62
65
 
63
66
 
64
 
 
65
 
 
66
 
def external_diff(old_label, oldlines, new_label, newlines, to_file,
 
67
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
67
68
                  diff_opts):
68
69
    """Display a diff by calling out to the external diff program."""
69
70
    import sys
98
99
        if not diff_opts:
99
100
            diff_opts = []
100
101
        diffcmd = ['diff',
101
 
                   '--label', old_label,
 
102
                   '--label', old_filename+'\t',
102
103
                   oldtmpf.name,
103
 
                   '--label', new_label,
 
104
                   '--label', new_filename+'\t',
104
105
                   newtmpf.name]
105
106
 
106
107
        # diff only allows one style to be specified; they don't override.
140
141
    finally:
141
142
        oldtmpf.close()                 # and delete
142
143
        newtmpf.close()
143
 
    
144
 
 
145
 
 
146
 
def show_diff(b, revision, specific_files, external_diff_options=None,
147
 
              revision2=None):
 
144
 
 
145
 
 
146
@deprecated_function(zero_eight)
 
147
def show_diff(b, from_spec, specific_files, external_diff_options=None,
 
148
              revision2=None, output=None, b2=None):
148
149
    """Shortcut for showing the diff to the working tree.
149
150
 
 
151
    Please use show_diff_trees instead.
 
152
 
150
153
    b
151
154
        Branch.
152
155
 
153
156
    revision
154
 
        None for each, or otherwise the old revision to compare against.
 
157
        None for 'basis tree', or otherwise the old revision to compare against.
 
158
    
 
159
    The more general form is show_diff_trees(), where the caller
 
160
    supplies any two trees.
 
161
    """
 
162
    if output is None:
 
163
        import sys
 
164
        output = sys.stdout
 
165
 
 
166
    if from_spec is None:
 
167
        old_tree = b.bzrdir.open_workingtree()
 
168
        if b2 is None:
 
169
            old_tree = old_tree = old_tree.basis_tree()
 
170
    else:
 
171
        old_tree = b.repository.revision_tree(from_spec.in_history(b).rev_id)
 
172
 
 
173
    if revision2 is None:
 
174
        if b2 is None:
 
175
            new_tree = b.bzrdir.open_workingtree()
 
176
        else:
 
177
            new_tree = b2.bzrdir.open_workingtree()
 
178
    else:
 
179
        new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
 
180
 
 
181
    return show_diff_trees(old_tree, new_tree, output, specific_files,
 
182
                           external_diff_options)
 
183
 
 
184
 
 
185
def diff_cmd_helper(tree, specific_files, external_diff_options, 
 
186
                    old_revision_spec=None, new_revision_spec=None):
 
187
    """Helper for cmd_diff.
 
188
 
 
189
   tree 
 
190
        A WorkingTree
 
191
 
 
192
    specific_files
 
193
        The specific files to compare, or None
 
194
 
 
195
    external_diff_options
 
196
        If non-None, run an external diff, and pass it these options
 
197
 
 
198
    old_revision_spec
 
199
        If None, use basis tree as old revision, otherwise use the tree for
 
200
        the specified revision. 
 
201
 
 
202
    new_revision_spec
 
203
        If None, use working tree as new revision, otherwise use the tree for
 
204
        the specified revision.
155
205
    
156
206
    The more general form is show_diff_trees(), where the caller
157
207
    supplies any two trees.
158
208
    """
159
209
    import sys
160
 
 
161
 
    if revision == None:
162
 
        old_tree = b.basis_tree()
163
 
    else:
164
 
        old_tree = b.revision_tree(b.lookup_revision(revision))
165
 
 
166
 
    if revision2 == None:
167
 
        new_tree = b.working_tree()
168
 
    else:
169
 
        new_tree = b.revision_tree(b.lookup_revision(revision2))
170
 
 
171
 
    show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
172
 
                    external_diff_options)
173
 
 
 
210
    output = sys.stdout
 
211
    def spec_tree(spec):
 
212
        revision_id = spec.in_store(tree.branch).rev_id
 
213
        return tree.branch.repository.revision_tree(revision_id)
 
214
    if old_revision_spec is None:
 
215
        old_tree = tree.basis_tree()
 
216
    else:
 
217
        old_tree = spec_tree(old_revision_spec)
 
218
 
 
219
    if new_revision_spec is None:
 
220
        new_tree = tree
 
221
    else:
 
222
        new_tree = spec_tree(new_revision_spec)
 
223
 
 
224
    return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
 
225
                           external_diff_options)
174
226
 
175
227
 
176
228
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
184
236
        If set, use an external GNU diff and pass these options.
185
237
    """
186
238
 
 
239
    old_tree.lock_read()
 
240
    try:
 
241
        new_tree.lock_read()
 
242
        try:
 
243
            return _show_diff_trees(old_tree, new_tree, to_file,
 
244
                                    specific_files, external_diff_options)
 
245
        finally:
 
246
            new_tree.unlock()
 
247
    finally:
 
248
        old_tree.unlock()
 
249
 
 
250
 
 
251
def _show_diff_trees(old_tree, new_tree, to_file,
 
252
                     specific_files, external_diff_options):
 
253
 
187
254
    # TODO: Options to control putting on a prefix or suffix, perhaps as a format string
188
255
    old_label = ''
189
256
    new_label = ''
208
275
    delta = compare_trees(old_tree, new_tree, want_unchanged=False,
209
276
                          specific_files=specific_files)
210
277
 
 
278
    has_changes = 0
211
279
    for path, file_id, kind in delta.removed:
212
 
        print >>to_file, '*** removed %s %r' % (kind, path)
213
 
        if kind == 'file':
214
 
            diff_file(old_label + path,
215
 
                      old_tree.get_file(file_id).readlines(),
216
 
                      DEVNULL, 
217
 
                      [],
218
 
                      to_file)
219
 
 
 
280
        has_changes = 1
 
281
        print >>to_file, '=== removed %s %r' % (kind, path)
 
282
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
 
283
                                         DEVNULL, None, None, to_file)
220
284
    for path, file_id, kind in delta.added:
221
 
        print >>to_file, '*** added %s %r' % (kind, path)
222
 
        if kind == 'file':
223
 
            diff_file(DEVNULL,
224
 
                      [],
225
 
                      new_label + path,
226
 
                      new_tree.get_file(file_id).readlines(),
227
 
                      to_file)
228
 
 
229
 
    for old_path, new_path, file_id, kind, text_modified in delta.renamed:
230
 
        print >>to_file, '*** renamed %s %r => %r' % (kind, old_path, new_path)
 
285
        has_changes = 1
 
286
        print >>to_file, '=== added %s %r' % (kind, path)
 
287
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
 
288
                                         DEVNULL, None, None, to_file, 
 
289
                                         reverse=True)
 
290
    for (old_path, new_path, file_id, kind,
 
291
         text_modified, meta_modified) in delta.renamed:
 
292
        has_changes = 1
 
293
        prop_str = get_prop_change(meta_modified)
 
294
        print >>to_file, '=== renamed %s %r => %r%s' % (
 
295
                          kind, old_path, new_path, prop_str)
 
296
        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
 
297
                                    new_label, new_path, new_tree,
 
298
                                    text_modified, kind, to_file, diff_file)
 
299
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
 
300
        has_changes = 1
 
301
        prop_str = get_prop_change(meta_modified)
 
302
        print >>to_file, '=== modified %s %r%s' % (kind, path, prop_str)
231
303
        if text_modified:
232
 
            diff_file(old_label + old_path,
233
 
                      old_tree.get_file(file_id).readlines(),
234
 
                      new_label + new_path,
235
 
                      new_tree.get_file(file_id).readlines(),
236
 
                      to_file)
237
 
 
238
 
    for path, file_id, kind in delta.modified:
239
 
        print >>to_file, '*** modified %s %r' % (kind, path)
240
 
        if kind == 'file':
241
 
            diff_file(old_label + path,
242
 
                      old_tree.get_file(file_id).readlines(),
243
 
                      new_label + path,
244
 
                      new_tree.get_file(file_id).readlines(),
245
 
                      to_file)
246
 
 
247
 
 
248
 
 
249
 
 
250
 
 
 
304
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
 
305
                                        new_label, path, new_tree,
 
306
                                        True, kind, to_file, diff_file)
 
307
    return has_changes
 
308
    
 
309
 
 
310
def get_prop_change(meta_modified):
 
311
    if meta_modified:
 
312
        return " (properties changed)"
 
313
    else:
 
314
        return  ""
 
315
 
 
316
 
 
317
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
 
318
                                new_label, new_path, new_tree, text_modified,
 
319
                                kind, to_file, diff_file):
 
320
    if text_modified:
 
321
        new_entry = new_tree.inventory[file_id]
 
322
        old_tree.inventory[file_id].diff(diff_file,
 
323
                                         old_label + old_path, old_tree,
 
324
                                         new_label + new_path, new_entry, 
 
325
                                         new_tree, to_file)