← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Merge with annotate

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2200
2200
                raise errors.BzrCommandError("%r is not present in revision %s"
2201
2201
                                                % (filename, revision_id))
2202
2202
            else:
2203
 
                rev_tree.print_file(old_file_id)
 
2203
                content = rev_tree.get_file_text(old_file_id)
2204
2204
        elif cur_file_id is not None:
2205
 
            rev_tree.print_file(cur_file_id)
 
2205
            content = rev_tree.get_file_text(cur_file_id)
2206
2206
        elif old_file_id is not None:
2207
 
            rev_tree.print_file(old_file_id)
 
2207
            content = rev_tree.get_file_text(old_file_id)
2208
2208
        else:
2209
2209
            raise errors.BzrCommandError("%r is not present in revision %s" %
2210
2210
                                         (filename, revision_id))
 
2211
        self.outf.write(content)
2211
2212
 
2212
2213
 
2213
2214
class cmd_local_time_offset(Command):
4657
4658
    cmd_bundle_info,
4658
4659
    )
4659
4660
from bzrlib.sign_my_commits import cmd_sign_my_commits
4660
 
from bzrlib.weave_commands import cmd_versionedfile_list, cmd_weave_join, \
 
4661
from bzrlib.weave_commands import cmd_versionedfile_list, \
4661
4662
        cmd_weave_plan_merge, cmd_weave_merge_text