← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-19 08:36:50 UTC
  • mfrom: (1664.2.14 bzr.knitplanmerge)
  • Revision ID: pqm@pqm.ubuntu.com-20060419083650-f26d296f90d75d88
Implement plan_merge for knits

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
1
 
#! /usr/bin/env python
2
 
# -*- coding: UTF-8 -*-
 
1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd.
3
2
 
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
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
import bzrlib.errors as errors
 
20
from bzrlib.symbol_versioning import *
18
21
from bzrlib.trace import mutter
19
 
from bzrlib.errors import BzrError
20
 
from bzrlib.delta import compare_trees
21
22
 
22
23
# TODO: Rather than building a changeset object, we should probably
23
24
# invoke callbacks on an object.  That object can either accumulate a
24
25
# list, write them out directly, etc etc.
25
26
 
26
 
def internal_diff(old_label, oldlines, new_label, newlines, to_file):
 
27
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file):
27
28
    import difflib
28
29
    
29
30
    # FIXME: difflib is wrong if there is no trailing newline.
43
44
        return
44
45
 
45
46
    ud = difflib.unified_diff(oldlines, newlines,
46
 
                              fromfile=old_label, tofile=new_label)
 
47
                              fromfile=old_filename+'\t', 
 
48
                              tofile=new_filename+'\t')
47
49
 
 
50
    ud = list(ud)
48
51
    # work-around for difflib being too smart for its own good
49
52
    # if /dev/null is "1,0", patch won't recognize it as /dev/null
50
53
    if not oldlines:
51
 
        ud = list(ud)
52
54
        ud[2] = ud[2].replace('-1,0', '-0,0')
53
55
    elif not newlines:
54
 
        ud = list(ud)
55
56
        ud[2] = ud[2].replace('+1,0', '+0,0')
 
57
    # work around for difflib emitting random spaces after the label
 
58
    ud[0] = ud[0][:-2] + '\n'
 
59
    ud[1] = ud[1][:-2] + '\n'
56
60
 
57
61
    for line in ud:
58
62
        to_file.write(line)
61
65
    print >>to_file
62
66
 
63
67
 
64
 
 
65
 
 
66
 
def external_diff(old_label, oldlines, new_label, newlines, to_file,
 
68
def external_diff(old_filename, oldlines, new_filename, 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_label,
 
103
                   '--label', old_filename+'\t',
102
104
                   oldtmpf.name,
103
 
                   '--label', new_label,
 
105
                   '--label', new_filename+'\t',
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
 
 
145
 
 
146
 
def show_diff(b, revision, specific_files, external_diff_options=None,
147
 
              revision2=None):
 
145
 
 
146
 
 
147
@deprecated_function(zero_eight)
 
148
def show_diff(b, from_spec, specific_files, external_diff_options=None,
 
149
              revision2=None, output=None, b2=None):
148
150
    """Shortcut for showing the diff to the working tree.
149
151
 
 
152
    Please use show_diff_trees instead.
 
153
 
150
154
    b
151
155
        Branch.
152
156
 
153
157
    revision
154
 
        None for each, or otherwise the old revision to compare against.
 
158
        None for 'basis tree', or otherwise the old revision to compare against.
 
159
    
 
160
    The more general form is show_diff_trees(), where the caller
 
161
    supplies any two trees.
 
162
    """
 
163
    if output is None:
 
164
        import sys
 
165
        output = sys.stdout
 
166
 
 
167
    if from_spec is None:
 
168
        old_tree = b.bzrdir.open_workingtree()
 
169
        if b2 is None:
 
170
            old_tree = old_tree = old_tree.basis_tree()
 
171
    else:
 
172
        old_tree = b.repository.revision_tree(from_spec.in_history(b).rev_id)
 
173
 
 
174
    if revision2 is None:
 
175
        if b2 is None:
 
176
            new_tree = b.bzrdir.open_workingtree()
 
177
        else:
 
178
            new_tree = b2.bzrdir.open_workingtree()
 
179
    else:
 
180
        new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
 
181
 
 
182
    return show_diff_trees(old_tree, new_tree, output, specific_files,
 
183
                           external_diff_options)
 
184
 
 
185
 
 
186
def diff_cmd_helper(tree, specific_files, external_diff_options, 
 
187
                    old_revision_spec=None, new_revision_spec=None):
 
188
    """Helper for cmd_diff.
 
189
 
 
190
   tree 
 
191
        A WorkingTree
 
192
 
 
193
    specific_files
 
194
        The specific files to compare, or None
 
195
 
 
196
    external_diff_options
 
197
        If non-None, run an external diff, and pass it these options
 
198
 
 
199
    old_revision_spec
 
200
        If None, use basis tree as old revision, otherwise use the tree for
 
201
        the specified revision. 
 
202
 
 
203
    new_revision_spec
 
204
        If None, use working tree as new revision, otherwise use the tree for
 
205
        the specified revision.
155
206
    
156
207
    The more general form is show_diff_trees(), where the caller
157
208
    supplies any two trees.
158
209
    """
159
210
    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
 
 
 
211
    output = sys.stdout
 
212
    def spec_tree(spec):
 
213
        revision_id = spec.in_store(tree.branch).rev_id
 
214
        return tree.branch.repository.revision_tree(revision_id)
 
215
    if old_revision_spec is None:
 
216
        old_tree = tree.basis_tree()
 
217
    else:
 
218
        old_tree = spec_tree(old_revision_spec)
 
219
 
 
220
    if new_revision_spec is None:
 
221
        new_tree = tree
 
222
    else:
 
223
        new_tree = spec_tree(new_revision_spec)
 
224
 
 
225
    return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
 
226
                           external_diff_options)
174
227
 
175
228
 
176
229
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
183
236
    external_diff_options
184
237
        If set, use an external GNU diff and pass these options.
185
238
    """
186
 
 
187
 
    # TODO: Options to control putting on a prefix or suffix, perhaps as a format string
188
 
    old_label = ''
189
 
    new_label = ''
 
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
 
 
254
    # TODO: Options to control putting on a prefix or suffix, perhaps
 
255
    # as a format string?
 
256
    old_label = 'a/'
 
257
    new_label = 'b/'
190
258
 
191
259
    DEVNULL = '/dev/null'
192
260
    # Windows users, don't panic about this filename -- it is a
196
264
    # TODO: Generation of pseudo-diffs for added/deleted files could
197
265
    # be usefully made into a much faster special case.
198
266
 
 
267
    _raise_if_doubly_unversioned(specific_files, old_tree, new_tree)
 
268
 
199
269
    if external_diff_options:
200
270
        assert isinstance(external_diff_options, basestring)
201
271
        opts = external_diff_options.split()
204
274
    else:
205
275
        diff_file = internal_diff
206
276
    
207
 
 
208
277
    delta = compare_trees(old_tree, new_tree, want_unchanged=False,
209
278
                          specific_files=specific_files)
210
279
 
 
280
    has_changes = 0
211
281
    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
 
 
 
282
        has_changes = 1
 
283
        print >>to_file, '=== removed %s %r' % (kind, old_label + path)
 
284
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
 
285
                                         DEVNULL, None, None, to_file)
220
286
    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)
 
287
        has_changes = 1
 
288
        print >>to_file, '=== added %s %r' % (kind, new_label + path)
 
289
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
 
290
                                         DEVNULL, None, None, to_file, 
 
291
                                         reverse=True)
 
292
    for (old_path, new_path, file_id, kind,
 
293
         text_modified, meta_modified) in delta.renamed:
 
294
        has_changes = 1
 
295
        prop_str = get_prop_change(meta_modified)
 
296
        print >>to_file, '=== renamed %s %r => %r%s' % (
 
297
                    kind, old_label + old_path, new_label + new_path, prop_str)
 
298
        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
 
299
                                    new_label, new_path, new_tree,
 
300
                                    text_modified, kind, to_file, diff_file)
 
301
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
 
302
        has_changes = 1
 
303
        prop_str = get_prop_change(meta_modified)
 
304
        print >>to_file, '=== modified %s %r%s' % (kind, old_label + path,
 
305
                    prop_str)
231
306
        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
 
 
 
307
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
 
308
                                        new_label, path, new_tree,
 
309
                                        True, kind, to_file, diff_file)
 
310
 
 
311
    return has_changes
 
312
 
 
313
 
 
314
def _raise_if_doubly_unversioned(specific_files, old_tree, new_tree):
 
315
    """Complain if paths are not versioned in either tree."""
 
316
    if not specific_files:
 
317
        return
 
318
    old_unversioned = old_tree.filter_unversioned_files(specific_files)
 
319
    new_unversioned = new_tree.filter_unversioned_files(specific_files)
 
320
    unversioned = old_unversioned.intersection(new_unversioned)
 
321
    if unversioned:
 
322
        raise errors.PathsNotVersionedError(sorted(unversioned))
 
323
    
 
324
 
 
325
def get_prop_change(meta_modified):
 
326
    if meta_modified:
 
327
        return " (properties changed)"
 
328
    else:
 
329
        return  ""
 
330
 
 
331
 
 
332
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
 
333
                                new_label, new_path, new_tree, text_modified,
 
334
                                kind, to_file, diff_file):
 
335
    if text_modified:
 
336
        new_entry = new_tree.inventory[file_id]
 
337
        old_tree.inventory[file_id].diff(diff_file,
 
338
                                         old_label + old_path, old_tree,
 
339
                                         new_label + new_path, new_entry, 
 
340
                                         new_tree, to_file)