/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: Aaron Bentley
  • Date: 2006-11-17 06:59:59 UTC
  • mto: This revision was merged to the branch mainline in revision 2162.
  • Revision ID: aaron.bentley@utoronto.ca-20061117065959-x81f1iu6uxar1iar
Make iter_changes private, so it can be changed freely

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
87
87
            include_root=include_root
88
88
            )
89
89
 
90
 
    def iter_changes(self, from_tree, include_unchanged=False, 
 
90
    def _iter_changes(self, from_tree, include_unchanged=False, 
91
91
                     specific_file_ids=None):
92
92
        intertree = InterTree.get(from_tree, self)
93
 
        return intertree.iter_changes(from_tree, self, include_unchanged, 
94
 
                                      specific_file_ids)
 
93
        return intertree._iter_changes(from_tree, self, include_unchanged, 
 
94
                                       specific_file_ids)
95
95
    
96
96
    def conflicts(self):
97
97
        """Get a list of the conflicts in the tree.
440
440
        return delta._compare_trees(self.source, self.target, want_unchanged,
441
441
            specific_file_ids, include_root)
442
442
 
443
 
    def iter_changes(self, from_tree, to_tree, include_unchanged, 
444
 
                     specific_file_ids):
 
443
    def _iter_changes(self, from_tree, to_tree, include_unchanged, 
 
444
                      specific_file_ids):
445
445
        """Generate an iterator of changes between trees.
446
446
 
447
447
        A tuple is returned: