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

Move all features to bzrlib.tests.features in 2.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1462
1462
 
1463
1463
    missing_parent_conflicts = True
1464
1464
 
 
1465
    supports_versioned_directories = True
 
1466
 
1465
1467
    _lock_class = LockDir
1466
1468
    _lock_file_name = 'lock'
1467
1469
 
1713
1715
        annotations = self._repository.texts.annotate(text_key)
1714
1716
        return [(key[-1], line) for (key, line) in annotations]
1715
1717
 
1716
 
    def _get_ancestors(self, default_revision):
1717
 
        return set(self._repository.get_ancestry(self._revision_id,
1718
 
                                                 topo_sorted=False))
1719
1718
    def _comparison_data(self, entry, path):
1720
1719
        """See Tree._comparison_data."""
1721
1720
        if entry is None: