/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: Martin von Gagern
  • Date: 2010-05-28 14:15:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5284.
  • Revision ID: martin.vgagern@gmx.net-20100528141528-px8k6i9pqdyob91l
Add --directory option to 7 more commands.

This batch adds a --directory option to the following commands:
conflicts, merge-directive, missing, resolve, shelve, switch, unshelve

Blackbox tests for all of these are included.

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: