/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: Robert Collins
  • Date: 2006-02-21 12:42:57 UTC
  • mto: (1563.1.5 integration)
  • mto: This revision was merged to the branch mainline in revision 1568.
  • Revision ID: robertc@robertcollins.net-20060221124257-8ee8f4b0b3b45ac3
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.

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
18
19
from bzrlib.trace import mutter
19
 
from bzrlib.errors import BzrError
20
 
from bzrlib.delta import compare_trees
21
20
 
22
21
# TODO: Rather than building a changeset object, we should probably
23
22
# invoke callbacks on an object.  That object can either accumulate a
24
23
# list, write them out directly, etc etc.
25
24
 
26
 
def internal_diff(old_label, oldlines, new_label, newlines, to_file):
 
25
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file):
27
26
    import difflib
28
27
    
29
28
    # FIXME: difflib is wrong if there is no trailing newline.
43
42
        return
44
43
 
45
44
    ud = difflib.unified_diff(oldlines, newlines,
46
 
                              fromfile=old_label, tofile=new_label)
 
45
                              fromfile=old_filename+'\t', 
 
46
                              tofile=new_filename+'\t')
47
47
 
 
48
    ud = list(ud)
48
49
    # work-around for difflib being too smart for its own good
49
50
    # if /dev/null is "1,0", patch won't recognize it as /dev/null
50
51
    if not oldlines:
51
 
        ud = list(ud)
52
52
        ud[2] = ud[2].replace('-1,0', '-0,0')
53
53
    elif not newlines:
54
 
        ud = list(ud)
55
54
        ud[2] = ud[2].replace('+1,0', '+0,0')
 
55
    # work around for difflib emitting random spaces after the label
 
56
    ud[0] = ud[0][:-2] + '\n'
 
57
    ud[1] = ud[1][:-2] + '\n'
56
58
 
57
59
    for line in ud:
58
60
        to_file.write(line)
61
63
    print >>to_file
62
64
 
63
65
 
64
 
 
65
 
 
66
 
def external_diff(old_label, oldlines, new_label, newlines, to_file,
 
66
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
67
67
                  diff_opts):
68
68
    """Display a diff by calling out to the external diff program."""
69
69
    import sys
98
98
        if not diff_opts:
99
99
            diff_opts = []
100
100
        diffcmd = ['diff',
101
 
                   '--label', old_label,
 
101
                   '--label', old_filename+'\t',
102
102
                   oldtmpf.name,
103
 
                   '--label', new_label,
 
103
                   '--label', new_filename+'\t',
104
104
                   newtmpf.name]
105
105
 
106
106
        # diff only allows one style to be specified; they don't override.
140
140
    finally:
141
141
        oldtmpf.close()                 # and delete
142
142
        newtmpf.close()
143
 
    
144
 
 
145
 
 
146
 
def show_diff(b, revision, specific_files, external_diff_options=None):
 
143
 
 
144
def show_diff(b, from_spec, specific_files, external_diff_options=None,
 
145
              revision2=None, output=None, b2=None):
147
146
    """Shortcut for showing the diff to the working tree.
148
147
 
149
148
    b
150
149
        Branch.
151
150
 
152
151
    revision
153
 
        None for each, or otherwise the old revision to compare against.
 
152
        None for 'basis tree', or otherwise the old revision to compare against.
154
153
    
155
154
    The more general form is show_diff_trees(), where the caller
156
155
    supplies any two trees.
157
156
    """
158
 
    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)
 
157
    if output is None:
 
158
        import sys
 
159
        output = sys.stdout
 
160
 
 
161
    if from_spec is None:
 
162
        old_tree = b.bzrdir.open_workingtree()
 
163
        if b2 is None:
 
164
            old_tree = old_tree = old_tree.basis_tree()
 
165
    else:
 
166
        old_tree = b.repository.revision_tree(from_spec.in_history(b).rev_id)
 
167
 
 
168
    if revision2 is None:
 
169
        if b2 is None:
 
170
            new_tree = b.bzrdir.open_workingtree()
 
171
        else:
 
172
            new_tree = b2.bzrdir.open_workingtree()
 
173
    else:
 
174
        new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
 
175
 
 
176
    return show_diff_trees(old_tree, new_tree, output, specific_files,
 
177
                           external_diff_options)
169
178
 
170
179
 
171
180
 
180
189
        If set, use an external GNU diff and pass these options.
181
190
    """
182
191
 
 
192
    old_tree.lock_read()
 
193
    try:
 
194
        new_tree.lock_read()
 
195
        try:
 
196
            return _show_diff_trees(old_tree, new_tree, to_file,
 
197
                                    specific_files, external_diff_options)
 
198
        finally:
 
199
            new_tree.unlock()
 
200
    finally:
 
201
        old_tree.unlock()
 
202
 
 
203
 
 
204
def _show_diff_trees(old_tree, new_tree, to_file,
 
205
                     specific_files, external_diff_options):
 
206
 
183
207
    # TODO: Options to control putting on a prefix or suffix, perhaps as a format string
184
208
    old_label = ''
185
209
    new_label = ''
204
228
    delta = compare_trees(old_tree, new_tree, want_unchanged=False,
205
229
                          specific_files=specific_files)
206
230
 
 
231
    has_changes = 0
207
232
    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
 
 
 
233
        has_changes = 1
 
234
        print >>to_file, '=== removed %s %r' % (kind, path)
 
235
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
 
236
                                         DEVNULL, None, None, to_file)
216
237
    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)
 
238
        has_changes = 1
 
239
        print >>to_file, '=== added %s %r' % (kind, path)
 
240
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
 
241
                                         DEVNULL, None, None, to_file, 
 
242
                                         reverse=True)
 
243
    for (old_path, new_path, file_id, kind,
 
244
         text_modified, meta_modified) in delta.renamed:
 
245
        has_changes = 1
 
246
        prop_str = get_prop_change(meta_modified)
 
247
        print >>to_file, '=== renamed %s %r => %r%s' % (
 
248
                          kind, old_path, new_path, prop_str)
 
249
        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
 
250
                                    new_label, new_path, new_tree,
 
251
                                    text_modified, kind, to_file, diff_file)
 
252
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
 
253
        has_changes = 1
 
254
        prop_str = get_prop_change(meta_modified)
 
255
        print >>to_file, '=== modified %s %r%s' % (kind, path, prop_str)
227
256
        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
 
 
 
257
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
 
258
                                        new_label, path, new_tree,
 
259
                                        True, kind, to_file, diff_file)
 
260
    return has_changes
 
261
    
 
262
 
 
263
def get_prop_change(meta_modified):
 
264
    if meta_modified:
 
265
        return " (properties changed)"
 
266
    else:
 
267
        return  ""
 
268
 
 
269
 
 
270
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
 
271
                                new_label, new_path, new_tree, text_modified,
 
272
                                kind, to_file, diff_file):
 
273
    if text_modified:
 
274
        new_entry = new_tree.inventory[file_id]
 
275
        old_tree.inventory[file_id].diff(diff_file,
 
276
                                         old_label + old_path, old_tree,
 
277
                                         new_label + new_path, new_entry, 
 
278
                                         new_tree, to_file)