← 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-05-23 01:07:31 UTC
  • mto: This revision was merged to the branch mainline in revision 1727.
  • Revision ID: aaron.bentley@utoronto.ca-20060523010731-8ffa480f08c46c21
Reoganize patience-related code

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
import bzrlib.errors as errors
 
20
from bzrlib.patiencediff import SequenceMatcher, unified_diff
20
21
from bzrlib.symbol_versioning import *
21
22
from bzrlib.textfile import check_text_lines
22
23
from bzrlib.trace import mutter
27
28
 
28
29
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
29
30
                  allow_binary=False, sequence_matcher=None):
30
 
    from bzrlib.cdv.cdvdifflib import unified_diff
31
 
    from bzrlib.cdv.cdvdifflib import SequenceMatcher
32
 
    
33
31
    # FIXME: difflib is wrong if there is no trailing newline.
34
32
    # The syntax used by patch seems to be "\ No newline at
35
33
    # end of file" following the last diff line from that