← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-20 14:28:59 UTC
  • mfrom: (2625.6.3 bzr.email_message)
  • mto: This revision was merged to the branch mainline in revision 2640.
  • Revision ID: john@arbash-meinel.com-20070720142859-a24s0khul0yw91bh
(Adeodato Simó) EmailMessage class, allowing much nicer access to Email object than stdlib

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1346
1346
        return "<%s of %s in %s>" % \
1347
1347
            (self.__class__.__name__, self._revision_id, self._dirstate)
1348
1348
 
1349
 
    def annotate_iter(self, file_id):
 
1349
    def annotate_iter(self, file_id,
 
1350
                      default_revision=_mod_revision.CURRENT_REVISION):
1350
1351
        """See Tree.annotate_iter"""
1351
 
        w = self._repository.weave_store.get_weave(file_id,
1352
 
                           self._repository.get_transaction())
 
1352
        w = self._get_weave(file_id)
1353
1353
        return w.annotate_iter(self.inventory[file_id].revision)
1354
1354
 
 
1355
    def _get_ancestors(self, default_revision):
 
1356
        return set(self._repository.get_ancestry(self._revision_id,
 
1357
                                                 topo_sorted=False))
1355
1358
    def _comparison_data(self, entry, path):
1356
1359
        """See Tree._comparison_data."""
1357
1360
        if entry is None:
1490
1493
            return parent_details[1]
1491
1494
        return None
1492
1495
 
 
1496
    @symbol_versioning.deprecated_method(symbol_versioning.zero_nineteen)
1493
1497
    def get_weave(self, file_id):
 
1498
        return self._get_weave(file_id)
 
1499
 
 
1500
    def _get_weave(self, file_id):
1494
1501
        return self._repository.weave_store.get_weave(file_id,
1495
1502
                self._repository.get_transaction())
1496
1503
 
1499
1506
 
1500
1507
    def get_file_lines(self, file_id):
1501
1508
        ie = self.inventory[file_id]
1502
 
        return self._repository.weave_store.get_weave(file_id,
1503
 
                self._repository.get_transaction()).get_lines(ie.revision)
 
1509
        return self._get_weave(file_id).get_lines(ie.revision)
1504
1510
 
1505
1511
    def get_file_size(self, file_id):
1506
1512
        return self.inventory[file_id].text_size