← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

(mbp) merge bzr.dev to 0.8, prepare for release

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
1
 
# -*- coding: UTF-8 -*-
 
1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd.
2
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
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 *
 
21
from bzrlib.textfile import check_text_lines
17
22
from bzrlib.trace import mutter
18
 
from bzrlib.errors import BzrError
19
 
from bzrlib.delta import compare_trees
20
23
 
21
24
# TODO: Rather than building a changeset object, we should probably
22
25
# invoke callbacks on an object.  That object can either accumulate a
23
26
# list, write them out directly, etc etc.
24
27
 
25
 
def internal_diff(old_label, oldlines, new_label, newlines, to_file):
 
28
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
 
29
                  allow_binary=False):
26
30
    import difflib
27
31
    
28
32
    # FIXME: difflib is wrong if there is no trailing newline.
40
44
    # both sequences are empty.
41
45
    if not oldlines and not newlines:
42
46
        return
 
47
    
 
48
    if allow_binary is False:
 
49
        check_text_lines(oldlines)
 
50
        check_text_lines(newlines)
43
51
 
44
52
    ud = difflib.unified_diff(oldlines, newlines,
45
 
                              fromfile=old_label, tofile=new_label)
 
53
                              fromfile=old_filename+'\t', 
 
54
                              tofile=new_filename+'\t')
46
55
 
47
56
    ud = list(ud)
48
57
    # work-around for difflib being too smart for its own good
62
71
    print >>to_file
63
72
 
64
73
 
65
 
def external_diff(old_label, oldlines, new_label, newlines, to_file,
 
74
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
66
75
                  diff_opts):
67
76
    """Display a diff by calling out to the external diff program."""
68
77
    import sys
97
106
        if not diff_opts:
98
107
            diff_opts = []
99
108
        diffcmd = ['diff',
100
 
                   '--label', old_label,
 
109
                   '--label', old_filename+'\t',
101
110
                   oldtmpf.name,
102
 
                   '--label', new_label,
 
111
                   '--label', new_filename+'\t',
103
112
                   newtmpf.name]
104
113
 
105
114
        # diff only allows one style to be specified; they don't override.
140
149
        oldtmpf.close()                 # and delete
141
150
        newtmpf.close()
142
151
 
 
152
 
 
153
@deprecated_function(zero_eight)
143
154
def show_diff(b, from_spec, specific_files, external_diff_options=None,
144
 
              revision2=None, output=None):
 
155
              revision2=None, output=None, b2=None):
145
156
    """Shortcut for showing the diff to the working tree.
146
157
 
 
158
    Please use show_diff_trees instead.
 
159
 
147
160
    b
148
161
        Branch.
149
162
 
158
171
        output = sys.stdout
159
172
 
160
173
    if from_spec is None:
161
 
        old_tree = b.basis_tree()
 
174
        old_tree = b.bzrdir.open_workingtree()
 
175
        if b2 is None:
 
176
            old_tree = old_tree = old_tree.basis_tree()
162
177
    else:
163
 
        old_tree = b.revision_tree(from_spec.in_history(b).rev_id)
 
178
        old_tree = b.repository.revision_tree(from_spec.in_history(b).rev_id)
164
179
 
165
180
    if revision2 is None:
166
 
        new_tree = b.working_tree()
167
 
    else:
168
 
        new_tree = b.revision_tree(revision2.in_history(b).rev_id)
169
 
 
170
 
    show_diff_trees(old_tree, new_tree, output, specific_files,
171
 
                    external_diff_options)
172
 
 
 
181
        if b2 is None:
 
182
            new_tree = b.bzrdir.open_workingtree()
 
183
        else:
 
184
            new_tree = b2.bzrdir.open_workingtree()
 
185
    else:
 
186
        new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
 
187
 
 
188
    return show_diff_trees(old_tree, new_tree, output, specific_files,
 
189
                           external_diff_options)
 
190
 
 
191
 
 
192
def diff_cmd_helper(tree, specific_files, external_diff_options, 
 
193
                    old_revision_spec=None, new_revision_spec=None,
 
194
                    old_label='a/', new_label='b/'):
 
195
    """Helper for cmd_diff.
 
196
 
 
197
   tree 
 
198
        A WorkingTree
 
199
 
 
200
    specific_files
 
201
        The specific files to compare, or None
 
202
 
 
203
    external_diff_options
 
204
        If non-None, run an external diff, and pass it these options
 
205
 
 
206
    old_revision_spec
 
207
        If None, use basis tree as old revision, otherwise use the tree for
 
208
        the specified revision. 
 
209
 
 
210
    new_revision_spec
 
211
        If None, use working tree as new revision, otherwise use the tree for
 
212
        the specified revision.
 
213
    
 
214
    The more general form is show_diff_trees(), where the caller
 
215
    supplies any two trees.
 
216
    """
 
217
    import sys
 
218
    output = sys.stdout
 
219
    def spec_tree(spec):
 
220
        revision_id = spec.in_store(tree.branch).rev_id
 
221
        return tree.branch.repository.revision_tree(revision_id)
 
222
    if old_revision_spec is None:
 
223
        old_tree = tree.basis_tree()
 
224
    else:
 
225
        old_tree = spec_tree(old_revision_spec)
 
226
 
 
227
    if new_revision_spec is None:
 
228
        new_tree = tree
 
229
    else:
 
230
        new_tree = spec_tree(new_revision_spec)
 
231
 
 
232
    return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
 
233
                           external_diff_options,
 
234
                           old_label=old_label, new_label=new_label)
173
235
 
174
236
 
175
237
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
176
 
                    external_diff_options=None):
 
238
                    external_diff_options=None,
 
239
                    old_label='a/', new_label='b/'):
177
240
    """Show in text form the changes from one tree to another.
178
241
 
179
242
    to_files
182
245
    external_diff_options
183
246
        If set, use an external GNU diff and pass these options.
184
247
    """
185
 
 
186
 
    # TODO: Options to control putting on a prefix or suffix, perhaps as a format string
187
 
    old_label = ''
188
 
    new_label = ''
 
248
    old_tree.lock_read()
 
249
    try:
 
250
        new_tree.lock_read()
 
251
        try:
 
252
            return _show_diff_trees(old_tree, new_tree, to_file,
 
253
                                    specific_files, external_diff_options,
 
254
                                    old_label=old_label, new_label=new_label)
 
255
        finally:
 
256
            new_tree.unlock()
 
257
    finally:
 
258
        old_tree.unlock()
 
259
 
 
260
 
 
261
def _show_diff_trees(old_tree, new_tree, to_file,
 
262
                     specific_files, external_diff_options, 
 
263
                     old_label='a/', new_label='b/' ):
189
264
 
190
265
    DEVNULL = '/dev/null'
191
266
    # Windows users, don't panic about this filename -- it is a
195
270
    # TODO: Generation of pseudo-diffs for added/deleted files could
196
271
    # be usefully made into a much faster special case.
197
272
 
 
273
    _raise_if_doubly_unversioned(specific_files, old_tree, new_tree)
 
274
 
198
275
    if external_diff_options:
199
276
        assert isinstance(external_diff_options, basestring)
200
277
        opts = external_diff_options.split()
203
280
    else:
204
281
        diff_file = internal_diff
205
282
    
206
 
 
207
283
    delta = compare_trees(old_tree, new_tree, want_unchanged=False,
208
284
                          specific_files=specific_files)
209
285
 
 
286
    has_changes = 0
210
287
    for path, file_id, kind in delta.removed:
 
288
        has_changes = 1
211
289
        print >>to_file, '=== removed %s %r' % (kind, path)
212
290
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
213
291
                                         DEVNULL, None, None, to_file)
214
292
    for path, file_id, kind in delta.added:
 
293
        has_changes = 1
215
294
        print >>to_file, '=== added %s %r' % (kind, path)
216
295
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
217
296
                                         DEVNULL, None, None, to_file, 
218
297
                                         reverse=True)
219
298
    for (old_path, new_path, file_id, kind,
220
299
         text_modified, meta_modified) in delta.renamed:
 
300
        has_changes = 1
221
301
        prop_str = get_prop_change(meta_modified)
222
302
        print >>to_file, '=== renamed %s %r => %r%s' % (
223
 
                          kind, old_path, new_path, prop_str)
 
303
                    kind, old_path, new_path, prop_str)
224
304
        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
225
305
                                    new_label, new_path, new_tree,
226
306
                                    text_modified, kind, to_file, diff_file)
227
307
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
 
308
        has_changes = 1
228
309
        prop_str = get_prop_change(meta_modified)
229
310
        print >>to_file, '=== modified %s %r%s' % (kind, path, prop_str)
230
311
        if text_modified:
231
312
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
232
313
                                        new_label, path, new_tree,
233
314
                                        True, kind, to_file, diff_file)
234
 
    
 
315
 
 
316
    return has_changes
 
317
 
 
318
 
 
319
def _raise_if_doubly_unversioned(specific_files, old_tree, new_tree):
 
320
    """Complain if paths are not versioned in either tree."""
 
321
    if not specific_files:
 
322
        return
 
323
    old_unversioned = old_tree.filter_unversioned_files(specific_files)
 
324
    new_unversioned = new_tree.filter_unversioned_files(specific_files)
 
325
    unversioned = old_unversioned.intersection(new_unversioned)
 
326
    if unversioned:
 
327
        raise errors.PathsNotVersionedError(sorted(unversioned))
 
328
    
 
329
 
 
330
def _raise_if_nonexistent(paths, old_tree, new_tree):
 
331
    """Complain if paths are not in either inventory or tree.
 
332
 
 
333
    It's OK with the files exist in either tree's inventory, or 
 
334
    if they exist in the tree but are not versioned.
 
335
    
 
336
    This can be used by operations such as bzr status that can accept
 
337
    unknown or ignored files.
 
338
    """
 
339
    mutter("check paths: %r", paths)
 
340
    if not paths:
 
341
        return
 
342
    s = old_tree.filter_unversioned_files(paths)
 
343
    s = new_tree.filter_unversioned_files(s)
 
344
    s = [path for path in s if not new_tree.has_filename(path)]
 
345
    if s:
 
346
        raise errors.PathsDoNotExist(sorted(s))
 
347
 
235
348
 
236
349
def get_prop_change(meta_modified):
237
350
    if meta_modified: