/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: Andrew Bennetts
  • Date: 2010-06-04 03:09:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5280.
  • Revision ID: andrew.bennetts@canonical.com-20100604030935-4slnx0e8uh9b8yk6
lazy_import most things in merge.py; add a few representative modules to the import tariff tests; tweak a couple of other modules so that patiencediff is not necessarily imported; remove a bunch of unused imports from test_knit.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
706
706
        """
707
707
        def _get_text(tree, file_id, path):
708
708
            if file_id is not None:
709
 
                return tree.get_file(file_id, path).readlines()
 
709
                return tree.get_file_lines(file_id, path)
710
710
            else:
711
711
                return []
712
712
        try: