~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Martin Pool
  • Date: 2008-06-18 07:56:09 UTC
  • mto: This revision was merged to the branch mainline in revision 3510.
  • Revision ID: mbp@sourcefrog.net-20080618075609-zehkroqkqufck2zb
VersionedFiles review cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
1425
1425
        """See Tree.annotate_iter"""
1426
1426
        text_key = (file_id, self.inventory[file_id].revision)
1427
1427
        annotations = self._repository.texts.annotate(text_key)
1428
 
        return [(key[-1], line) for key, line in annotations]
 
1428
        return [(key[-1], line) for (key, line) in annotations]
1429
1429
 
1430
1430
    def _get_ancestors(self, default_revision):
1431
1431
        return set(self._repository.get_ancestry(self._revision_id,