/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Aaron Bentley
  • Date: 2006-04-16 17:49:14 UTC
  • mto: This revision was merged to the branch mainline in revision 1673.
  • Revision ID: aaron.bentley@utoronto.ca-20060416174914-99d5dec4eafbb923
Whitespace fixes

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 *
 
20
from bzrlib.textfile import check_text_lines
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.
41
42
    # both sequences are empty.
42
43
    if not oldlines and not newlines:
43
44
        return
 
45
    
 
46
    check_text_lines(oldlines)
 
47
    check_text_lines(newlines)
44
48
 
45
49
    ud = difflib.unified_diff(oldlines, newlines,
46
 
                              fromfile=old_label, tofile=new_label)
 
50
                              fromfile=old_filename+'\t', 
 
51
                              tofile=new_filename+'\t')
47
52
 
 
53
    ud = list(ud)
48
54
    # work-around for difflib being too smart for its own good
49
55
    # if /dev/null is "1,0", patch won't recognize it as /dev/null
50
56
    if not oldlines:
51
 
        ud = list(ud)
52
57
        ud[2] = ud[2].replace('-1,0', '-0,0')
53
58
    elif not newlines:
54
 
        ud = list(ud)
55
59
        ud[2] = ud[2].replace('+1,0', '+0,0')
 
60
    # work around for difflib emitting random spaces after the label
 
61
    ud[0] = ud[0][:-2] + '\n'
 
62
    ud[1] = ud[1][:-2] + '\n'
56
63
 
57
64
    for line in ud:
58
65
        to_file.write(line)
61
68
    print >>to_file
62
69
 
63
70
 
64
 
 
65
 
 
66
 
def external_diff(old_label, oldlines, new_label, newlines, to_file,
 
71
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
67
72
                  diff_opts):
68
73
    """Display a diff by calling out to the external diff program."""
69
74
    import sys
98
103
        if not diff_opts:
99
104
            diff_opts = []
100
105
        diffcmd = ['diff',
101
 
                   '--label', old_label,
 
106
                   '--label', old_filename+'\t',
102
107
                   oldtmpf.name,
103
 
                   '--label', new_label,
 
108
                   '--label', new_filename+'\t',
104
109
                   newtmpf.name]
105
110
 
106
111
        # diff only allows one style to be specified; they don't override.
140
145
    finally:
141
146
        oldtmpf.close()                 # and delete
142
147
        newtmpf.close()
143
 
    
144
 
 
145
 
 
146
 
def show_diff(b, revision, specific_files, external_diff_options=None):
 
148
 
 
149
 
 
150
@deprecated_function(zero_eight)
 
151
def show_diff(b, from_spec, specific_files, external_diff_options=None,
 
152
              revision2=None, output=None, b2=None):
147
153
    """Shortcut for showing the diff to the working tree.
148
154
 
 
155
    Please use show_diff_trees instead.
 
156
 
149
157
    b
150
158
        Branch.
151
159
 
152
160
    revision
153
 
        None for each, or otherwise the old revision to compare against.
 
161
        None for 'basis tree', or otherwise the old revision to compare against.
 
162
    
 
163
    The more general form is show_diff_trees(), where the caller
 
164
    supplies any two trees.
 
165
    """
 
166
    if output is None:
 
167
        import sys
 
168
        output = sys.stdout
 
169
 
 
170
    if from_spec is None:
 
171
        old_tree = b.bzrdir.open_workingtree()
 
172
        if b2 is None:
 
173
            old_tree = old_tree = old_tree.basis_tree()
 
174
    else:
 
175
        old_tree = b.repository.revision_tree(from_spec.in_history(b).rev_id)
 
176
 
 
177
    if revision2 is None:
 
178
        if b2 is None:
 
179
            new_tree = b.bzrdir.open_workingtree()
 
180
        else:
 
181
            new_tree = b2.bzrdir.open_workingtree()
 
182
    else:
 
183
        new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
 
184
 
 
185
    return show_diff_trees(old_tree, new_tree, output, specific_files,
 
186
                           external_diff_options)
 
187
 
 
188
 
 
189
def diff_cmd_helper(tree, specific_files, external_diff_options, 
 
190
                    old_revision_spec=None, new_revision_spec=None):
 
191
    """Helper for cmd_diff.
 
192
 
 
193
   tree 
 
194
        A WorkingTree
 
195
 
 
196
    specific_files
 
197
        The specific files to compare, or None
 
198
 
 
199
    external_diff_options
 
200
        If non-None, run an external diff, and pass it these options
 
201
 
 
202
    old_revision_spec
 
203
        If None, use basis tree as old revision, otherwise use the tree for
 
204
        the specified revision. 
 
205
 
 
206
    new_revision_spec
 
207
        If None, use working tree as new revision, otherwise use the tree for
 
208
        the specified revision.
154
209
    
155
210
    The more general form is show_diff_trees(), where the caller
156
211
    supplies any two trees.
157
212
    """
158
213
    import sys
159
 
 
160
 
    if revision == None:
161
 
        old_tree = b.basis_tree()
162
 
    else:
163
 
        old_tree = b.revision_tree(b.lookup_revision(revision))
164
 
        
165
 
    new_tree = b.working_tree()
166
 
 
167
 
    show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
168
 
                    external_diff_options)
169
 
 
 
214
    output = sys.stdout
 
215
    def spec_tree(spec):
 
216
        revision_id = spec.in_store(tree.branch).rev_id
 
217
        return tree.branch.repository.revision_tree(revision_id)
 
218
    if old_revision_spec is None:
 
219
        old_tree = tree.basis_tree()
 
220
    else:
 
221
        old_tree = spec_tree(old_revision_spec)
 
222
 
 
223
    if new_revision_spec is None:
 
224
        new_tree = tree
 
225
    else:
 
226
        new_tree = spec_tree(new_revision_spec)
 
227
 
 
228
    return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
 
229
                           external_diff_options)
170
230
 
171
231
 
172
232
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
180
240
        If set, use an external GNU diff and pass these options.
181
241
    """
182
242
 
183
 
    # TODO: Options to control putting on a prefix or suffix, perhaps as a format string
184
 
    old_label = ''
185
 
    new_label = ''
 
243
    old_tree.lock_read()
 
244
    try:
 
245
        new_tree.lock_read()
 
246
        try:
 
247
            return _show_diff_trees(old_tree, new_tree, to_file,
 
248
                                    specific_files, external_diff_options)
 
249
        finally:
 
250
            new_tree.unlock()
 
251
    finally:
 
252
        old_tree.unlock()
 
253
 
 
254
 
 
255
def _show_diff_trees(old_tree, new_tree, to_file,
 
256
                     specific_files, external_diff_options):
 
257
 
 
258
    # TODO: Options to control putting on a prefix or suffix, perhaps
 
259
    # as a format string?
 
260
    old_label = 'a/'
 
261
    new_label = 'b/'
186
262
 
187
263
    DEVNULL = '/dev/null'
188
264
    # Windows users, don't panic about this filename -- it is a
204
280
    delta = compare_trees(old_tree, new_tree, want_unchanged=False,
205
281
                          specific_files=specific_files)
206
282
 
 
283
    has_changes = 0
207
284
    for path, file_id, kind in delta.removed:
208
 
        print >>to_file, '*** removed %s %r' % (kind, path)
209
 
        if kind == 'file':
210
 
            diff_file(old_label + path,
211
 
                      old_tree.get_file(file_id).readlines(),
212
 
                      DEVNULL, 
213
 
                      [],
214
 
                      to_file)
215
 
 
 
285
        has_changes = 1
 
286
        print >>to_file, '=== removed %s %r' % (kind, old_label + path)
 
287
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
 
288
                                         DEVNULL, None, None, to_file)
216
289
    for path, file_id, kind in delta.added:
217
 
        print >>to_file, '*** added %s %r' % (kind, path)
218
 
        if kind == 'file':
219
 
            diff_file(DEVNULL,
220
 
                      [],
221
 
                      new_label + path,
222
 
                      new_tree.get_file(file_id).readlines(),
223
 
                      to_file)
224
 
 
225
 
    for old_path, new_path, file_id, kind, text_modified in delta.renamed:
226
 
        print >>to_file, '*** renamed %s %r => %r' % (kind, old_path, new_path)
 
290
        has_changes = 1
 
291
        print >>to_file, '=== added %s %r' % (kind, new_label + path)
 
292
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
 
293
                                         DEVNULL, None, None, to_file, 
 
294
                                         reverse=True)
 
295
    for (old_path, new_path, file_id, kind,
 
296
         text_modified, meta_modified) in delta.renamed:
 
297
        has_changes = 1
 
298
        prop_str = get_prop_change(meta_modified)
 
299
        print >>to_file, '=== renamed %s %r => %r%s' % (
 
300
                    kind, old_label + old_path, new_label + new_path, prop_str)
 
301
        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
 
302
                                    new_label, new_path, new_tree,
 
303
                                    text_modified, kind, to_file, diff_file)
 
304
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
 
305
        has_changes = 1
 
306
        prop_str = get_prop_change(meta_modified)
 
307
        print >>to_file, '=== modified %s %r%s' % (kind, old_label + path,
 
308
                    prop_str)
227
309
        if text_modified:
228
 
            diff_file(old_label + old_path,
229
 
                      old_tree.get_file(file_id).readlines(),
230
 
                      new_label + new_path,
231
 
                      new_tree.get_file(file_id).readlines(),
232
 
                      to_file)
233
 
 
234
 
    for path, file_id, kind in delta.modified:
235
 
        print >>to_file, '*** modified %s %r' % (kind, path)
236
 
        if kind == 'file':
237
 
            diff_file(old_label + path,
238
 
                      old_tree.get_file(file_id).readlines(),
239
 
                      new_label + path,
240
 
                      new_tree.get_file(file_id).readlines(),
241
 
                      to_file)
242
 
 
243
 
 
244
 
 
245
 
 
246
 
 
 
310
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
 
311
                                        new_label, path, new_tree,
 
312
                                        True, kind, to_file, diff_file)
 
313
    return has_changes
 
314
    
 
315
 
 
316
def get_prop_change(meta_modified):
 
317
    if meta_modified:
 
318
        return " (properties changed)"
 
319
    else:
 
320
        return  ""
 
321
 
 
322
 
 
323
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
 
324
                                new_label, new_path, new_tree, text_modified,
 
325
                                kind, to_file, diff_file):
 
326
    if text_modified:
 
327
        new_entry = new_tree.inventory[file_id]
 
328
        old_tree.inventory[file_id].diff(diff_file,
 
329
                                         old_label + old_path, old_tree,
 
330
                                         new_label + new_path, new_entry, 
 
331
                                         new_tree, to_file)