← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

- merge various windows and other fixes from Ollie Rutherfurd
  
1179: changed diff help example to -r1..2 from deprecated -r1:2
1178: fixed \r\n -> \n conversion in branch._check_format
1177: disable urlgrabber on win32, since it converts / -> \
1176: changed assert path.startswith('./') -> '.'+os.sep in merge.py
1175: replaced os.spawnvp with subprocess.call in msgeditor.py
1174: os.name == 'windows' -> 'nt', check for %EDITOR% on win32
1173: fixed bzr mv filename newfilename, re-enabled test_mv_modes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
 
1
#! /usr/bin/env python
1
2
# -*- coding: UTF-8 -*-
2
3
 
3
4
# This program is free software; you can redistribute it and/or modify
44
45
    ud = difflib.unified_diff(oldlines, newlines,
45
46
                              fromfile=old_label, tofile=new_label)
46
47
 
47
 
    ud = list(ud)
48
48
    # work-around for difflib being too smart for its own good
49
49
    # if /dev/null is "1,0", patch won't recognize it as /dev/null
50
50
    if not oldlines:
 
51
        ud = list(ud)
51
52
        ud[2] = ud[2].replace('-1,0', '-0,0')
52
53
    elif not newlines:
 
54
        ud = list(ud)
53
55
        ud[2] = ud[2].replace('+1,0', '+0,0')
54
 
    # work around for difflib emitting random spaces after the label
55
 
    ud[0] = ud[0][:-2] + '\n'
56
 
    ud[1] = ud[1][:-2] + '\n'
57
56
 
58
57
    for line in ud:
59
58
        to_file.write(line)
62
61
    print >>to_file
63
62
 
64
63
 
 
64
 
 
65
 
65
66
def external_diff(old_label, oldlines, new_label, newlines, to_file,
66
67
                  diff_opts):
67
68
    """Display a diff by calling out to the external diff program."""
139
140
    finally:
140
141
        oldtmpf.close()                 # and delete
141
142
        newtmpf.close()
 
143
    
 
144
 
142
145
 
143
146
def show_diff(b, revision, specific_files, external_diff_options=None,
144
 
              revision2=None, output=None):
 
147
              revision2=None):
145
148
    """Shortcut for showing the diff to the working tree.
146
149
 
147
150
    b
153
156
    The more general form is show_diff_trees(), where the caller
154
157
    supplies any two trees.
155
158
    """
156
 
    if output is None:
157
 
        import sys
158
 
        output = sys.stdout
 
159
    import sys
159
160
 
160
 
    if revision is None:
 
161
    if revision == None:
161
162
        old_tree = b.basis_tree()
162
163
    else:
163
 
        old_tree = b.revision_tree(revision.in_history(b).rev_id)
 
164
        old_tree = b.revision_tree(b.lookup_revision(revision))
164
165
 
165
 
    if revision2 is None:
 
166
    if revision2 == None:
166
167
        new_tree = b.working_tree()
167
168
    else:
168
 
        new_tree = b.revision_tree(revision2.in_history(b).rev_id)
 
169
        new_tree = b.revision_tree(b.lookup_revision(revision2))
169
170
 
170
 
    show_diff_trees(old_tree, new_tree, output, specific_files,
 
171
    show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
171
172
                    external_diff_options)
172
173
 
173
174
 
208
209
                          specific_files=specific_files)
209
210
 
210
211
    for path, file_id, kind in delta.removed:
211
 
        print >>to_file, '=== removed %s %r' % (kind, path)
212
 
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
213
 
                                         DEVNULL, None, None, to_file)
 
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
 
214
220
    for path, file_id, kind in delta.added:
215
 
        print >>to_file, '=== added %s %r' % (kind, path)
216
 
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
217
 
                                         DEVNULL, None, None, to_file, 
218
 
                                         reverse=True)
219
 
    for (old_path, new_path, file_id, kind,
220
 
         text_modified, meta_modified) in delta.renamed:
221
 
        prop_str = get_prop_change(meta_modified)
222
 
        print >>to_file, '=== renamed %s %r => %r%s' % (
223
 
                          kind, old_path, new_path, prop_str)
224
 
        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
225
 
                                    new_label, new_path, new_tree,
226
 
                                    text_modified, kind, to_file, diff_file)
227
 
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
228
 
        prop_str = get_prop_change(meta_modified)
229
 
        print >>to_file, '=== modified %s %r%s' % (kind, path, prop_str)
 
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)
230
231
        if text_modified:
231
 
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
232
 
                                        new_label, path, new_tree,
233
 
                                        True, kind, to_file, diff_file)
234
 
    
235
 
 
236
 
def get_prop_change(meta_modified):
237
 
    if meta_modified:
238
 
        return " (properties changed)"
239
 
    else:
240
 
        return  ""
241
 
 
242
 
 
243
 
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
244
 
                                new_label, new_path, new_tree, text_modified,
245
 
                                kind, to_file, diff_file):
246
 
    if text_modified:
247
 
        new_entry = new_tree.inventory[file_id]
248
 
        old_tree.inventory[file_id].diff(diff_file,
249
 
                                         old_label + old_path, old_tree,
250
 
                                         new_label + new_path, new_entry, 
251
 
                                         new_tree, to_file)
 
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