← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Aaron Bentley
  • Date: 2006-04-16 15:52:29 UTC
  • mto: This revision was merged to the branch mainline in revision 1673.
  • Revision ID: aaron.bentley@utoronto.ca-20060416155229-dd8b35cdc5d134ce
Implemented binary file handling for diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
17
17
from bzrlib.delta import compare_trees
18
18
from bzrlib.errors import BzrError
19
19
from bzrlib.symbol_versioning import *
 
20
from bzrlib.textfile import check_text_lines
20
21
from bzrlib.trace import mutter
21
22
 
22
23
# TODO: Rather than building a changeset object, we should probably
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
50
                              fromfile=old_filename+'\t',