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

  • Committer: Martin Pool
  • Date: 2007-09-03 04:35:49 UTC
  • mfrom: (2778 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2779.
  • Revision ID: mbp@sourcefrog.net-20070903043549-0cfyrgx7z2h8ppks
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
26
26
    delta,
27
27
    osutils,
28
28
    revision as _mod_revision,
 
29
    conflicts as _mod_conflicts,
29
30
    symbol_versioning,
30
31
    )
31
32
from bzrlib.decorators import needs_read_lock
104
105
 
105
106
        Each conflict is an instance of bzrlib.conflicts.Conflict.
106
107
        """
107
 
        return []
 
108
        return _mod_conflicts.ConflictList()
108
109
 
109
110
    def extras(self):
110
111
        """For trees that can have unversioned files, return all such paths."""
209
210
    def _get_inventory(self):
210
211
        return self._inventory
211
212
    
212
 
    def get_file(self, file_id):
213
 
        """Return a file object for the file file_id in the tree."""
 
213
    def get_file(self, file_id, path=None):
 
214
        """Return a file object for the file file_id in the tree.
 
215
        
 
216
        If both file_id and path are defined, it is implementation defined as
 
217
        to which one is used.
 
218
        """
214
219
        raise NotImplementedError(self.get_file)
215
220
 
216
221
    def get_file_mtime(self, file_id, path=None):