/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: Andrew Bennetts
  • Date: 2008-03-12 20:13:07 UTC
  • mfrom: (3267 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080312201307-ngd5bynt2nvhnlb7
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
93
93
            want_unversioned=want_unversioned,
94
94
            )
95
95
 
96
 
    def _iter_changes(self, from_tree, include_unchanged=False,
 
96
    @symbol_versioning.deprecated_method(symbol_versioning.one_three)
 
97
    def _iter_changes(self, *args, **kwargs):
 
98
        return self.iter_changes(*args, **kwargs)
 
99
 
 
100
    def iter_changes(self, from_tree, include_unchanged=False,
97
101
                     specific_files=None, pb=None, extra_trees=None,
98
102
                     require_versioned=True, want_unversioned=False):
99
103
        intertree = InterTree.get(from_tree, self)
100
 
        return intertree._iter_changes(include_unchanged, specific_files, pb,
 
104
        return intertree.iter_changes(include_unchanged, specific_files, pb,
101
105
            extra_trees, require_versioned, want_unversioned=want_unversioned)
102
106
    
103
107
    def conflicts(self):
145
149
    def __iter__(self):
146
150
        return iter(self.inventory)
147
151
 
 
152
    def all_file_ids(self):
 
153
        """Iterate through all file ids, including ids for missing files."""
 
154
        return set(self.inventory)
 
155
 
148
156
    def id2path(self, file_id):
149
157
        """Return the path for a file id.
150
158
 
185
193
        raise NotImplementedError("Tree subclass %s must implement kind"
186
194
            % self.__class__.__name__)
187
195
 
 
196
    def stored_kind(self, file_id):
 
197
        """File kind stored for this file_id.
 
198
 
 
199
        May not match kind on disk for working trees.  Always available
 
200
        for versioned files, even when the file itself is missing.
 
201
        """
 
202
        return self.kind(file_id)
 
203
 
188
204
    def path_content_summary(self, path):
189
205
        """Get a summary of the information about path.
190
206
        
706
722
            require_versioned=require_versioned,
707
723
            want_unversioned=want_unversioned)
708
724
 
709
 
    def _iter_changes(self, include_unchanged=False,
 
725
    def iter_changes(self, include_unchanged=False,
710
726
                      specific_files=None, pb=None, extra_trees=[],
711
727
                      require_versioned=True, want_unversioned=False):
712
728
        """Generate an iterator of changes between trees.