← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-06 15:15:44 UTC
  • mfrom: (5835 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110506151544-atzxeezfwssnlacr
Merge bzr.dev 5835 in prep for release-notes updates

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3999
3999
            merger.other_rev_id is not None):
4000
4000
            note('Nothing to do.')
4001
4001
            return 0
4002
 
        if pull:
 
4002
        if pull and not preview:
4003
4003
            if merger.interesting_files is not None:
4004
4004
                raise errors.BzrCommandError('Cannot pull individual files')
4005
4005
            if (merger.base_rev_id == tree.last_revision()):
4693
4693
    @display_command
4694
4694
    def run(self, filename, all=False, long=False, revision=None,
4695
4695
            show_ids=False, directory=None):
4696
 
        from bzrlib.annotate import annotate_file, annotate_file_tree
 
4696
        from bzrlib.annotate import (
 
4697
            annotate_file_tree,
 
4698
            )
4697
4699
        wt, branch, relpath = \
4698
4700
            _open_directory_or_containing_tree_or_branch(filename, directory)
4699
4701
        if wt is not None:
4714
4716
            annotate_file_tree(wt, file_id, self.outf, long, all,
4715
4717
                show_ids=show_ids)
4716
4718
        else:
4717
 
            file_version = tree.get_file_revision(file_id)
4718
 
            annotate_file(branch, file_version, file_id, long, all, self.outf,
4719
 
                          show_ids=show_ids)
 
4719
            annotate_file_tree(tree, file_id, self.outf, long, all,
 
4720
                show_ids=show_ids, branch=branch)
4720
4721
 
4721
4722
 
4722
4723
class cmd_re_sign(Command):