/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/builtins.py

  • Committer: Andrew King
  • Date: 2011-02-10 08:05:17 UTC
  • mto: (5653.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5653.
  • Revision ID: eurokang@gmail.com-20110210080517-7xya44a9akpica0n
Small cleanup - no point doing work where there is a chance it is not needed

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4720
4720
            file_id = tree.path2id(relpath)
4721
4721
        if file_id is None:
4722
4722
            raise errors.NotVersionedError(filename)
4723
 
        file_version = tree.inventory[file_id].revision
4724
4723
        if wt is not None and revision is None:
4725
4724
            # If there is a tree and we're not annotating historical
4726
4725
            # versions, annotate the working tree's content.
4727
4726
            annotate_file_tree(wt, file_id, self.outf, long, all,
4728
4727
                show_ids=show_ids)
4729
4728
        else:
 
4729
            file_version = tree.inventory[file_id].revision
4730
4730
            annotate_file(branch, file_version, file_id, long, all, self.outf,
4731
4731
                          show_ids=show_ids)
4732
4732