/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: Canonical.com Patch Queue Manager
  • Date: 2010-06-15 04:32:49 UTC
  • mfrom: (5254.2.5 534787-pull-lp-in-config)
  • Revision ID: pqm@pqm.ubuntu.com-20100615043249-b5xx4yeyfyfbfyav
(spiv) Fix 'bzr pull' when lp: URL explicitly defined in
        locations.conf or branch.conf. (Gordon Tyler, #534787)

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: