← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Martin Pool
  • Date: 2006-04-27 05:25:18 UTC
  • mto: This revision was merged to the branch mainline in revision 1688.
  • Revision ID: mbp@sourcefrog.net-20060427052518-07705dc5b3ce02cf
(HACKING) some notes on handling unicode & urls for transports

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
    """Helper for cmd_diff.
 
195
 
 
196
   tree 
 
197
        A WorkingTree
 
198
 
 
199
    specific_files
 
200
        The specific files to compare, or None
 
201
 
 
202
    external_diff_options
 
203
        If non-None, run an external diff, and pass it these options
 
204
 
 
205
    old_revision_spec
 
206
        If None, use basis tree as old revision, otherwise use the tree for
 
207
        the specified revision. 
 
208
 
 
209
    new_revision_spec
 
210
        If None, use working tree as new revision, otherwise use the tree for
 
211
        the specified revision.
 
212
    
 
213
    The more general form is show_diff_trees(), where the caller
 
214
    supplies any two trees.
 
215
    """
 
216
    import sys
 
217
    output = sys.stdout
 
218
    def spec_tree(spec):
 
219
        revision_id = spec.in_store(tree.branch).rev_id
 
220
        return tree.branch.repository.revision_tree(revision_id)
 
221
    if old_revision_spec is None:
 
222
        old_tree = tree.basis_tree()
 
223
    else:
 
224
        old_tree = spec_tree(old_revision_spec)
 
225
 
 
226
    if new_revision_spec is None:
 
227
        new_tree = tree
 
228
    else:
 
229
        new_tree = spec_tree(new_revision_spec)
 
230
 
 
231
    return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
 
232
                           external_diff_options)
173
233
 
174
234
 
175
235
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
182
242
    external_diff_options
183
243
        If set, use an external GNU diff and pass these options.
184
244
    """
185
 
 
186
 
    # TODO: Options to control putting on a prefix or suffix, perhaps as a format string
187
 
    old_label = ''
188
 
    new_label = ''
 
245
    old_tree.lock_read()
 
246
    try:
 
247
        new_tree.lock_read()
 
248
        try:
 
249
            return _show_diff_trees(old_tree, new_tree, to_file,
 
250
                                    specific_files, external_diff_options)
 
251
        finally:
 
252
            new_tree.unlock()
 
253
    finally:
 
254
        old_tree.unlock()
 
255
 
 
256
 
 
257
def _show_diff_trees(old_tree, new_tree, to_file,
 
258
                     specific_files, external_diff_options):
 
259
 
 
260
    # TODO: Options to control putting on a prefix or suffix, perhaps
 
261
    # as a format string?
 
262
    old_label = 'a/'
 
263
    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:
211
 
        print >>to_file, '=== removed %s %r' % (kind, path)
 
288
        has_changes = 1
 
289
        print >>to_file, '=== removed %s %r' % (kind, old_label + 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:
215
 
        print >>to_file, '=== added %s %r' % (kind, path)
 
293
        has_changes = 1
 
294
        print >>to_file, '=== added %s %r' % (kind, new_label + 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_label + old_path, new_label + 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
 
        print >>to_file, '=== modified %s %r%s' % (kind, path, prop_str)
 
310
        print >>to_file, '=== modified %s %r%s' % (kind, old_label + path,
 
311
                    prop_str)
230
312
        if text_modified:
231
313
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
232
314
                                        new_label, path, new_tree,
233
315
                                        True, kind, to_file, diff_file)
234
 
    
 
316
 
 
317
    return has_changes
 
318
 
 
319
 
 
320
def _raise_if_doubly_unversioned(specific_files, old_tree, new_tree):
 
321
    """Complain if paths are not versioned in either tree."""
 
322
    if not specific_files:
 
323
        return
 
324
    old_unversioned = old_tree.filter_unversioned_files(specific_files)
 
325
    new_unversioned = new_tree.filter_unversioned_files(specific_files)
 
326
    unversioned = old_unversioned.intersection(new_unversioned)
 
327
    if unversioned:
 
328
        raise errors.PathsNotVersionedError(sorted(unversioned))
 
329
    
 
330
 
 
331
def _raise_if_nonexistent(paths, old_tree, new_tree):
 
332
    """Complain if paths are not in either inventory or tree.
 
333
 
 
334
    It's OK with the files exist in either tree's inventory, or 
 
335
    if they exist in the tree but are not versioned.
 
336
    
 
337
    This can be used by operations such as bzr status that can accept
 
338
    unknown or ignored files.
 
339
    """
 
340
    mutter("check paths: %r", paths)
 
341
    if not paths:
 
342
        return
 
343
    s = old_tree.filter_unversioned_files(paths)
 
344
    s = new_tree.filter_unversioned_files(s)
 
345
    s = [path for path in s if not new_tree.has_filename(path)]
 
346
    if s:
 
347
        raise errors.PathsDoNotExist(sorted(s))
 
348
 
235
349
 
236
350
def get_prop_change(meta_modified):
237
351
    if meta_modified: